Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-09-29

| Channels | #git index | Today | | Search | Google Search | Plain-Text | summary

All times shown according to UTC.

Time Nick Message
00:00 HappyLoaf_ joined #git
00:01 disi joined #git
00:01 fuchstronaut joined #git
00:02 rewt hm
00:02 mingrammer joined #git
00:02 egorsmkv left #git
00:03 rewt reset --hard should have done the modified files
00:03 Derperperd joined #git
00:04 calloc That's what I was thinking. It's always worked for me in the past.
00:04 jimi_ joined #git
00:05 lawsrout joined #git
00:06 egorsmkv1 joined #git
00:06 egorsmkv1 hola amigos
00:06 calloc howdy
00:07 cyphase joined #git
00:07 egorsmkv1 como estas?
00:08 calloc muy bien. no habla espanol.
00:08 cyphase joined #git
00:09 calloc I may have that wrong. Is it "hablo"?
00:10 egorsmkv1 yes
00:10 egorsmkv1 right - "hablo"
00:10 calloc It's been a few years.
00:10 calloc y tu?
00:11 txdv joined #git
00:11 egorsmkv1 i'am ukranian who learn spanish ;)
00:11 shock- joined #git
00:12 JamesBaxter joined #git
00:12 calloc Trilingual or more?
00:14 egorsmkv1 if you don't count the initial knowledge of English, then Yes
00:14 egorsmkv1 ukrainan and russian as native
00:15 calloc Impressive. Just English for me.
00:16 GandalfTheWizard joined #git
00:16 Rodya_ joined #git
00:16 mischat joined #git
00:17 egorsmkv1 start learning russian ;)
00:19 al-damiri joined #git
00:20 calloc I probably should; my whole Tae Kwon Do club speaks Russian. I'd have plenty of people to practice with.
00:21 thebope joined #git
00:22 HappyLoaf_ joined #git
00:23 lawsrout joined #git
00:23 egorsmkv1 You know, when people (not Russian) know Russian - it is of great respect
00:24 snthsnth joined #git
00:24 johnflux joined #git
00:26 johnflux How can I test whether the submodules need updating?
00:26 johnflux I can actually update with:  git submodule update --recursive --remote
00:27 johnflux but in a script I want to test if the user needs to do that and warn them
00:27 johnflux without actually doing it
00:30 yaymukund joined #git
00:31 ryez joined #git
00:32 SwiftMatt joined #git
00:34 LBV_User joined #git
00:34 diogenese joined #git
00:35 vassagus joined #git
00:36 jnavila joined #git
00:37 raijin joined #git
00:39 ruby_ joined #git
00:41 ruby__ joined #git
00:42 danslo joined #git
00:42 danslo joined #git
00:43 heroux joined #git
00:43 nettoweb joined #git
00:43 ahmedelgabri joined #git
00:44 red82 joined #git
00:46 prawnzy joined #git
00:47 vassagus joined #git
00:49 shgysk8zer0 joined #git
00:51 romerocesar joined #git
00:55 dsantiago joined #git
00:55 lebster when you git revert a commit (in my case a merge) it has a conflict, what is local,base,remote in that case
00:56 mingrammer joined #git
00:57 lbv-user joined #git
00:57 rgrinberg joined #git
00:59 ruby_ joined #git
01:02 fuchstronaut joined #git
01:02 nettoweb1 joined #git
01:03 nettoweb1 joined #git
01:03 michaelsharpe joined #git
01:03 ruby_ joined #git
01:05 nettoweb_ joined #git
01:05 Darren_ joined #git
01:06 ahr3n joined #git
01:10 lbv-user left #git
01:10 LBV_User joined #git
01:17 mischat joined #git
01:20 jimi_ joined #git
01:21 Derperperd joined #git
01:21 HoloPed_ joined #git
01:21 d^sh_ joined #git
01:24 sunri5e_ joined #git
01:27 Darren_ joined #git
01:32 HappyLoaf_ joined #git
01:33 rchavik joined #git
01:34 cqi joined #git
01:34 Orbitrix joined #git
01:35 shgysk8zer0 joined #git
01:35 Orbitrix joined #git
01:36 raijin joined #git
01:38 auzty joined #git
01:38 rsukla joined #git
01:39 Corosus joined #git
01:40 fstd_ joined #git
01:41 cyphase joined #git
01:42 alex1a joined #git
01:46 einnjo joined #git
01:46 pks joined #git
01:46 wcpan_ joined #git
01:46 cyphase joined #git
01:46 HappyLoaf_ joined #git
01:46 cyphase joined #git
01:49 ilbot3 joined #git
01:49 Topic for #git is now Welcome to #git, the place for git help and electronically-induced comas | Please take the git survey: https://jk.gs/gsurv | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.10.0 | Getting "cannot send to channel"? /msg gitinfo .voice | git-daemon: the evil rises
01:51 mingrammer joined #git
01:53 sarbs joined #git
01:53 thebope joined #git
01:55 hydrogen joined #git
01:58 Gsham joined #git
02:00 Dougie187 joined #git
02:01 harwood joined #git
02:03 lolmac joined #git
02:03 fuchstronaut joined #git
02:03 cyphase joined #git
02:04 ochorocho__ joined #git
02:04 cyphase joined #git
02:05 cyphase joined #git
02:06 cyphase joined #git
02:09 diogenese joined #git
02:15 vdl joined #git
02:15 csd__ left #git
02:17 Limes__ joined #git
02:17 sdothum joined #git
02:17 lolmac joined #git
02:18 mischat joined #git
02:20 snthsnth joined #git
02:20 cqi joined #git
02:21 sdothum joined #git
02:23 duderonomy joined #git
02:23 thebope joined #git
02:25 Rodya_ joined #git
02:26 shum joined #git
02:31 romerocesar joined #git
02:31 rgrinberg joined #git
02:32 yaymukund joined #git
02:33 boombatower joined #git
02:33 anonymuse joined #git
02:34 danslo joined #git
02:36 cyphase joined #git
02:36 morenoh149 joined #git
02:37 lagothri1 joined #git
02:37 carpii joined #git
02:37 vdl joined #git
02:38 Lor_ joined #git
02:39 cqi joined #git
02:39 cyphase joined #git
02:40 Gsham joined #git
02:40 cyphase joined #git
02:40 cyphase joined #git
02:42 shgysk8zer0 joined #git
02:43 cyphase joined #git
02:44 Goplat joined #git
02:44 cyphase joined #git
02:45 mingrammer joined #git
02:49 rsukla joined #git
02:49 Sucks joined #git
02:49 therealGent joined #git
02:50 hexagoxel joined #git
02:51 michaelsharpe joined #git
02:56 chachasmooth joined #git
02:57 harwood joined #git
02:58 durham joined #git
02:58 watabou joined #git
02:58 vdl joined #git
02:58 harwood joined #git
02:59 Limes__ joined #git
03:00 dave0x6d joined #git
03:00 harwood joined #git
03:01 star_prone joined #git
03:02 MrWoohoo joined #git
03:03 harwood joined #git
03:03 texasmynsted joined #git
03:03 HappyLoaf_ joined #git
03:04 njbair joined #git
03:06 aavrug joined #git
03:07 harwood joined #git
03:07 hahuang62 joined #git
03:07 aavrug joined #git
03:07 Forkk joined #git
03:08 romerocesar joined #git
03:10 e14 joined #git
03:13 jaguarmagenta joined #git
03:13 sssilver joined #git
03:14 lolmac joined #git
03:14 Dougie187 left #git
03:17 thebope joined #git
03:18 romerocesar joined #git
03:19 mischat joined #git
03:21 diogenese joined #git
03:21 htafdresgi joined #git
03:22 htafdresgi hey guys, my program is so giant and bloated now, I can't push because my computer runs out of RAM.
03:22 htafdresgi e change tree or something.  or do I have to start a new tree?
03:22 htafdresgi i..e a lot of the stuff is from older iterations of the same project..
03:24 watabou joined #git
03:26 GodGinrai joined #git
03:31 cyphase joined #git
03:32 fedepad joined #git
03:33 prawnzy joined #git
03:33 tristanp joined #git
03:35 rewt htafdresgi, use the first example in man git filter-branch to remove binaries from your repo
03:35 gitinfo htafdresgi: the git-filter-branch manpage is available at http://jk.gs/git-filter-branch.html
03:36 danslo joined #git
03:36 dreiss joined #git
03:38 htafdresgi rewt: thanks I'll try that
03:43 HoloPed__ joined #git
03:43 fstd_ joined #git
03:45 giraffe joined #git
03:45 watersoul_ joined #git
03:45 barajasfab joined #git
03:46 romerocesar joined #git
03:47 waveclaw joined #git
03:48 bruce_lee joined #git
03:48 bruce_lee joined #git
03:48 EisNerd joined #git
03:49 ThunderChicken joined #git
03:49 ThunderChicken joined #git
03:49 dsantiago joined #git
03:49 johnflux_ joined #git
03:49 johnflux_ joined #git
03:49 boxrick1 joined #git
03:49 addshore joined #git
03:50 WebDawg joined #git
03:50 Iacobus joined #git
03:50 cstrahan_ joined #git
03:50 lxnch_ joined #git
03:51 barq joined #git
03:51 tier2villain_ joined #git
03:51 simon816 joined #git
03:51 brokensyntax joined #git
03:51 fold4 joined #git
03:51 cspotcode joined #git
03:51 grift joined #git
03:52 Awesomecase joined #git
03:52 Ratler joined #git
03:52 yonatankoren joined #git
03:52 Sigma joined #git
03:52 chimeracoder joined #git
03:52 daey joined #git
03:52 cyphase joined #git
03:53 WillMoogle joined #git
03:53 raijin joined #git
03:53 osxi joined #git
03:54 XVar joined #git
03:54 hdon joined #git
03:54 ndim joined #git
03:54 ghostlight joined #git
03:54 harv joined #git
03:55 HappyLoaf_ joined #git
03:56 johnnyfive joined #git
03:56 noyb joined #git
03:56 dreiss joined #git
03:57 Ankhers joined #git
03:58 a_thakur joined #git
03:59 raijin joined #git
04:00 brokensyntax joined #git
04:00 qpdb joined #git
04:00 gambler joined #git
04:04 fuchstronaut joined #git
04:06 prawnzy joined #git
04:07 brokensyntax joined #git
04:07 pijiu joined #git
04:08 yaymukund joined #git
04:08 hydrogen hi friends... trying to track down a merge gone awry.  git diff first-commit...second-commit looks reasonable, git diff first-commit..second-commit shows a huge amount of changes.  I'm kind of unclear of what the difference between .. and... actually is, and wondering if theres a git ctrl-z I don't know aobut :)
04:09 pijiu2 joined #git
04:10 seitensei hydrogen, just revert to an earlier commit?
04:10 Sonderblade joined #git
04:10 holdsworth_ joined #git
04:10 seitensei That being said, you can always reconstruct from the diff after that
04:10 hydrogen seitensei: there's been a number of commits and merges and pushes since this happened, just caught it now
04:11 seitensei reverting to past commits is more or less the 'ctrl-z'
04:11 CussBot joined #git
04:11 daey_ joined #git
04:12 Zenrium joined #git
04:12 PalTale joined #git
04:13 nowolfer joined #git
04:13 johnflux_ How can I run: git submodule update   but as a dry run just to find out if they need updating?
04:13 nowolfer Gitolite report : Can't locate Gitolite/Rc.pm in @INC, but when i use perl -u 'Gitolite::Rc' to check the module it's on my system. any idea? i just have my system update
04:13 PasiFist joined #git
04:15 wloncom joined #git
04:15 Jonuz joined #git
04:15 Andrew_K joined #git
04:16 rscata joined #git
04:19 cyphase joined #git
04:19 hydrogen okay, next (part) question
04:20 hydrogen git diff branch-a branch-b makes sense.  Is there a way to do git diff branch-a branch-b except for commits that were merged from branch-c?
04:20 mischat joined #git
04:20 sitaram nowolfer: upgrade to v3.6.6.  This happens only on Debian (sid?? I'm not sure) where they pre-adopted something that perl intends to do in a future version
04:21 brokensyntax joined #git
04:23 HappyLoaf_ joined #git
04:23 thebope joined #git
04:25 tristanp joined #git
04:26 eshlox joined #git
04:28 brokensyntax joined #git
04:33 mingrammer joined #git
04:35 Andrew_K joined #git
04:36 danslo joined #git
04:38 mangolisk joined #git
04:39 michaelsharpe joined #git
04:45 brokensyntax joined #git
04:46 ruby_ joined #git
04:47 ruby_ joined #git
04:48 sagerdearia joined #git
04:51 star_prone joined #git
04:51 subhojit777 joined #git
04:52 brokensyntax joined #git
04:52 freimatz joined #git
04:55 bocaneri joined #git
04:56 Shentino joined #git
04:56 HappyLoaf_ joined #git
05:02 ome joined #git
05:02 Cabanossi joined #git
05:05 fuchstronaut joined #git
05:06 ahmedelgabri joined #git
05:09 wxg joined #git
05:11 brokensyntax joined #git
05:12 a_thakur joined #git
05:12 M-meznak joined #git
05:14 clemf joined #git
05:15 mehola joined #git
05:15 aviraldg joined #git
05:16 aax joined #git
05:17 clemf joined #git
05:18 Mowgli joined #git
05:20 HappyLoaf_ joined #git
05:20 linuxmint joined #git
05:21 mischat joined #git
05:22 nidr0x joined #git
05:25 a_thakur_ joined #git
05:25 lawsrout joined #git
05:26 ewet joined #git
05:28 cqi joined #git
05:28 mingrammer joined #git
05:28 tristanp joined #git
05:30 gfixler joined #git
05:30 lordjancso joined #git
05:32 kjsage[m] joined #git
05:33 cyphase joined #git
05:36 Ineentho[m] joined #git
05:36 AndreSomers joined #git
05:37 Orion3k joined #git
05:38 danslo joined #git
05:38 Furai joined #git
05:38 HappyLoaf_ joined #git
05:40 heroux joined #git
05:42 dodobrain joined #git
05:42 zeroed joined #git
05:44 lolmac joined #git
05:45 ThomasLocke joined #git
05:45 ThomasLocke joined #git
05:45 raijin joined #git
05:46 lawsrout joined #git
05:47 Takiito joined #git
05:47 Takiito joined #git
05:48 mischat joined #git
05:48 aviraldg joined #git
05:48 aviraldg joined #git
05:48 mehola joined #git
05:50 NoOutlet joined #git
05:50 Raging_Hog joined #git
05:51 constant joined #git
05:53 Wulf joined #git
05:53 qt-x joined #git
05:54 codfection joined #git
05:55 Darren_ joined #git
05:56 cyphase joined #git
05:56 _August_ joined #git
05:56 _August_ can someone help me out? im trying to commit a file and i keep getting this error
05:57 _August_ Commit failed with error 0 files committed, 1 file failed to commit: Core Update 'config.inc.php' did not match any file(s) known to git.
05:57 _August_ i tried using git fetch and nothing happens
05:58 _August_ ive all switched back and forth by checking out to the branch im trying to commit to
05:58 txdv take a look at .gitignore
05:58 txdv does it  contain config.inc.php?
05:58 xshuiniu joined #git
05:59 Silenced joined #git
05:59 _August_ i doubt it
05:59 _August_ how do i check it?
05:59 paolooo joined #git
06:00 michaelsharpe joined #git
06:01 codfection joined #git
06:02 PioneerAxon joined #git
06:02 _August_ i put git check-ignore * and nothing gets returned
06:03 _August_ hmm
06:03 _August_ yeah i see it now
06:03 _August_ its there
06:04 paolooo left #git
06:04 deadprez joined #git
06:04 JeroenT joined #git
06:05 rendar joined #git
06:06 fuchstronaut joined #git
06:06 Darren_ joined #git
06:06 a_thakur joined #git
06:08 cdown joined #git
06:08 crawler joined #git
06:09 lb1c joined #git
06:10 yaymukund joined #git
06:11 a_thakur_ joined #git
06:14 elastix joined #git
06:15 alcohol _August_: a lot of projects usually include a default config, like config.inc.php.default or some variant, and they explicitly ignore local config files
06:15 _August_ yeah my fault i forgot about it
06:15 _August_ thanks tho
06:18 ShapeShifter499 joined #git
06:19 ShapeShifter499 joined #git
06:21 ShapeShifter499 joined #git
06:25 roelmonnens joined #git
06:25 ShapeShifter499 joined #git
06:28 ShapeShifter499 joined #git
06:30 Silenced joined #git
06:34 Sceorem joined #git
06:34 Vortex34 joined #git
06:35 ShapeShifter499 joined #git
06:37 danslo joined #git
06:40 ShapeShifter499 joined #git
06:41 ShapeShifter499 joined #git
06:42 ShapeShifter499 joined #git
06:43 Shentino joined #git
06:44 cyan__ joined #git
06:46 star_prone joined #git
06:46 laumann joined #git
06:49 mischat joined #git
06:49 lolmac joined #git
06:50 Raansu joined #git
06:55 crawler joined #git
06:55 submitnine joined #git
06:56 snthsnth joined #git
07:01 King_Hual joined #git
07:01 King_Hual joined #git
07:02 IRC-Andrew joined #git
07:03 MatrixBridge joined #git
07:03 MatrixBridge left #git
07:03 TomyWork joined #git
07:03 _ADN_ joined #git
07:05 danslo joined #git
07:05 thierryp joined #git
07:06 fuchstronaut joined #git
07:07 dunaeth joined #git
07:09 Raansu joined #git
07:09 overlord_tm joined #git
07:10 eduardas_m joined #git
07:11 z8z joined #git
07:12 aax joined #git
07:14 jaguarmagenta joined #git
07:14 constant joined #git
07:16 mingrammer joined #git
07:19 fees joined #git
07:21 selckin joined #git
07:23 ahmedelgabri joined #git
07:23 nowolfer joined #git
07:23 HappyLoaf_ joined #git
07:24 constant joined #git
07:24 grawity joined #git
07:25 encod3 joined #git
07:25 maret joined #git
07:26 constant joined #git
07:27 maret joined #git
07:28 ahr3n joined #git
07:28 Wulf joined #git
07:28 jaequery joined #git
07:29 Balliad joined #git
07:30 dreiss joined #git
07:30 maret Hi, I would like to ask you for a help with a workflow. I am working on a project where I mostly work on one file at the time. Right now for each new function I add to the file I create separate feature branch. I mostly add function at the end of the same file. Problem is with pull requests. Because each function is in at the end of same file, everytime one branch is merged to master there is a new conflict. Secondly because I don't know up fron which  feature
07:30 maret branch will be merged next I have wait with rebasing feature brachh with master otherwise I might resolve conflict between master + feature A branch and lets say feature branch B just so I can find out that feature branch C was merged next so I have a new conflict
07:31 snufft joined #git
07:31 maret To me there are two solutions either I will create larger feature branches with few of functions for the same file  or I would have to make sure not to put the functions on the sam espot
07:33 maret also there is no point for me to rebase master with feature branch to update pull request unless it is feature branch which will be merged into master next
07:34 HappyLoaf_ joined #git
07:35 BadSnappa joined #git
07:35 Murii joined #git
07:35 ferr joined #git
07:38 fedepad joined #git
07:38 snufft hi guys!
07:39 ahmedelgabri joined #git
07:39 snufft git won't pull because I apparently have a change to a file in a directory. I've never changed a file in that directory, so assuming the OS has messed with something. either way, I deleted the directory and git checkout directory to blow away the "changes". Now git is complaining about a single file in there. The file doesn't exist, so I did a git checkout file_name just to check, but it "did not match any file(s) known to git".
07:40 snufft so stupid question, but what can I do now?
07:40 snufft I still can't pull because of the "changes" i've made to this file, and i cna't checkout the file...
07:40 selckin actual command + actual error + git status?
07:41 _ADN_ joined #git
07:43 snufft Command: git checkout html.tpl.php Error: error: pathspec 'html.tpl.php' did not match any file(s) known to git. git status: http://pastebin.com/SSKzAAPJ   :)
07:43 selckin so use the path as stated in status?
07:44 selckin git checkout -- ../../feltexcommercial/templates/html.tpl.php
07:46 snufft selckin, you were right! pebcak error :( doh! Thanks heaps :D
07:48 jknetl joined #git
07:49 snufft selckin++
07:50 ssitani joined #git
07:51 Mindfart joined #git
07:53 acetakwas joined #git
07:53 star_prone joined #git
07:58 crawler joined #git
08:00 sartan left #git
08:02 Esya_ joined #git
08:03 IRC-Andrew joined #git
08:04 lolmac joined #git
08:04 crawler joined #git
08:06 mithenks joined #git
08:08 qt-x joined #git
08:11 mingrammer joined #git
08:11 mikecmpbll joined #git
08:11 yaymukund joined #git
08:14 irco joined #git
08:14 qt-x joined #git
08:14 ptmiguelfernande joined #git
08:15 ptmiguelf joined #git
08:16 qt-x joined #git
08:16 ptmiguelf joined #git
08:17 ptmiguelfernande joined #git
08:18 barteks2x joined #git
08:18 a_thakur joined #git
08:18 ptmiguelf joined #git
08:21 chll_ joined #git
08:22 miguelfernandes joined #git
08:23 miguelfernandes joined #git
08:24 HappyLoaf_ joined #git
08:25 Wulf joined #git
08:25 thekrynn joined #git
08:26 kurkale6ka joined #git
08:27 maret joined #git
08:31 alcohol https://www.youtube.com/watch?v=AcOOygDHY-0 seems legit
08:31 selckin at least its not ncis
08:32 fedepad joined #git
08:37 spykins joined #git
08:38 rasto joined #git
08:39 Serpent7776 joined #git
08:41 maret joined #git
08:42 HappyLoaf_ joined #git
08:42 prawnzy joined #git
08:43 bongjovi joined #git
08:46 ssitani joined #git
08:47 t0by joined #git
08:47 Wulf joined #git
08:49 Darren_ joined #git
08:49 Shentino joined #git
08:50 wizardedit joined #git
08:54 kini joined #git
08:55 mischat joined #git
08:56 crawler joined #git
08:57 fstd_ joined #git
09:00 maret joined #git
09:01 star_prone joined #git
09:01 Darren_ joined #git
09:05 fedepad joined #git
09:05 mingrammer joined #git
09:08 fuchstronaut joined #git
09:08 crawler joined #git
09:09 achadwick joined #git
09:10 JeroenT joined #git
09:10 moriko joined #git
09:11 moriko joined #git
09:12 watersoul joined #git
09:13 yaymukund joined #git
09:14 stamina joined #git
09:15 jaguarmagenta joined #git
09:29 tvw joined #git
09:32 ThunderChicken joined #git
09:32 fuchstronaut joined #git
09:35 crawler joined #git
09:35 lordjancso joined #git
09:37 redeemed joined #git
09:37 magellanicloud joined #git
09:38 HappyLoaf_ joined #git
09:43 mehola joined #git
09:47 barteks2x joined #git
09:48 fuchstronaut joined #git
09:48 mehola joined #git
09:51 rafalcpp joined #git
09:51 rafalcpp how to obtain name of remote and branch that contains given commit (or current commit)?
09:52 selckin git  branch has a --contains iirc
09:52 rafalcpp e.g. I have 10 remotes. I fetched them, and merged ff one of them.  I didn't yet do  git push origin current_branch.   So current code is not on my origin.  But it is on e.g. remote_dave.  How to find that out in bash script?
09:53 rafalcpp selckin: mhm. bigger problem is with the repo I guess
09:53 Milijus joined #git
09:53 rafalcpp does any fetched repo contain given git revision. maybe search git ref?
09:53 jhd joined #git
09:54 selckin why doesn't contains work
10:01 Wulf joined #git
10:03 mischat_ joined #git
10:03 a3Dman joined #git
10:03 IRC-Andrew joined #git
10:04 mischat__ joined #git
10:05 Wind0r joined #git
10:09 robak joined #git
10:10 robak how do I easily choose with ssh-key (from ssh-agent) git will offer to the server when doing connections? It seems it only tries the first one, and I always land in the wrong git (github to be precise) account, despite having both keys loaded...
10:10 Wulf left #git
10:10 grawity robak: ssh -i, or IdentityFile in ~/.ssh/config
10:10 wgrant joined #git
10:11 grawity http://superuser.com/a/366656/1686
10:11 robak grawity: doesnt seem to be working, git happily provides the first key from ssh-agent and that's it
10:11 grawity git doesn't touch ssh-agent
10:12 robak in detail, of course not, but it does use it, via ssh it uses for authentication
10:12 HappyLoaf_ joined #git
10:12 robak forgive me the mental shortcuts here
10:12 grawity therefore it's entirely a ssh configuration issue
10:12 grawity if you can get `ssh` to work, so will git
10:12 grawity (unless of course your git uses `plink` instead)
10:13 robak grawity: and the problem with ssh/config solution is that it 'pollutes' commit logs with the 'nicknames' for connections, instead of 'github.com'
10:13 thebloggu joined #git
10:13 selckin that doesn't sound correct at all
10:13 grawity in that case use 'ssh -i whatever' in $GIT_SSH_COMMAND
10:14 robak grawity: like I said, I've tried that and it seems to be ignored
10:14 grawity then your git version is too old and only supports no-arg $GIT_SSH
10:14 grawity third option: use HTTPS instead
10:14 robak I even tried tricks like that GIT_SSH_COMMAND="ssh -F /dev/null -o 'IdentitiesOnly=yes'"
10:14 grawity IdentitiesOnly only takes effect if you actually specify an identity file...
10:14 selckin both keys have a github account linked to it?
10:15 robak and yet, git STILL gets to log in to the account associated with the first ssh key in my ssh-agent!
10:15 robak selckin: correct
10:15 Seveas robak: do you use persistent (controlmaster auto) connections?
10:15 robak Seveas: nope
10:15 Masber joined #git
10:16 Seveas which git version?
10:16 robak 2.8.4
10:17 selckin you need to pass the key with -i
10:18 brokensyntax joined #git
10:18 Seveas should support GIT_SSH_COMMAND just fine. Try GIT_SSH_COMMAND="ssh -vvv -i path-to-key" git clone ...
10:20 robak Seveas: I've even hacked something like that: http://dpaste.com/099VCQ5
10:20 robak Seveas: but it only works partially, no matter what I set GIT_SSH_COMMAND to, first key from my ssh-agent is ALWAYS available to git
10:21 robak it seriously drives me crazy
10:21 selckin still doesn't contain -i key
10:21 grawity you're repeating that over and oer
10:21 Seveas I don't care about those functions, let's first see if the basic things work.
10:21 grawity this seriously drives me crazy
10:21 Seveas try that command, pastebin the actual command you run and its output
10:21 grawity will you please post the ssh -vv logs, or test whether the same command works directly (not via git)?
10:21 tzafrir joined #git
10:21 robak selckin: the ssh/giton_foobar does contain the identity file
10:21 tzafrir Is there any way to make git-merge fail if there's a conflict?
10:22 wcpan joined #git
10:22 Seveas tzafrir: merge does fail if there's a conflict...
10:22 selckin make the direct way work before adding 5 levels of abstraction
10:23 tzafrir hmm... sorry. I guess I forgot
10:23 Seveas would be quite nasty if it were to commit the conflicts :)
10:26 hahuang62 joined #git
10:28 ronskisika joined #git
10:30 ocbtec joined #git
10:31 Milijus joined #git
10:33 HappyLoaf_ joined #git
10:33 Darren_ joined #git
10:34 IRC-Andrew joined #git
10:34 shum joined #git
10:36 fuchstronaut joined #git
10:47 chachasmooth joined #git
10:49 JeroenT joined #git
10:54 prawnzy joined #git
10:54 qt-x joined #git
10:55 mischat joined #git
10:56 tlaxkit joined #git
10:56 Darren_ joined #git
10:56 irco joined #git
10:57 Zenrium left #git
10:57 shum joined #git
11:01 Mixologic joined #git
11:04 a3pq51 joined #git
11:07 ssitani joined #git
11:10 jimi_ joined #git
11:11 rominronin joined #git
11:14 yaymukund joined #git
11:19 jnavila joined #git
11:21 Murii joined #git
11:22 Mowgli joined #git
11:22 Unbeerable joined #git
11:23 Unbeerable How can I see all latest changes in all *.css files?
11:24 selckin git log -p '*.css'
11:24 Murii joined #git
11:25 Murii joined #git
11:27 Unbeerable fatal: ambiguous argument '*.css': unknown revision or path not in the working tree.
11:28 mischat joined #git
11:28 ojdo joined #git
11:28 selckin worksforme
11:29 Unbeerable git log -- *.css
11:29 Unbeerable that's how it works for me
11:30 selckin old git version? the shell wil expand that so only with css files in current dir
11:30 alcohol anyone able to explain what this does in simple terms? git fetch origin '+refs/heads/*:refs/remotes/origin/*' --tags
11:30 monoprotic joined #git
11:31 Shentino joined #git
11:31 Murii joined #git
11:33 cdown joined #git
11:34 rnsanchez joined #git
11:34 HappyLoaf_ joined #git
11:34 JeroenT joined #git
11:35 nuck joined #git
11:36 makinen left #git
11:36 Marbug_ joined #git
11:37 sin3t joined #git
11:37 nettoweb joined #git
11:38 jave joined #git
11:38 workerbeetwo joined #git
11:38 roelmonn_ joined #git
11:40 moriko joined #git
11:41 zeroed joined #git
11:41 Mowgli joined #git
11:41 laumann joined #git
11:42 a_thakur_ joined #git
11:42 Murii joined #git
11:43 Murii joined #git
11:44 workerbeetwo joined #git
11:45 a_thakur joined #git
11:45 roelmonnens joined #git
11:45 workerbeetwo Hi. can I somehow update the base of a branch to see if merge conflicts will appear, continuation of the base branch?
11:45 dsdeiz joined #git
11:45 workerbeetwo base and forked branch are already published.
11:45 Murii joined #git
11:46 codfection joined #git
11:46 jost__ joined #git
11:46 * selckin doesn't understand
11:47 Ravana joined #git
11:47 fahadash joined #git
11:48 Murii joined #git
11:48 workerbeetwo ok. imagine a master branch and a myfeature branch. developement on master went on and also on myfeaturebranch. if they are merged there is a conflict, which I want to prevent in advance.
11:48 harish joined #git
11:48 selckin rebase feature on top of master then maybe
11:49 PCatinean joined #git
11:49 workerbeetwo selckin: yes. but since the myfeature branch is already out, Im not sure if the rebasing it is a good idea.
11:49 Murii joined #git
11:49 selckin you can't have your cake and eat it
11:49 spykins_ joined #git
11:50 gmc joined #git
11:51 LBV_User joined #git
11:55 Murii joined #git
11:55 chris2 anyone familiar with git-svn? something weird happened to my upstream repo and now it doesnt update anymore
11:55 selckin !ask
11:55 gitinfo Yes, it's okay to ask questions here.... in fact, you just asked one! ;-) Pretty much any question is fine. We're not terribly picky, but we might be asleep. Please be patient and you should get an answer soon.
11:56 HappyLoaf_ joined #git
11:56 constant joined #git
11:56 flaviodesousa joined #git
11:56 cqi joined #git
11:57 Ravana joined #git
11:59 mizu_no_oto joined #git
12:00 rpg joined #git
12:01 Murii joined #git
12:02 chris2 i see commits in svn log, but git-svn fetch doesnt pick them up and git-svn reset doesnt help either
12:03 chris2 ah, running git svn reset on the checkout seems to have worked
12:03 IRC-Andrew joined #git
12:03 Murii joined #git
12:04 sireorion joined #git
12:05 sireorion need some help!!!! look at my pastebin ----> http://pastebin.com/2Qh36MEW
12:05 CheckDavid joined #git
12:05 selckin try #ubuntu
12:06 johnmilton joined #git
12:06 sireorion i trying everywhere
12:07 selckin you need to run dpkg-reconfigure and stuff, not a git problem
12:07 johnmilton joined #git
12:07 sireorion runit samt git-deamon-run error
12:07 Murii joined #git
12:10 Murii joined #git
12:11 Murii joined #git
12:11 fmcgeough joined #git
12:12 ToBeFree joined #git
12:12 ToBeFree joined #git
12:12 Mobutils joined #git
12:14 Murii joined #git
12:15 Silenced joined #git
12:15 EisNerd moin
12:15 ToBeFree joined #git
12:15 EisNerd is there a way to get a back fixed history after using git subtree split?
12:15 roflin joined #git
12:15 Murii joined #git
12:15 kristofferR joined #git
12:16 star_prone joined #git
12:16 EisNerd so I succeeded in separating things using subtree split and filter-brach tree-filter
12:16 selckin restore backup?
12:16 Silenced Can someone help me how to setup git submodules with a already existing directory structure ?
12:17 cdown joined #git
12:17 EisNerd but now I'd like the references in the history to have the right commit of my subtree in the right place
12:17 synthroid joined #git
12:17 bruce_lee joined #git
12:17 bruce_lee joined #git
12:18 Mobutils_ joined #git
12:18 Silenced I have a directory and few files in the root dir . The dir in the root dir has many dir's which are sub modules . So how to create a submodule setup ?
12:19 crose joined #git
12:19 Snugglebash joined #git
12:19 Snugglebash joined #git
12:20 barteks2x joined #git
12:20 HoloPed__ joined #git
12:20 HappyLoaf_ joined #git
12:21 albel727 joined #git
12:22 d10n-work joined #git
12:22 tinajohnson___ joined #git
12:27 realz joined #git
12:27 kba joined #git
12:28 EisNerd hm I think the basic question it boils down to, is there a way to reqwite the history (not having submodule/subtree) automatically in a way, that it results as it had ever had the submodule/subtree
12:28 kba I just did a rebase and some stuff, and now in the commit log on GitHub, in the bottom right hand corner of my own avatar, there's my avatar again, but smaller
12:28 kba What does that mean?
12:28 kba Next to all of the commits, that is
12:28 EisNerd I would say author and commiter
12:29 nilg joined #git
12:29 EisNerd as both operations are no longer equal
12:29 rchavik joined #git
12:29 kba Ah, so it's because I pushed from another machine, and the two machines are not configured the same way?
12:29 Sc0rpius joined #git
12:29 kba Because it's the same account and same avatar
12:29 a_thakur joined #git
12:30 EisNerd no rebase operation recommits the changes
12:30 algae joined #git
12:30 workerbeetwo selckin: thx.
12:30 kba Ah, you're right! When I do `git log`, I can see that I use different emails
12:30 PCatinean joined #git
12:30 EisNerd so the original author and date is preserved but this no longer matches committer and commit date
12:30 kba Can I change the retrospectively? In some easy way?
12:31 EisNerd maybe you could teach github both emails are from the same subject
12:31 moritz has the good old .mailmap gone out of fashion?
12:32 kba Both emails are listed under github.com/settings/emails
12:34 Celelibi joined #git
12:34 kba I found https://help.github.com/art​icles/changing-author-info/, but this seems dirty
12:38 Macaveli joined #git
12:38 vices_ joined #git
12:39 a_thakur joined #git
12:39 Ryanar joined #git
12:40 vices_ left #git
12:40 vices joined #git
12:40 vices i'm not sure where to ask, I'm installing torch but it seems the connection to github isn't stable.. so during clone it randomly can't connect to a package and it fails.. then i've got to remove the package and try again
12:40 rgrinberg joined #git
12:41 jnavila joined #git
12:41 anonymuse joined #git
12:41 laumann joined #git
12:42 vices_ joined #git
12:42 moritz I have no idea what torch is, but I guess talk to their developers=
12:42 moritz s/=/?/
12:42 moritz github isn't a CDN
12:42 mingrammer joined #git
12:42 ExoUNX joined #git
12:42 moritz and installing from github is pretty much an antipattern (though tempting)
12:45 jnavila joined #git
12:47 fedepad joined #git
12:48 cdown_ joined #git
12:50 crameth joined #git
12:51 notebox joined #git
12:51 jeffreylevesque joined #git
12:52 HappyLoaf_ joined #git
12:53 Snugglebash joined #git
12:53 mycyber joined #git
12:55 prawnzy joined #git
13:00 yaymukund joined #git
13:00 tvw joined #git
13:01 govg joined #git
13:02 a_thakur joined #git
13:02 fedepad joined #git
13:03 t0by joined #git
13:03 qt-x joined #git
13:04 acetakwas joined #git
13:05 dimi1947 joined #git
13:05 emg joined #git
13:06 MillerBoss joined #git
13:08 nilg joined #git
13:08 Anupkumar joined #git
13:08 nofacade_ joined #git
13:09 yaymukund joined #git
13:10 kpease joined #git
13:11 constant joined #git
13:14 qt-x joined #git
13:14 HappyLoaf_ joined #git
13:14 Timvde joined #git
13:15 Mobutils joined #git
13:16 jaguarmagenta joined #git
13:17 MrC joined #git
13:17 jimi_ joined #git
13:18 cdg joined #git
13:18 joelsmith joined #git
13:21 acetakwas joined #git
13:21 dimi1947 joined #git
13:22 HappyLoaf_ joined #git
13:22 jez9999 joined #git
13:22 monoprotic joined #git
13:22 jez9999 Is there a way to set autocrlf (or some other settings) to both convert CRLF to LF on commit, and checkout LF (ie. always eliminate CRLF even on Windows systems)?
13:25 mycyber joined #git
13:27 Gsham joined #git
13:27 AaronMT joined #git
13:28 tim_s007 joined #git
13:29 rjack2 joined #git
13:31 eka joined #git
13:31 tim_s007 hi
13:31 gitinfo tim_s007: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
13:31 tim_s007 we could use a tool to list all files of our git repo and who has edited how many lines (in persent) of that file
13:32 tim_s007 i tryed to find some using www search engin but wasnt able
13:32 shafun joined #git
13:32 tim_s007 anny suggestions?
13:32 tim_s007 we would need an output like
13:32 tim_s007 filea.java  user1 10%  user3 90%
13:32 roelmonnens joined #git
13:33 tim_s007 fileb.java user1 80% user2 10% user3 10%
13:33 tim_s007 or similiar
13:33 ruby_ joined #git
13:34 kristofferR joined #git
13:34 diprotic joined #git
13:34 HappyLoaf_ joined #git
13:35 tim_s007 thanks in advance
13:35 GingerGeek joined #git
13:35 GingerGeek joined #git
13:36 mingrammer joined #git
13:38 notebox joined #git
13:39 Gsham joined #git
13:39 ShekharReddy joined #git
13:39 selckin sounds like a useless stat, why do you want that?
13:40 bremner to determine christmas bonuses
13:40 bremner lowest % at the end of every month is fired
13:41 selckin can you imagine all the bots commiting line endings before the cron job runs
13:41 crose joined #git
13:42 JamesBaxter joined #git
13:42 bremner commit 1: minify all JS. commit 2: revert 1. Win!
13:44 mischat joined #git
13:48 NeXTSUN joined #git
13:51 red82 joined #git
13:53 sangy joined #git
13:53 Hobbyboy joined #git
13:54 jfive joined #git
13:54 danslo joined #git
13:54 jfive hello all
13:54 jnavila joined #git
13:55 jfive if i'm setting up my own git server, is there a way to set up some kind of an alias for the pathname portion of the remote url? for instance /path/to in git@domain.com:/path/to/repo.git
13:55 ash_workz joined #git
13:56 eka joined #git
13:57 MaximusColourum joined #git
13:59 phaleth joined #git
13:59 dviola joined #git
13:59 tim_s007 selckin: we need it because our job is to make comments in our source code about who did what and we dont know anymore..
13:59 tim_s007 and we dont want to go through the whole git repo
14:01 tim_s007 ...
14:01 ELFrederich joined #git
14:01 rom1504 git blame
14:02 selckin for i in $(find -type f); git blame $i --line-porcelain -C -M | grep 'autho ' | sort | uniq -c; done
14:02 ELFrederich it seems newer versions of Git can move / rename submodules just by doing "git mv dependencies/foo vendor/foo".  But after doing this the .gitmodules file has the path changed, but not the name.  How can you change the name?  What does the name actually do?
14:02 guampa joined #git
14:03 hashpuppy joined #git
14:03 Darcidride joined #git
14:03 Mixologic joined #git
14:03 tim_s007 bash: syntax error near unexpected token `git'
14:03 tim_s007 ...
14:03 selckin do git
14:04 HappyLoaf_ joined #git
14:04 osse use git ls-files to produce the list of files
14:04 tim_s007 ah one do...
14:04 tim_s007 mom..
14:04 tim_s007 lookes like i have to exclude .git somhow...
14:05 selckin what osse said
14:05 tim_s007 jea i am not everytime that fdast...
14:06 mischat joined #git
14:06 jguillen joined #git
14:06 tim_s007 so how to exclude .git from find, cant find anything about exclude in finds man
14:07 selckin for i in $(git ls-files); do echo $i; git blame $i --line-porcelain -C -M | grep 'author ' | sort | uniq -c; echo; echo; done
14:07 seaders joined #git
14:08 cwillu_at_work joined #git
14:08 osse git ls-files | while read -r file; do git blame "$file" --line-porcelain -C -M | grep 'autho ' | sort | uniq -c; done
14:08 selckin percent calculation left as excersie for the reader
14:08 bejtxf joined #git
14:08 seaders hey guys, currently got into a mildly bad situation by pushing a private key to a public place
14:08 seaders the key has been invalidated, and we’ve checked for a few other things
14:08 seaders but I’d like to do a history rewrite
14:08 osse !sensitive
14:08 gitinfo [!filter_sensitive] You can use filter-branch to remove sensitive data from a repository's history. https://help.github.com/arti​cles/remove-sensitive-data/
14:08 ResidentBiscuit joined #git
14:09 seaders git filter-branch -f --tree-filter "find . -type f -name *.swift -exec sed -i -e ’s/abcd/defg/g’ {} \;"
14:09 seaders I’ve already got ^^^ working
14:09 seaders but only on the branch I’m currently on
14:09 osse --all
14:09 osse boom
14:09 seaders :D
14:09 seaders awesome
14:10 tvw joined #git
14:10 seaders not running
14:11 seaders —all doesn’t seem to be valid for the command?
14:11 rpg joined #git
14:11 phaleth joined #git
14:11 ELFrederich I have a Git project with submodules.  There are some submodules which are private and not everybody should have access to.  The issue now is that they can't clone the superproject recursively, or do a git submodule update... it'll stop at the first failure.
14:11 constant joined #git
14:12 seaders seems like it’s — —all, as in
14:12 qt-x joined #git
14:12 seaders git filter-branch -f --tree-filter "find . -type f -name *.swift -exec sed -i -e ’s/abcd/defg/g’ {} \;" -- —all
14:12 osse correct
14:12 seaders great, currently running
14:13 Rodya_ joined #git
14:13 seaders thanks osse, very much appreciated
14:15 HappyLoaf_ joined #git
14:15 themill joined #git
14:15 osse ELFrederich: git does not do this kind of stuff well
14:16 patarr joined #git
14:17 osse maybe android's repo tool can help
14:18 emg (any reason not to use + in the find exec?)
14:18 ELFrederich osse: my understanding was that repo was created because submodule didn't exist yet.  Now that it does I'm not sure I should go and learn it.  This isn't an Android project
14:19 EisNerd ok I found a way
14:20 mischat_ joined #git
14:24 jaequery joined #git
14:24 JeroenT joined #git
14:27 rominronin joined #git
14:29 EisNerd hm I'm looking for an elegant way to keep a map of hashes, old->new when preforming filter-branch for lateron rearrangements
14:29 bongjovi joined #git
14:29 benbergm1n left #git
14:31 barteks2x joined #git
14:31 tim_s007 selckin: ah, thanks your secound thing worked
14:31 tim_s007 only got a problem with umlautes
14:31 tim_s007 fatal: cannot stat path '"todos/01_n\303\266tige_Bildvorsch​augr\303\266\303\237en_ermitteln"': No such file or directory
14:31 tim_s007 but i think thats not such a big problem
14:31 tim_s007 thanls for your help
14:32 matsaman joined #git
14:32 dwsr joined #git
14:33 IRC-Andrew joined #git
14:34 e14 joined #git
14:34 ELFrederich is there another file like .gitmodules but stored in .git so it isn't part of the project?
14:35 Dougie187 joined #git
14:35 matsaman can't you exclude it?
14:36 sssilver joined #git
14:36 jast .gitmodules is used by 'git submodule init' to transfer the information in it into your .git/config
14:37 Eryn_1983_FL joined #git
14:37 vassagus joined #git
14:37 jast if you don't need the .gitmodules entry you can just edit .git/config (check an existing repo with submodules to see the right format)
14:38 HappyLoaf_ joined #git
14:39 Kulrak joined #git
14:39 Kulrak joined #git
14:39 tristanp joined #git
14:41 King_Hual joined #git
14:41 King_Hual joined #git
14:41 rominronin joined #git
14:42 crameth joined #git
14:42 moriko joined #git
14:43 mischat joined #git
14:44 clemf joined #git
14:44 VladGh joined #git
14:44 NeXTSUN joined #git
14:45 shgysk8zer0 joined #git
14:48 cdown_ joined #git
14:50 ruby_ joined #git
14:51 johnny56 joined #git
14:52 JanC_ joined #git
14:53 eivarv joined #git
14:54 rpg joined #git
14:55 Darren_ joined #git
14:56 rsukla joined #git
14:56 prawnzy joined #git
14:58 thiago_ joined #git
14:58 webczat joined #git
14:59 webczat left #git
15:01 rominronin joined #git
15:02 vassagus_ joined #git
15:03 vassagus_ joined #git
15:04 Samual joined #git
15:05 rominronin joined #git
15:07 noyb joined #git
15:07 roelmonn_ joined #git
15:07 InfoTest joined #git
15:08 HappyLoaf_ joined #git
15:08 roelmonn_ joined #git
15:08 shgysk8zer0 joined #git
15:10 bsanford joined #git
15:11 mingrammer joined #git
15:11 mingrammer joined #git
15:13 dlkd949fweijf joined #git
15:17 troulouliou_div2 joined #git
15:17 jaguarmagenta joined #git
15:20 subhojit777 joined #git
15:20 lawsrout joined #git
15:23 brokensyntax Are there any droid apps that will let me take a folder structure saved on my SD card and push it to my Git?
15:23 le_melomane joined #git
15:23 ELFrederich need help getting 'git submodule update --remote' to work.  All my googl'ing tells me that newer versions of Git should't detach my HEAD when doing a submodule update.  Here is a self-contained example that shows it doesn't work.  https://paste.pound-python.or​g/show/h8bT8L9FQ97jelK3ad7l/  What am I doing wrong?
15:25 Kulrak joined #git
15:25 Kulrak joined #git
15:29 vassagus joined #git
15:30 danslo joined #git
15:31 jaafar joined #git
15:32 rpg joined #git
15:34 HappyLoaf_ joined #git
15:34 vassagus joined #git
15:35 jnavila joined #git
15:35 mischat joined #git
15:35 rjack2_ joined #git
15:36 snowkidind joined #git
15:38 dreiss joined #git
15:38 Snugglebash joined #git
15:39 whitby joined #git
15:39 moriko joined #git
15:39 shinnya joined #git
15:41 nilg joined #git
15:42 tchan joined #git
15:42 tchan joined #git
15:42 WayToDoor joined #git
15:43 UTAN_dev joined #git
15:43 canuk joined #git
15:45 durham joined #git
15:46 vassagus joined #git
15:47 codfection joined #git
15:48 le_melomane joined #git
15:48 jnavila joined #git
15:48 truckcrash joined #git
15:49 sssilver joined #git
15:49 aarobc joined #git
15:50 truckcrash If I push my changes into a stash, and then pop my changes off the stash into the working dir, does the stash remain around forever? I see it is still there after I have popped it. Over time I could build up a large collection (mess) of stashes. no?
15:51 IRC-Andrew joined #git
15:53 nettoweb joined #git
15:53 whitby truckcrash: Do you use `git stash pop` or `git stash apply`?
15:54 whitby `git stash pop` should drop the entry unless it has conflicts
15:54 truckcrash ah ok. tbh I am used sourcetree gui for this.
15:54 truckcrash good to know the commands though
15:54 crayon joined #git
15:55 truckcrash is the only difference between apply and pop is that apply keeps the stash?
15:55 whitby Yep
15:55 truckcrash great. Thanks!
15:55 whitby At least as far as the command line goes
15:55 whitby I can't comment on what SourceTree does
15:55 truckcrash understood
15:55 truckcrash no prob
15:56 Snopandan joined #git
15:56 PCatinean joined #git
15:58 vassagus joined #git
16:00 joki joined #git
16:00 ochorocho__ joined #git
16:04 t0by joined #git
16:05 mischat_ joined #git
16:09 crayon joined #git
16:09 UTAN_dev joined #git
16:10 crayon joined #git
16:12 tang^ joined #git
16:12 vassagus joined #git
16:13 ochorocho__ joined #git
16:13 shafun joined #git
16:14 UTAN_dev joined #git
16:15 madewokherd joined #git
16:15 LBV_User joined #git
16:15 xaa joined #git
16:16 rjack2_ left #git
16:16 Mobutils joined #git
16:16 bernardio joined #git
16:17 blackwind_123 joined #git
16:17 UTAN_dev_ joined #git
16:17 laumann joined #git
16:17 Snugglebash joined #git
16:18 bluepixel joined #git
16:18 miklcct joined #git
16:19 calloc joined #git
16:20 EvilPenguin joined #git
16:20 aax joined #git
16:21 overlord_tm joined #git
16:24 dstolfa joined #git
16:24 thebope joined #git
16:26 Balliad joined #git
16:26 HappyLoaf_ joined #git
16:27 xaa joined #git
16:28 hahuang62 joined #git
16:28 crose joined #git
16:29 ruby_ joined #git
16:29 chachasmooth joined #git
16:29 dstolfa Just to verify -- I could create a branch for a feature I'm working on, eventhough it was on master until now, revert the changes and use the master branch to create a PR?
16:32 danslo joined #git
16:33 nitric joined #git
16:36 rominronin joined #git
16:38 jnavila_ joined #git
16:39 jberkus joined #git
16:40 hfp joined #git
16:40 ansimation joined #git
16:40 e14 joined #git
16:40 hfp_work joined #git
16:42 rffleaie joined #git
16:43 rffleaie left #git
16:43 rffleaie joined #git
16:43 khfeng joined #git
16:44 HappyLoaf_ joined #git
16:45 rffleaie How can I merge tow different repositories, is the same project the first N reviosn is in the first repo the secon n revisions is in the secon repo
16:45 rffleaie ????
16:46 bluepixel joined #git
16:46 Seveas dstolfa: yes
16:47 Darcidride joined #git
16:47 Mobutils joined #git
16:47 Seveas dstolfa: and i wouldn't revert, just reset master to before the commits for the feature
16:47 navidr joined #git
16:48 mischat joined #git
16:48 ruby_ joined #git
16:48 brokensyntax joined #git
16:49 jaequery joined #git
16:49 dstolfa Seveas: Wouldn't that cause the feature branch to have only 1 commit -- with everything I've done?
16:49 Seveas dstolfa: !soviet_git
16:49 gitinfo dstolfa: In Soviet Git, commits are not on branches, branches point to a commit.
16:50 Seveas your branch is just a label that points to the latest commit, the PR will take into account all commits in your branch that are not on the branch you're doing a PR against
16:51 rffleaie someone can help me?
16:51 rorro joined #git
16:51 dstolfa Seveas: So technically, I could make the branch point to the commit at the point of forking and add things I need?
16:52 Seveas dstolfa: yes
16:52 dstolfa Seveas: Okay, awesome. Thanks
16:53 miklcct joined #git
16:53 constant joined #git
16:53 tyreld_ joined #git
16:53 cspack joined #git
16:54 a_thakur joined #git
16:54 freimatz joined #git
16:55 ahmedelgabri joined #git
16:57 prawnzy joined #git
16:57 fees joined #git
16:58 nikivi joined #git
17:01 cdown joined #git
17:05 einnjo joined #git
17:08 HappyLoaf_ joined #git
17:12 synthroid joined #git
17:12 ays_ joined #git
17:13 LionsMane joined #git
17:14 Balliad joined #git
17:15 synne joined #git
17:17 chris2 joined #git
17:17 thiago joined #git
17:17 cspack joined #git
17:18 jaguarmagenta joined #git
17:19 Mobutils joined #git
17:20 fedepad joined #git
17:21 Vauff joined #git
17:21 fedepad joined #git
17:21 hahuang62 joined #git
17:22 WaReZ joined #git
17:24 SteffanW joined #git
17:24 e14 joined #git
17:28 lawsrout joined #git
17:28 AaronMT joined #git
17:29 dreiss joined #git
17:30 danimal2 joined #git
17:30 bongjovi joined #git
17:32 HappyLoaf_ joined #git
17:32 fahadash joined #git
17:33 danslo joined #git
17:35 Zamyatin joined #git
17:36 shgysk8zer0 joined #git
17:37 PioneerAxon joined #git
17:37 ELFrederich need help getting 'git submodule update --remote' to work.  All my googl'ing tells me that newer versions of Git should't detach my HEAD when doing a submodule update.  Here is a self-contained example that shows it doesn't work.  https://paste.pound-python.or​g/show/h8bT8L9FQ97jelK3ad7l/  What am I doing wrong?
17:38 mikecmpbll joined #git
17:39 duderonomy joined #git
17:41 HappyLoaf_ joined #git
17:43 thebope joined #git
17:44 fuchstronaut joined #git
17:47 leones joined #git
17:47 jaafar joined #git
17:49 JamesBaxter joined #git
17:49 Sasazuka joined #git
17:50 rpg joined #git
17:50 clemf joined #git
17:51 dreiss joined #git
17:51 fedepad joined #git
17:52 rsukla joined #git
17:52 robotroll joined #git
17:55 dsantiago joined #git
17:58 cdown joined #git
18:00 mmlb joined #git
18:01 Anupkumar joined #git
18:02 multi_io joined #git
18:03 HappyLoaf_ joined #git
18:06 rominronin joined #git
18:06 Mobutils joined #git
18:06 dodobrain joined #git
18:07 osse joined #git
18:08 tvw joined #git
18:10 Darren_ joined #git
18:12 leeN joined #git
18:21 Atm0spher1c joined #git
18:23 ochorocho__ joined #git
18:26 Surfer2010_ joined #git
18:27 kyan joined #git
18:28 ochorocho__ joined #git
18:32 lawsrout joined #git
18:34 danslo joined #git
18:34 dunaeth joined #git
18:35 inflames joined #git
18:37 mingrammer joined #git
18:37 creppe joined #git
18:37 perlpilot_ joined #git
18:39 nettoweb joined #git
18:40 tzafrir joined #git
18:40 sparr joined #git
18:41 _ADN_ joined #git
18:41 diogenese joined #git
18:41 dunaeth joined #git
18:43 errr joined #git
18:43 mikecmpbll joined #git
18:44 sangy joined #git
18:45 Sasazuka__ joined #git
18:45 Snugglebash joined #git
18:46 simenbrekken joined #git
18:46 HappyLoaf_ joined #git
18:50 barteks2x joined #git
18:57 HappyLoaf_ joined #git
18:57 crawler joined #git
18:58 prawnzy joined #git
18:59 _sjs joined #git
18:59 jknetl joined #git
19:01 ochorocho__ joined #git
19:03 SteffanW joined #git
19:03 kpease joined #git
19:03 kulelu88 joined #git
19:04 eshlox joined #git
19:04 star_prone joined #git
19:06 _sjs joined #git
19:10 Snugglebash joined #git
19:10 ixian joined #git
19:15 perlpilot joined #git
19:15 mike__ joined #git
19:15 neilthereildeil joined #git
19:15 neilthereildeil hi, how can i just apply changes to 1 file from a patch that has a diff for multiple files?
19:16 Darren_ joined #git
19:17 HappyLoaf_ joined #git
19:17 zivester joined #git
19:17 Balliad joined #git
19:17 overlord_tm joined #git
19:20 Ryanar joined #git
19:21 IRC-Andrew joined #git
19:21 crose joined #git
19:21 stamina joined #git
19:24 kpease joined #git
19:24 nilg joined #git
19:25 jimi_ joined #git
19:28 cdown joined #git
19:29 red82 joined #git
19:30 guampa joined #git
19:32 dodobrain joined #git
19:33 red82_ joined #git
19:35 _ikke_ easiest is to just modify the patch to only contain changes to that file
19:35 Lewoco joined #git
19:36 Lewoco Is there any way to make `git diff` include untracked (but not ignored files)?
19:36 Lewoco Heck, why doesn't it do this by default =/
19:36 Ravana joined #git
19:37 _ikke_ Lewoco: Because it's untracked
19:37 ResidentBiscuit I think the --no-index flag is what you want
19:37 _ikke_ No, that's something different
19:37 _ikke_ That's when you want to diff two files together
19:37 Lewoco So there's no way to do it?
19:38 _ikke_ Lewoco: git add -N <file>; git diff
19:38 sunri5e joined #git
19:38 russo joined #git
19:38 _ikke_ But you will just see the entire file as added
19:39 ResidentBiscuit What's your usecase for this?
19:39 rishi` joined #git
19:40 cust_ joined #git
19:40 WakiMiko joined #git
19:40 napoleon joined #git
19:40 clemf joined #git
19:40 nidr0x joined #git
19:40 Lewoco ResidentBiscuit: I've made a bunch of changes, some to existing (tracked files) and some to new files. I want an overview of everything so I can start populating the index.
19:41 ResidentBiscuit But git has no idea what the file was like before you changed it
19:41 sfan786_ joined #git
19:41 _ikke_ Right
19:41 _ikke_ So it can only say that every line is added
19:41 Lewoco Yeah that's what I want.
19:41 snsapiens joined #git
19:41 ResidentBiscuit Why not just add the file then?
19:42 demize- joined #git
19:42 rideh- joined #git
19:42 dmarr joined #git
19:42 jor joined #git
19:42 cathyjf joined #git
19:42 twisted` joined #git
19:42 pluc_pilou joined #git
19:43 NeverDie joined #git
19:43 boombatower joined #git
19:43 flupke joined #git
19:43 jnewt__ joined #git
19:44 sbeller joined #git
19:44 mozzarel1 joined #git
19:44 slikts joined #git
19:44 VoidFox joined #git
19:45 shauna joined #git
19:45 Neo_ joined #git
19:45 nolageek joined #git
19:45 lebster_ joined #git
19:45 harambea joined #git
19:46 Bigcheese_ joined #git
19:46 freddymungo joined #git
19:46 HarryHallman_oth joined #git
19:46 fuchstronaut joined #git
19:46 preilly joined #git
19:46 rzeka_ joined #git
19:47 RustyShackleford joined #git
19:47 heinrich5991_ joined #git
19:48 Chinorro joined #git
19:48 biertie joined #git
19:48 stfn1 joined #git
19:49 Zarthus_ joined #git
19:49 gsingh93- joined #git
19:49 sunri5e joined #git
19:49 msonntag_ joined #git
19:49 tom][ joined #git
19:50 Arokh joined #git
19:50 blueyed_ joined #git
19:50 idmistir joined #git
19:50 ojacobson joined #git
19:50 ghostlight joined #git
19:51 sigjuice joined #git
19:51 DonRichie joined #git
19:51 tabakhase joined #git
19:51 marlinc joined #git
19:51 Olipro joined #git
19:52 ToBeCloud joined #git
19:53 theresajayne joined #git
19:53 eggoez joined #git
19:54 aboccia joined #git
19:54 johnmilton joined #git
19:55 dunaeth joined #git
19:55 Mogget joined #git
19:55 nolageek joined #git
19:55 jwmann joined #git
19:56 Bombe joined #git
19:56 DonRichie joined #git
20:00 flobin joined #git
20:02 mischat_ joined #git
20:03 ixian joined #git
20:04 Samual joined #git
20:04 Samual joined #git
20:05 Mixologic joined #git
20:05 hexagoxel joined #git
20:06 hexagoxel joined #git
20:07 pks joined #git
20:07 msonntag joined #git
20:08 rorro joined #git
20:08 Remram joined #git
20:08 jnavila_ joined #git
20:08 miklcct joined #git
20:09 minibar joined #git
20:09 heroux joined #git
20:10 cdg joined #git
20:11 hexagoxel joined #git
20:12 nioncode joined #git
20:13 hexagoxel joined #git
20:13 Urbany joined #git
20:15 Eugene joined #git
20:15 elastix joined #git
20:16 hexagoxel joined #git
20:16 hexagoxel joined #git
20:17 p4trix joined #git
20:18 tom][ left #git
20:19 belak51 joined #git
20:19 lawsrout joined #git
20:20 Ryanar joined #git
20:21 prawnzy joined #git
20:21 citizen-stig joined #git
20:22 HappyLoaf_ joined #git
20:23 BlessJah joined #git
20:24 BlessJah6 joined #git
20:25 sunri5e joined #git
20:25 BlessJah joined #git
20:25 Samual joined #git
20:25 Samual joined #git
20:26 mingrammer joined #git
20:26 endiruna joined #git
20:27 belak joined #git
20:27 realz joined #git
20:29 yoh what could lead to "fatal: Out of memory, getdelim failed" while doing a mere show-ref?  there is ample memory avail (>1TB)
20:30 dalias yoh, 64-bit system?
20:30 yoh yes
20:31 ResidentBiscuit TB of memory?
20:32 devxom joined #git
20:32 yoh ResidentBiscuit: yeap
20:32 m0viefreak joined #git
20:32 ^7heo just as a random check
20:32 yoh total 1.5 to be precise but some is used ...  Mem:           1.5T        661G        833G        3.7G         17G        846G
20:33 ^7heo we're talking about RAM here right?
20:33 ^7heo not some disk space...
20:33 ixian joined #git
20:33 aidalgol joined #git
20:33 yoh ^7heo: yeap -- that was output of free -h
20:33 ^7heo yeah ok.
20:33 ^7heo then I dunno.
20:33 ResidentBiscuit TIL you can buy TBs of ram at a time
20:33 ResidentBiscuit Newegg has some for $20k
20:33 ^7heo ResidentBiscuit: you actually can yes.
20:34 ResidentBiscuit That's kinda cool. What are common uses for that?
20:34 ResidentBiscuit Storing large databases in memory?
20:34 yoh here are bits from strace:  http://pastebin.com/AXEP9qau
20:36 belak How big is the packed refs file?
20:36 belak git cheats and does some strange things with files for the sake of speed.
20:37 yoh these are all test repos so tiny... hold on though... I am onto smth... ;)  need a binary build of git 2.8.1...
20:37 belak Hm, good luck
20:38 rpg joined #git
20:38 yoh the point is that it doesn't puke with system wide installed older 1.8.3.1
20:38 nowox joined #git
20:39 yoh so may be the problem root is within "standalone" bundling of git within git-annex here...  so need to test against pure 2.8.1
20:39 ixian joined #git
20:39 cagedwisdom joined #git
20:41 Ryanar joined #git
20:41 Balliad joined #git
20:42 le_melomane joined #git
20:44 ahr3n joined #git
20:45 ixian joined #git
20:46 Olipro joined #git
20:47 snthsnth joined #git
20:47 ash_workz joined #git
20:47 fuchstronaut joined #git
20:50 [cust] joined #git
20:51 xaa joined #git
20:53 mycelium joined #git
20:54 HappyLoaf_ joined #git
20:55 Atlantic777 joined #git
20:55 Atlantic777 joined #git
20:55 Xe joined #git
20:56 alex1a joined #git
20:56 Anupkumar joined #git
20:59 btree joined #git
20:59 marcaddeo joined #git
20:59 msonntag joined #git
20:59 Samual joined #git
20:59 btree left #git
21:00 chamunks joined #git
21:01 qsx joined #git
21:06 Zamyatin joined #git
21:06 bejeb joined #git
21:06 lexxis joined #git
21:07 cwillu_at_work joined #git
21:09 AndreSomers joined #git
21:10 Xe joined #git
21:10 Samual joined #git
21:10 nidr0x joined #git
21:10 cdown_ joined #git
21:12 ahr3n joined #git
21:13 Puffball joined #git
21:13 _August_ joined #git
21:14 Hogofwar joined #git
21:14 _August_ whats the correct way to merge the changes from one branch to another?
21:15 _August_ is it git checkout bluebranch. git merge redbranch?
21:15 biertie joined #git
21:16 jwmann joined #git
21:17 HappyLoaf_ joined #git
21:17 eivarv joined #git
21:19 Samual joined #git
21:19 jaguarmagenta joined #git
21:21 canuk joined #git
21:24 axl_ joined #git
21:25 Dougie187 left #git
21:26 Puffball_ joined #git
21:26 snthsnth joined #git
21:27 Samual joined #git
21:29 axl_ left #git
21:29 soerenb joined #git
21:30 laumann joined #git
21:30 romerocesar joined #git
21:32 cdown__ joined #git
21:32 SwiftMatt joined #git
21:32 satifant joined #git
21:39 nd_ joined #git
21:41 Samual joined #git
21:43 jimi_ joined #git
21:43 ShekharReddy joined #git
21:43 e14 joined #git
21:44 HappyLoaf_ joined #git
21:44 poz3idon joined #git
21:45 mischat joined #git
21:46 yoh ok -- that out of memory error is inconsistent  http://pastebin.com/nRw1Zxej   the question remains (since I don't have build depends there) -- where could I find a trustworthy build of a recent git for centos?
21:48 ResidentBiscuit Are you against building it yourself?
21:48 fuchstronaut joined #git
21:49 BeerSerc joined #git
21:49 yoh ResidentBiscuit: I am not at all but that centos installation is bare
21:49 yoh no -dev libs avail
21:49 Puffball joined #git
21:49 _August_ I am trying to push the changes from brach 1.4 to the branch development
21:49 _August_ i checked out on 1.4, git merge development, and then git push origin development and nothing...
21:50 yoh and no admin rights.... I guess I could do it in docker env locally but I have no experience with rpm/yum (debian rotten)
21:50 ResidentBiscuit Yeah that makes building hard. I'm not sure where else you'd look besides the centos repos :/
21:50 ResidentBiscuit ARe you on an older version of centos? I would imagine you could get at least a 2.x version
21:51 sdothum joined #git
21:52 Gsham joined #git
21:53 cyphase joined #git
21:53 cdown_ joined #git
21:54 cyphase joined #git
21:54 yoh there is only  1.8.3.1 system wide     CentOS Linux release 7.2.1511 (Core)
21:56 sdothum joined #git
21:56 sangy joined #git
21:56 yoh actually it works fine with git 2.7.0  bundled with git-annex from earlier this year...
21:56 cyphase joined #git
21:56 yoh so if it is a git issue -- it is pass that.
22:02 crawler joined #git
22:06 rpg joined #git
22:07 nedbat _August_: you want:  git checkout development; git merge 1_4
22:08 _August_ nedbat, says its up to date
22:08 sunri5e joined #git
22:09 _August_ what do i put to push those into the branch?
22:09 nedbat _August_: what have you done up to this point? Probably want a pull between those two commands
22:09 thebope joined #git
22:09 _August_ yeah the changes are waiting to be pushed i guess
22:10 nedbat _August_: you keep talking about pushing, but that isn't what you need
22:10 _August_ this is what i did
22:10 _August_ i went to development branched and checked out
22:10 _August_ then i git merge 1.4
22:10 nedbat _August_: "went to"?
22:10 _August_ all the changes come up
22:11 Snugglebash joined #git
22:11 _August_ went to my terminal
22:11 _August_ sorry
22:11 cdg joined #git
22:12 _August_ says 17 files changed 518 insertions ect...
22:12 nedbat _August_: do this, and pastebin the results:  git checkout development; git pull; git checkout 1.4; git pull; git log --oneline --decorate --graph development 1.4
22:13 anonymuse joined #git
22:13 _August_ ok
22:14 awt joined #git
22:15 fahadash joined #git
22:16 elastix joined #git
22:16 _August_ nedbat, http://pastebin.com/Mqggdkcg
22:17 madewokherd joined #git
22:17 nedbat _August_: you had to change "1.4" to "v1.4" in the last command
22:18 neilthereildeil left #git
22:19 _August_ http://pastebin.com/5c2zVCTy
22:19 awt .list
22:19 _August_ nedbat, ^^
22:20 nedbat _August_: it looks like you've already merged v1.4 to development.
22:21 nedbat _August_: you had four commits for v1.4 I think
22:21 _August_ yup
22:21 _August_ how come i dont see it reflected on gitlab?
22:22 _August_ says the last commit was 2 weeks ago
22:23 _August_ i dont think the changes were pushed into it
22:23 nedbat _August_: yes, now you need to do: git push
22:24 QwertyDragon joined #git
22:24 _August_ push into development right?
22:24 _August_ while im checked out on 1.4?
22:24 nedbat _August_: git checkout development; git push
22:25 tvw joined #git
22:25 _August_ there we go
22:26 cdown__ joined #git
22:26 _August_ let me ask this...
22:26 _August_ how do you do a single commit push when merging?
22:27 nedbat _August_: you need to separate the concepts of pushing and merging.
22:27 akanksha_ joined #git
22:27 _August_ lol ok
22:28 mizu_no_oto joined #git
22:28 lexxis joined #git
22:28 nedbat merging is about manipulating commits in your repo.  pushing is about moving commits from one repo to another
22:28 prawnzy joined #git
22:29 _August_ ok well how can I do a single commit when merge my changes from one branch into another?
22:30 lexxis joined #git
22:32 nedbat _August_: do you mean, you want to take the four commits from v1.4, and turn all that work into one commit on development?
22:32 _August_ yeah
22:32 nedbat _August_: you want to learn about rebasing, and squashing.
22:33 sdothum joined #git
22:33 _August_ that just sounds like hell
22:33 akanksha_ Hello, I am a new contributor to QEMU and I need to congifure git sendemail to send my patches to the mailing list. It probably sends the email through SMTP, Postfix. I want to configure it to my gmail address. Is someone here who can help me with this?
22:34 nedbat _August_: it can be a little intimidating, but you get used to it
22:39 HappyLoaf_ joined #git
22:41 usm4n joined #git
22:44 acetakwas joined #git
22:44 sgrover joined #git
22:44 NwS joined #git
22:46 sgrover Looking for thoughts.  Trying to implement a GitFlow workflow.  We keep stumbling on the point where code should be moved from staging to master because we have multiple tasks on the staging branch at different states of readiness.
22:48 sgrover (our central develop branch = developer QA where we integrate our code with the others.  I'm thinking this is the failing point - we can't merge to develop if we have conflicts so the integration actually takes place on our individual workstations.
22:49 fuchstronaut joined #git
22:49 sgrover Our overall workflow is develop -> staging -> master.  User acceptance testing takes place on the staging branch/server.
22:49 lawsrout joined #git
22:49 sgrover I don't know if that is clear enough or where I need to offer more details... any thoughts?
22:50 Milijus joined #git
22:50 HappyLoaf_ joined #git
22:51 IRC-Andrew joined #git
22:51 sgrover The stumbling manifests in the form of "we need 'this' code on the production server, but not 'that' code.
22:52 sgrover My thoughts is that if it is not ready for production it should not be on staging for the final reviews...  I'm getting resistance on that.
22:54 romerocesar joined #git
22:56 nedbat sgrover: i don't know anything about gitflow, but i agree: staging is about staging code for production. if it isn't ready, why is it in staging?
22:56 nedbat sgrover: or, why do people say, "not that code"?
22:56 anuxivm joined #git
22:57 Milijus joined #git
22:58 citizen-stig joined #git
23:00 sgrover It's an ecomm site.  "that code' is a new feature, 'this code' might be a bug fix, 'that other code' might be another feature that is waiting for the ERP team to implement something, etc...
23:00 HappyLoaf_ joined #git
23:01 mischat joined #git
23:01 QwertyDragon joined #git
23:01 sgrover We do have what we call the "QA Server" - the develop branch deploys to this.  That was initially just a fluff thing because some members of the team are VERY tied to the Feature Branch workflow (which caused code loss and other issues the way they were doing it...)
23:03 Ryanar joined #git
23:05 nedbat sgrover: ok, so when you say, "don't deploy THAT code": why is that code on staging if it isn't ready to go to production?
23:05 mycyber joined #git
23:05 sgrover user testing
23:06 sgrover It is supposed to be the "stable" code.  During our user testing it's not uncommon to find that the ERP backend missed a deadline or three, or did something different than what was communicated or expected.
23:06 aidalgol joined #git
23:06 olalonde joined #git
23:06 snthsnth joined #git
23:07 nedbat sgrover: then you need a way to revert something from staging I guess
23:07 sgrover I'm thinking we may need another layer or two in our flow - maybe:  integration (develop branch) -> usertesting (uat branch) -> staging -> master.
23:07 nedbat sgrover: then what is the point of staging? Another test after the test?
23:08 mingrammer joined #git
23:08 sgrover nedbat: reverting is the answer right now, or skipping the staging step in some cases - which just serves to highlight the problem I'm trying to resolve... :)
23:09 sgrover two types of testing.  User testing - i.e. does it break under normal workflows, and management testing/approvals - i.e. does it meet the business needs, do we need to make that text bold, etc.
23:10 Vinnie_win_e joined #git
23:10 sgrover I think the second level of testing should have been handled before a line of code was written, but the mindsets are pretty firm here.
23:10 Milijus joined #git
23:10 HappyLoaf_ joined #git
23:12 aarobc joined #git
23:14 usm4n_ joined #git
23:15 acetakwas joined #git
23:17 nedbat sgrover: what we do (at edX) is: work is done on pull requests. When they pass all tests, reviews, etc, they are merged to master. When it is time to release code, a release candidate branch is made from master. That goes to staging, testing happens, if it's all good, it goes to production.
23:17 NaN joined #git
23:17 NaN hi there
23:17 NaN is it possible to stash only 1 file from my workig directory?
23:19 Ryanar joined #git
23:20 a_ joined #git
23:20 jaguarmagenta joined #git
23:21 mablae__ joined #git
23:21 rpg_ joined #git
23:22 e14 joined #git
23:23 Milijus joined #git
23:24 a_ joined #git
23:26 fedepad joined #git
23:27 a_ joined #git
23:27 usm4n joined #git
23:27 whomp joined #git
23:27 whomp my pr on github isn't updating, what should i do?
23:28 catsup_ joined #git
23:28 einnjo joined #git
23:28 chachasmooth joined #git
23:28 ^7heo whomp: push harder.
23:30 NaN lol
23:30 NaN -wc
23:30 NaN left #git
23:30 t0n1c joined #git
23:32 fedepad joined #git
23:32 fuchstronaut joined #git
23:33 ahr3n joined #git
23:35 realz joined #git
23:38 HappyLoaf_ joined #git
23:38 sgrover nedbat: Thanks.  The release candidate idea sounds promising.  I'll need to think on this though.. too many variables here.
23:39 nedbat sgrover: yes, i don't envy you trying to change that process.
23:39 dodobrain joined #git
23:39 danslo joined #git
23:39 whomp *cires*
23:39 whomp cries
23:39 falkenb0t joined #git
23:40 nedbat whomp: what are you doing to update the pr?
23:40 whomp it's ok, i did it another way
23:42 fuchstronaut joined #git
23:42 sangy joined #git
23:43 sweatsuit joined #git
23:46 acetakwas joined #git
23:50 Derperperd joined #git
23:53 Gsham joined #git
23:54 _August_ joined #git

| Channels | #git index | Today | | Search | Google Search | Plain-Text | summary