IRCloggy #git 2017-04-20

Provider of IRC logs since 2005.

WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

	2017-04-20
	→ menip joined	00:01
	→ thiago joined	00:03
	← Fallen0223 left	00:03
	← fission6 left	00:04
	→ Noodlewitt joined	00:04
	← aidalgol left	00:06
	← qpdb left	00:07
	→ qpdb joined	00:07
	← bruce_lee left	00:08
	→ bruce_lee joined	00:09
	← drodger left	00:09
	→ jimi_ joined	00:09
	← alexandre9099 left	00:10
	→ alexandre9099 joined	00:12
	→ drodger joined	00:15
	← cqi left	00:16
	→ ToBeCloud joined	00:16
	gitinfo set mode: +v	00:16
	← HurricaneHarry left	00:17
	← tnecniv left	00:18
	→ HurricaneHarry joined	00:18
	→ Starky joined	00:20
	← drodger left	00:20
	→ nexemacs joined	00:23
	→ drodger joined	00:26
	← jstimm left	00:27
	→ durham_ joined	00:28
	← jimi_ left	00:28
	→ jstimm joined	00:30
	← overlord_tm left	00:30
	← durham left	00:31
	← unplayednamer left	00:31
	→ unplayednamer joined	00:32
	→ ProLoser joined	00:32
	← durham_ left	00:32
	← NeXTSUN left	00:37
	→ jimi_ joined	00:37
	← porfiriopaiz left	00:40
	← Darren_ left	00:42
	← afuentes left	00:42
	← anuxivm left	00:42
	→ theiostream joined	00:43
	← drodger left	00:43
	← jimi_ left	00:45
	→ sammyo joined	00:46
	→ Gsham joined	00:47
	← Domhack left	00:48
	→ Domhack joined	00:49
	→ drodger joined	00:49
	← loskutak left	00:50
	← BenderRodriguez left	00:50
	→ cdown joined	00:52
	← HoierM left	00:54
	← mikecmpbll left	00:55
	← fstd left	00:56
	→ fstd_ joined	00:56
	fstd_ → fstd	00:56
	← sammyo left	00:57
	← cdown left	01:00
	← kfoonamalik left	01:00
	→ jimi_ joined	01:01
	← batrick left	01:01
	← mentazoom left	01:01
	← duderonomy left	01:02
	← Cabanossi left	01:02
	→ duderono_ joined	01:03
	→ Cabanossi joined	01:03
	← gopar left	01:04
	← unplayednamer left	01:05
	← qpdb left	01:06
	→ HoierM joined	01:07
	→ justanotheruser joined	01:10
	← nexemacs left	01:11
	← m1dnight_ left	01:12
	← rnsanchez left	01:12
	→ tnecniv joined	01:13
	→ m1dnight_ joined	01:13
	→ batrick joined	01:17
	→ NeXTSUN joined	01:17
	Peetz1r → Peetz0r	01:17
	← marianina8 left	01:18
	← jstimm left	01:21
	← msonntag left	01:24
	→ msonntag joined	01:24
	→ chipotle joined	01:24
	← systemovich left	01:25
	→ nexemacs joined	01:25
	← Sasazuka left	01:25
	→ systemovich joined	01:26
	→ finalbeta joined	01:27
	← nexemacs left	01:29
	→ kadoban joined	01:31
	→ LeBlaaanc joined	01:32
	← PaulCape_ left	01:33
	← duderono_ left	01:34
	← raijin left	01:36
	← dsdeiz left	01:43
	← leeN left	01:43
	→ dsdeiz joined	01:44
	← dsdeiz left	01:44
	→ dsdeiz joined	01:44
	← Cabanossi left	01:46
	→ Cabanossi joined	01:48
	← tnecniv left	01:50
	← ojdo left	01:51
	→ scarabx joined	01:51
	← bronson left	01:51
	← chipotle left	01:51
	← uruk left	01:52
	→ dsdeiz_ joined	01:52
	← netj left	01:52
	→ netj joined	01:52
	← dsdeiz left	01:53
	← shgysk8zer0 left	01:55
	→ uruk joined	01:56
	→ bannakaf_ joined	01:56
	← bannakaffalatta left	01:57
	→ Kaisyu joined	01:57
	→ qpdb joined	01:59
	← uruk left	02:01
	← sunri5e left	02:03
	→ ojdo joined	02:03
	→ sucks joined	02:05
	← lknd left	02:05
	→ sunri5e joined	02:06
	← dsdeiz_ left	02:08
	→ Goplat joined	02:10
	← pifon left	02:13
	bannakaf_ → bannakaffalatta	02:13
	→ aidalgol joined	02:15
	← NoOutlet left	02:17
	→ tnecniv joined	02:18
	→ NoOutlet joined	02:18
	→ fission6 joined	02:20
	← fission6 left	02:21
	← ToBeCloud left	02:21
	→ fission6 joined	02:22
	→ duderonomy joined	02:22
	← HoierM left	02:23
	→ dsdeiz joined	02:25
	← dsdeiz left	02:25
	→ dsdeiz joined	02:25
	→ jameser joined	02:25
	← oskarkv left	02:26
	→ cqi joined	02:27
	← Starky left	02:30
	→ chipotle joined	02:32
	← madewokherd left	02:32
	← snowkidind left	02:33
	← Gustavo6046 left	02:33
	→ webdev007 joined	02:33
	→ danimal2 joined	02:33
	← sentriz left	02:34
	← bruce_lee left	02:35
	→ bruce_lee joined	02:36
	← bruce_lee left	02:36
	→ bruce_lee joined	02:36
	→ tinnn joined	02:37
	← Aeterne left	02:37
	→ dreiss joined	02:39
	← tinnn left	02:43
	→ tinnn joined	02:43
tinnn	how can I add a local branch master and set it's upstream to a remote branch in one go? I can't use clone	02:43
	← lb1c left	02:44
	→ lb1c joined	02:44
	← ojdo left	02:45
	→ Saint_Isadore joined	02:47
	→ Vortex34 joined	02:49
	→ cagedwisdom joined	02:51
	← LeBlaaanc left	02:51
	← Vortex35 left	02:52
	→ bronson joined	02:52
	← hexagoxel left	02:52
	→ aavrug joined	02:53
	← dreiss left	02:53
	→ lagothri1 joined	02:54
	→ oskarkv joined	02:55
	→ fbwnd joined	02:55
	← dirtyroshi left	02:56
	→ ojdo joined	02:56
	← lagothrix left	02:57
	← chachasmooth left	02:57
	← theiostream left	02:57
	→ chachasmooth joined	02:58
	→ gregor2 joined	02:59
	→ agileadam joined	02:59
	→ hexagoxel joined	02:59
	← ShapeShifter499 left	03:00
	← Cabanossi left	03:01
	→ a_thakur joined	03:01
	← earnestly left	03:01
LordRyan	git init; git remote add origin <URL>;	03:02
	← Gsham left	03:02
LordRyan	I dunno how to set upstream offhand. I'm not at a computer	03:02
	→ jstimm joined	03:03
	→ onehrxn joined	03:04
	→ Cabanossi joined	03:04
	← chachasmooth left	03:04
	→ sucks_ joined	03:06
	← pbrewczynski_c left	03:07
	→ chachasmooth joined	03:07
	← sucks left	03:09
	→ kbeflo__ joined	03:11
	← sucks_ left	03:12
	→ ShapeShifter499 joined	03:12
	← jimi_ left	03:13
	← webdev007 left	03:13
	← LBV_User left	03:14
	← kbeflo_ left	03:14
	→ ZyX-I joined	03:16
tinnn	thanks LordRyan	03:17
	← tinnn left	03:17
	← fission6 left	03:19
	← fakenerd left	03:20
	→ LeBlaaanc joined	03:25
	← Noldorin left	03:26
	→ SwiftMatt joined	03:27
	→ jimi_ joined	03:30
	→ justan0theruser joined	03:30
	→ govg joined	03:32
	← justanotheruser left	03:33
	→ durham joined	03:35
	← kpease left	03:36
	→ pifon joined	03:39
	→ AfroThundr joined	03:40
	← AfroThundr left	03:40
	← boombatower left	03:44
	← Cabanossi left	03:46
	→ Cabanossi joined	03:47
	← jstimm left	03:48
	→ cdown joined	03:48
	→ navidr joined	03:50
	← MineCoins left	03:52
	← bilal left	03:52
	→ bilal joined	03:52
	→ jost_ joined	03:53
	← jost left	03:55
	→ alexggordon joined	03:55
	→ t-mart joined	03:56
	← cdown left	03:58
	→ nexemacs joined	03:59
	← gregor2 left	04:02
	← LeBlaaanc left	04:02
	← nexemacs left	04:03
	← jimi_ left	04:06
	→ gregor2 joined	04:06
	→ rscata joined	04:09
	→ fahadash joined	04:10
	→ LeBlaaanc joined	04:13
	→ re1_ joined	04:13
	← re1 left	04:17
	← aidalgol left	04:18
	← svm_invictvs left	04:18
	← Saint_Isadore left	04:24
	→ fakenerd joined	04:26
	→ PaulCapestany joined	04:27
	← NeXTSUN left	04:27
	→ cdown joined	04:28
	← alexggordon left	04:30
	← bronson left	04:31
	← Noodlewitt left	04:35
	← kbeflo__ left	04:36
	← matoro left	04:38
	← chipotle left	04:38
	← cdown left	04:38
	→ pbrewczynski_c joined	04:38
	→ matoro joined	04:41
	← mda1 left	04:43
	→ mda1 joined	04:44
	→ ayogi joined	04:44
	→ chipotle joined	04:44
	→ Darren_ joined	04:45
	← diogenese left	04:46
	← pietv left	04:46
	← oskarkv left	04:46
	→ aw1 joined	04:48
	← mda1 left	04:49
	← orbyt_ left	04:49
	→ novice0310 joined	04:51
	→ mda1 joined	04:52
	← agileadam left	04:52
	→ Noodlewitt joined	04:52
	→ diogenese joined	04:52
	→ bronson joined	04:52
	gitinfo set mode: +v	04:54
	→ nexemacs joined	04:55
	← bronson left	04:56
	→ Lucky-- joined	04:57
	← Peetz0r left	04:58
	→ re1 joined	04:58
Lucky--	So I took over a project from another developer. At the time I had the Nov '16 codebase. I committed that to master, and started refactoring that in a branch called "interface refactor." In between then and now, I had to do some edits to the master branch for the stakeholders. I have now foundout that there was a Dec 16	04:58
	→ freimatz joined	04:58
Lucky--	code base and it has substantial edits that I need to add to my branch among other things. Any tips to handle this situation?	04:59
	→ Peetz0r joined	04:59
	→ MeltedLux joined	04:59
	← Cabanossi left	05:01
	→ svm_invictvs joined	05:02
	← re1_ left	05:02
	→ Cabanossi joined	05:02
	← nexemacs left	05:03
	← ShapeShifter499 left	05:06
	→ nexemacs joined	05:06
	→ safe joined	05:07
	→ peepsalot joined	05:07
_ikke_	commit it on top of the original code base, then merge it in, deal with conflicts?	05:07
	→ overlord_tm joined	05:10
	← gregor2 left	05:11
	← nexemacs left	05:13
	→ Paper-Mario joined	05:13
	→ tymczenko joined	05:14
rwp	Lucky--, Like _ikke_ said. That would work. Or my preference would be if my branch was private only that I would rebase my own changes on top of the shared master and deal with the conflicts there.	05:14
	→ ShapeShifter499 joined	05:19
	← Paper-Mario left	05:20
	← thepoof left	05:23
	← jargonjunkie left	05:25
	← bruce_lee left	05:26
	→ teroshan joined	05:26
	→ xsddz joined	05:26
	→ jstimm joined	05:27
	← ShapeShifter499 left	05:29
	→ marianina8 joined	05:30
	← pifon left	05:30
	→ Saint_Isadore joined	05:31
	→ treeman joined	05:31
	← mjuhl left	05:33
	← jstvz left	05:34
	→ gareppa joined	05:36
	← LeBlaaanc left	05:39
	← tyreld left	05:41
	← ZyX-I left	05:42
	→ Silenced joined	05:44
	← jimmyrcom left	05:44
	← jameser left	05:45
	← mmattice left	05:45
	← waveclaw left	05:45
	← Cabanossi left	05:46
	→ jameser joined	05:46
	→ mmattice joined	05:47
	→ jimmyrcom joined	05:47
	→ Cabanossi joined	05:47
	→ ShapeShifter499 joined	05:48
	→ shgysk8zer0 joined	05:49
	→ fakenerd_ joined	05:50
	← danimal2 left	05:50
	← fakenerd left	05:50
	→ ThomasLocke joined	05:51
	← ThomasLocke left	05:51
	→ ThomasLocke joined	05:51
	← jimmyrcom left	05:52
	→ bronson joined	05:53
	→ waveclaw joined	05:53
	← freimatz left	05:54
	→ fakenerd joined	05:54
	← fakenerd_ left	05:55
	→ Sasazuka joined	05:56
	← xsddz left	05:56
	→ alexggordon joined	05:56
	← teroshan left	05:56
	→ dreiss joined	05:56
	→ inflames joined	05:57
	← fakenerd left	05:57
	→ fakenerd_ joined	05:57
	→ qt-x joined	05:58
	→ pietv joined	05:59
	← nutron left	06:00
	← alexggordon left	06:01
	← overlord_tm left	06:01
	→ xall joined	06:02
	→ serdar joined	06:02
	→ MineCoins joined	06:03
	← Lucky-- left	06:03
	← ploop left	06:04
	← durham left	06:06
	→ peterbec` joined	06:09
	→ fakenerd joined	06:09
	← fakenerd_ left	06:09
	→ danimal2 joined	06:11
	→ nutron joined	06:12
	→ Raging_Hog joined	06:13
	← peterbecich left	06:14
	← malt3 left	06:14
	← shgysk8zer0 left	06:15
	← Cabanossi left	06:16
	→ Silmarilion joined	06:16
	← fakenerd left	06:16
	← serdar left	06:17
	← fahadash left	06:17
	→ Cabanossi joined	06:17
	← aw1 left	06:18
	→ fakenerd joined	06:19
	→ malt3 joined	06:19
	→ zeroed joined	06:20
	→ freimatz joined	06:20
	→ serdar joined	06:20
	← danimal2 left	06:21
	→ JeroenT joined	06:23
	← ertes left	06:23
	→ chele joined	06:24
	→ fakenerd_ joined	06:25
	← fakenerd left	06:25
	→ acetakwas joined	06:26
	→ ploop joined	06:26
	→ sbulage joined	06:27
	← sbulage left	06:27
	← dreiss left	06:27
	→ stoqn4o_pm joined	06:27
	→ rokups joined	06:30
	→ dermoth joined	06:31
	→ aw1 joined	06:31
	← scarabx left	06:32
	← zeroed left	06:33
	→ slidercrank joined	06:33
	← menip left	06:34
	→ zeroed joined	06:36
	→ zerow joined	06:36
	← onehrxn left	06:39
	← queso left	06:40
	← novice0310 left	06:40
	→ onehrxn joined	06:41
	→ jagob joined	06:42
	→ sbulage joined	06:42
	← HardlySeen left	06:43
	→ jaziz joined	06:44
jaziz	hm	06:46
	so I typed "git config credential.helper store"	06:46
	and I changed my mind	06:46
	but the "store" is still there	06:46
	how do I remove?	06:46
	← nowhere_man left	06:48
	← Darren_ left	06:48
osse	jaziz: git config --unset credential.helper store	06:48
jaziz	mmm	06:50
	osse, thanks	06:50
	← tnecniv left	06:51
	→ rominronin joined	06:52
	← CrummyGummy left	06:53
	← pigeon left	06:54
	← Raging_Hog left	06:55
	← Mission-Critical left	06:55
	→ Raging_Hog joined	06:55
	→ CrummyGummy joined	06:55
	→ pigeon joined	06:56
	← fakenerd_ left	06:57
	→ alexggordon joined	06:57
	→ dersand joined	07:00
	→ pbandark joined	07:00
	← jaziz left	07:01
	← pbandark left	07:02
	→ sargentmki joined	07:02
	→ fakenerd joined	07:03
	← TikityTik left	07:04
	→ bilal_ joined	07:04
	→ pbandark joined	07:05
	→ _ng joined	07:05
	← _ng left	07:05
	→ paul424 joined	07:06
	← SwiftMatt left	07:06
	← govg left	07:07
	← MacWinner left	07:07
	← sargentmki left	07:08
	← bilal left	07:08
	← inflames left	07:08
	→ dvaske joined	07:09
	→ lb joined	07:09
	← lb left	07:09
	← axisys left	07:09
	← fakenerd left	07:10
	→ Tobbi joined	07:10
	← rwp left	07:10
	← MineCoins left	07:10
	← alexggordon left	07:10
	→ fakenerd joined	07:10
	← thiago left	07:11
	→ axisys_ joined	07:11
	→ dvaske_ joined	07:12
	→ MissionCritical joined	07:14
	← fbwnd left	07:15
	→ alexggordon joined	07:15
	← dvaske left	07:15
	→ fakenerd_ joined	07:16
	← paul424 left	07:16
	← fakenerd left	07:17
	→ nevodka joined	07:17
	→ imack joined	07:17
	← petersaints left	07:17
	← nevodka left	07:17
	← PtxDK_ left	07:20
	→ PtxDK joined	07:20
	→ overlord_tm joined	07:21
	→ kurkale6ka joined	07:21
	← robattila256 left	07:21
	→ zefferno joined	07:22
	→ petersaints joined	07:23
	→ cdown joined	07:23
	→ rwp joined	07:24
	→ fl0w joined	07:25
	← fl0w left	07:25
	→ re1_ joined	07:29
	→ MineCoins joined	07:30
	← alexggordon left	07:31
	→ ertes joined	07:31
	← ertes left	07:31
	→ ertes joined	07:32
	← re1 left	07:32
	← cdown left	07:33
	← holodoc left	07:35
	→ masuberu joined	07:36
	→ Panacea joined	07:39
	→ schleppel joined	07:42
	← Peetz0r left	07:43
	→ holodoc joined	07:45
	← kadoban left	07:46
	→ Peetz0r joined	07:47
	← Saint_Isadore left	07:48
	← yarekt left	07:51
	← masuberu left	07:52
	← tymczenko left	07:52
	→ cr1tic joined	07:54
chardan	Strategy question: I have a pretty large set of commits. I need to grab subsets of them into new branches. Is cherry-pick the right tool for this? And/or is there a way to say "hey, take commits a,b,c and move them into a new branch"? Thank you!	07:57
moritz	chardan: cherry-pick accepts a range of commits too	07:57
	→ TomyLobo3 joined	07:57
	→ avih joined	07:57
chardan	moritz: Cool, I will keep reading about it! Thanks.	07:58
moritz	chardan: or you can start with a copy of another branch, and do an interactive rebase where you drop all the commits you don't want	07:58
chardan	moritz: So to do that, I'd do something like "git checkout -b new_br" and then "git rebase -i <oldbr hashtag>"?	07:58
moritz	chardan: yes	07:59
chardan	moritz: Ok, those sound like they'll probably work for me! Thanks!	07:59
	← Sasazuka left	07:59
	→ brk_ joined	07:59
	← re1_ left	08:03
	→ King_Hual joined	08:03
	← a_thakur left	08:04
	→ skunkz joined	08:04
	→ a_thakur joined	08:04
	← matoro left	08:05
	→ elect joined	08:05
	→ matoro joined	08:05
	← Goplat left	08:06
	← navidr left	08:06
	← stoqn4o_pm left	08:06
	→ stoqn4o_pm joined	08:07
	← permalac left	08:08
	→ mikecmpbll joined	08:08
	→ chichou joined	08:09
	← a_thakur left	08:09
	→ AbleBacon_ joined	08:09
	← JeroenT left	08:11
	← AbleBacon left	08:12
	AbleBacon_ → AbleBacon	08:12
	→ permalac joined	08:13
	→ marcogmonteiro joined	08:14
	← Lunatrius left	08:14
	→ YuGiOhJCJ joined	08:16
	→ Lunatrius joined	08:18
	→ Snugglebash joined	08:19
	→ a_thakur joined	08:19
	← dave0x6d left	08:21
	→ Introoter joined	08:21
	→ clmsy joined	08:21
	← cqi left	08:21
	→ tymczenko joined	08:22
	← Noodlewitt left	08:23
	← stoqn4o_pm left	08:23
	← Panacea left	08:24
	→ HardlySeen joined	08:24
	← nickel_dime_look left	08:25
	← marianina8 left	08:26
	→ marianina8 joined	08:27
	← chichou left	08:27
	→ Murii joined	08:27
chardan	moritz: Next piece of the puzzle... My situation has a commit that the other commits depend on: D a b c. The eventual fate is that each of a,b,c will be in github PRs. Do I duplicate D so I have Da,Db,Dc, or is there A Better Way(TM)?	08:28
	← inovas left	08:28
chardan	moritz: (Or is the way this usually goes just to say "hey, this depends on this other thing"?)	08:28
	→ Tuor joined	08:28
	← Tuor left	08:28
	→ Tuor joined	08:28
	← avih left	08:29
	→ chichou joined	08:29
	← Lunatrius left	08:30
	← svm_invictvs left	08:31
	← marianina8 left	08:31
jast	chardan: so that sounds like you may want to create three branches, each based on D, and cherry-pick one of a, b and c to each. there's no one way that is significantly better than any other, though.	08:31
	← nod left	08:32
	→ nod joined	08:32
	→ mentazoom joined	08:32
	→ svm_invictvs joined	08:32
	← svm_invictvs left	08:33
	→ svm_invictvs joined	08:33
chardan	jast: Ok, that's "just the way it will have to be", then. Thank you!	08:33
	← svm_invictvs left	08:33
	→ svm_invictvs joined	08:34
	← svm_invictvs left	08:34
	→ svm_invictvs joined	08:35
	← svm_invictvs left	08:35
	→ monq joined	08:35
	← brk_ left	08:35
	← causasui left	08:36
	→ chll_ joined	08:36
	→ causasui joined	08:37
	→ inovas joined	08:38
	← sarri left	08:38
	→ Lunatrius joined	08:38
	← mda1 left	08:41
	→ jstimm_ joined	08:42
	← Lunatrius left	08:45
	← jstimm left	08:45
	→ Lunatrius joined	08:47
	→ sarri joined	08:47
	← sarri left	08:47
	→ sarri joined	08:47
	← fakenerd_ left	08:51
	← pietv left	08:51
	→ zylum joined	08:52
	← zefferno left	08:52
	→ fakenerd joined	08:52
	→ zefferno joined	08:53
	← marcogmonteiro left	08:55
	→ bilal joined	08:55
	→ borkr joined	08:56
	← onehrxn left	08:56
	→ cqi joined	08:57
	→ fakenerd_ joined	08:57
	→ onehrxn joined	08:58
	← fakenerd left	08:58
	← bilal_ left	08:59
	← safe left	08:59
	→ marcogmonteiro joined	09:00
	← fakenerd_ left	09:01
	→ fakenerd joined	09:01
	→ afuentes joined	09:01
	→ raijin joined	09:02
	← Cabanossi left	09:02
	→ Cabanossi joined	09:03
	→ fakenerd_ joined	09:04
	→ zxd joined	09:05
zxd	why isn't 'git status' detecting the file has been renamed? it shows as deleted then as untracked file	09:05
	← steve left	09:05
	→ fbwnd joined	09:05
	← fakenerd left	09:05
grawity	because that's really what a rename is	09:06
	if you add the file under the new name, Git will show it as a rename based on similarity	09:06
	or if you use `git mv` the next time instead of regular `mv`	09:06
	→ SantaClauze joined	09:06
zxd	grawity: I added the file	09:08
	still shows as new in green	09:08
	→ Acerific joined	09:08
grawity	did you change it a lot after renaming?	09:09
	← fakenerd_ left	09:09
	→ fakenerd joined	09:09
zxd	no\	09:12
graingert	is there a nice command to list any duplicate files under a case insensitve FS?	09:14
canton7	graingert, the clue is lots of modified files after cloning	09:15
	← fbwnd left	09:15
	→ fakenerd_ joined	09:15
graingert	canton7: I've only got a case sensitive FS	09:15
	← fakenerd left	09:15
graingert	CI only has a case sensitive FS	09:15
	Prod only has a case sensitive FS	09:15
	→ theoceaniscool joined	09:15
graingert	all the other devs here are running silly macOs	09:16
	← acetakwas left	09:17
canton7	aah, I see. Apparently `find . \| sort -f \| uniq -di` and `find . \| tr '[:upper:]' '[:lower:]' \| sort \| uniq -cd` will do it	09:17
graingert	git ls-files	09:18
	not find	09:18
canton7	whatever you want :P You didn't ask anything that was specific to git	09:18
graingert	...	09:19
	Orphis_ → Orphis	09:19
graingert	canton7: nice that works	09:20
	→ acetakwas joined	09:20
	← fakenerd_ left	09:21
	→ fakenerd joined	09:22
	← gareppa left	09:23
	→ alexggordon joined	09:23
	→ Gloomy joined	09:24
	→ tvw joined	09:24
	← theoceaniscool left	09:26
	← bilal left	09:27
	← cr1tic left	09:27
	→ cr1tic joined	09:27
	→ fbwnd joined	09:28
	← cr1tic left	09:28
	→ cr1tic joined	09:28
	← cr1tic left	09:29
	→ cr1tic joined	09:29
	→ bilal joined	09:33
	← finalbeta left	09:33
	→ finalbeta joined	09:34
	← mentazoom left	09:35
	← zefferno left	09:36
	← tymczenko left	09:36
skunkz	Hi, I'm using git rebase -i for the first time: I have this history http://puu.sh/vqe3y/a70297d1ba.png and I would like to remove the branching so I did `git rebase -i 78a1292` and edited it like this http://puu.sh/vqe5a/71d6c5a056.png. But then I get a lot of conflicts which have already been resolved in my current HEAD, do I need to re-resolve them all ? I'm tempted to git rebase --skip as soon as I get	09:39
	conflicts but I'm pretty sure that's not the right thing to do	09:39
	← SantaClauze left	09:39
	→ brk_ joined	09:40
	← monq left	09:41
	← Cabanossi left	09:47
	→ Cabanossi joined	09:48
	→ zefferno joined	09:49
	← cads2 left	09:51
	→ cads2 joined	09:51
	→ SantaClauze joined	09:54
	← Karazhan left	09:55
	→ Karazhan joined	09:56
	← dvaske_ left	09:57
	→ digidog joined	09:57
	← alexggordon left	09:57
	← Silenced left	09:57
	→ govg joined	09:57
	digidog → diqidoq	09:59
	→ navidr joined	10:01
	→ Silenced joined	10:03
	→ ferr joined	10:03
	← cqi left	10:05
	→ theoceaniscool joined	10:10
	← a_thakur left	10:12
	→ a_thakur joined	10:13
	← sathed left	10:15
	→ sathed_ joined	10:15
	← Cabanossi left	10:16
	← m00n left	10:17
	← a_thakur left	10:17
	← cfoch-always left	10:17
	→ Cabanossi joined	10:18
	→ earnestly joined	10:20
	→ Guest85646 joined	10:21
	→ cfoch-always joined	10:21
	← schleppel left	10:22
	→ kurkale61 joined	10:23
	← kurkale61 left	10:23
	→ hanthings joined	10:23
	→ kurkale61 joined	10:23
	← Acerific left	10:25
	→ schleppel joined	10:25
	← finalbeta left	10:26
	→ finalbeta joined	10:26
	← kurkale61 left	10:26
	→ dedicated joined	10:28
	← dedicated left	10:28
	→ a_thakur joined	10:30
	← a_thakur left	10:30
	→ dedicated joined	10:30
	→ agileadam joined	10:31
	← telephone left	10:32
	→ Darcidride joined	10:32
	← agileadam left	10:32
	→ a_thakur_ joined	10:33
	→ telephone joined	10:33
	← telephone left	10:33
	→ telephone joined	10:33
	→ pbandark1 joined	10:34
i7c	Firstly, I want to question your goal to remove a merge. I don’t see the sense. :)	10:35
	← pbandark left	10:35
	pbandark1 → pbandark	10:35
i7c	And then, yes, you probaly will have conflicts because you are effectively changing the order in which changes are applied.	10:37
	← askb left	10:38
i7c	skunkz, the question is, what do you want the outcome to be like? Do you want all changes from both branches but without a merge or do you want to remove the changes coming from one branch?	10:38
cbreak	skunkz: skip would drop that commit	10:38
	→ AfroThundr joined	10:39
	← AfroThundr left	10:39
	→ oskarkv joined	10:39
	→ kurkale61 joined	10:39
	← kurkale61 left	10:40
	→ kurkale61 joined	10:41
	← dsdeiz left	10:41
	← kurkale6ka left	10:42
	← kurkale61 left	10:42
	→ kurkale6ka joined	10:42
	← SantaClauze left	10:45
	← theoceaniscool left	10:47
	← skunkz left	10:48
	→ nrajasekhar joined	10:48
	← schleppel left	10:51
	→ dust_ joined	10:51
	← cads2 left	10:51
	→ BlueNeXuS joined	10:52
	← nrajasekhar left	10:52
	→ alexggordon joined	10:54
	← xall left	10:55
	← Gloomy left	10:56
	→ loskutak joined	10:56
	→ theoceaniscool joined	10:56
	← ShapeShifter499 left	10:57
	← kurkale6ka left	10:58
	← dust_ left	10:59
	→ star_prone joined	10:59
	→ skunkz joined	11:00
	← Cabanossi left	11:01
	→ kurkale6ka joined	11:01
	← govg left	11:01
	← alexandre9099 left	11:01
	→ alexandre9099 joined	11:02
	→ Cabanossi joined	11:03
	→ dust_ joined	11:03
skunkz	i7c: well I gave up but I wanted to "flatten" the history so that there is no merge commit anymore, but I guess my mistake was not using git rebase -p	11:03
	→ nevodka joined	11:04
skunkz	so yeah I wanted changes from both branches but without spending time on resolving conflicts I had already resolved when the merge was done	11:04
	← jameser left	11:05
i7c	What’s wrong with a little merge commit ;)	11:07
	→ cads2 joined	11:08
	← theoceaniscool left	11:11
	← fakenerd left	11:12
	→ courrier joined	11:12
	→ fakenerd joined	11:13
	← kurkale6ka left	11:14
	← BlueNeXuS left	11:15
	→ MarioBranco joined	11:15
	→ a_thakur joined	11:16
	← a_thakur_ left	11:16
	→ finalbeta1 joined	11:17
	→ xall joined	11:18
	→ rnsanchez joined	11:19
	→ theoceaniscool joined	11:19
	→ kurkale6ka joined	11:19
	← finalbeta left	11:20
	← anonymoose left	11:20
	← kurkale6ka left	11:21
	→ schleppel joined	11:21
	→ kurkale6ka joined	11:21
	← dust_ left	11:21
skunkz	Well mostly for my personal understanding of git, and also because people from my team often merge a into a when they could pull --rebase so it would be nice for me to know how to clean this mess lol	11:21
	→ anonymoose joined	11:21
	← anonymoose left	11:22
	← timlyo[m] left	11:22
	← hiq[m] left	11:22
	→ anonymoose joined	11:22
	← Ratler left	11:22
	→ vuoto joined	11:22
	← kurkale6ka left	11:24
	→ Loomaanaatii_ joined	11:24
	→ kurkale6ka joined	11:24
	← MarioBranco left	11:24
	← Matsv left	11:24
	← schleppel left	11:25
	→ nowhere_man joined	11:26
	← cagedwisdom left	11:26
i7c	skunkz, maybe they shouldn’t work all on the same branch and just merge complete feature branches or so	11:27
	← Loomaanaatii_ left	11:27
	← finalbeta1 left	11:27
	← Jonuz left	11:27
	→ finalbeta joined	11:27
i7c	Or yes, rebase, but I think whether you have a merge or rebase workflow mostly depends on how your team works.	11:27
	← Mathiasdm left	11:27
	→ wachpwnski-mobi joined	11:28
	→ dsdeiz joined	11:28
	← dsdeiz left	11:28
	→ dsdeiz joined	11:28
wachpwnski-mobi	Does anyone know how I can untrack a file on git annex?	11:28
	← alexggordon left	11:28
	← Xarodon left	11:28
	→ manuelschneid3r joined	11:28
	→ Mathiasdm joined	11:29
i7c	We also have a rebase-based workflow here due to how our integration works, however, sometimes I have the feeling some people have a rebase workflow out of sheer fear of merge commits ^^	11:29
	→ Ratler joined	11:29
	→ Loomaanaatii_ joined	11:29
wachpwnski-mobi	I'm on a bare repository and I keep getting this: git annex unannex SHA256E-s329400--62e8f76db705f88d366c653c130b3e690765de4c3367ecc1f67b88f1b2a887f8.par	11:29
	git-annex: Cannot proceed with uncommitted changes staged in the index. Recommend you: git commit	11:29
	→ schleppel joined	11:29
	← overlord_tm left	11:29
	→ gechr joined	11:29
	→ cagedwisdom joined	11:29
	→ Jonuz joined	11:29
	→ timlyo[m] joined	11:30
	← Loomaanaatii left	11:30
	← Loomaanaatii_ left	11:30
bremner	wachpwnski-mobi: can you make a local clone? working directly on the annexed object you probably need to use plumbing commands	11:30
	→ overlord_tm joined	11:30
	→ Loomaanaatii joined	11:30
	→ hiq[m] joined	11:30
	→ Matsv joined	11:30
	← gechr left	11:30
bremner	wachpwnski-mobi: btw, git-annex has it's own channel on oftc	11:30
	→ Xarodon joined	11:30
skunkz	i7c: I agree, but unfortunately I work with people who don't give a f about git workflow and all work on the same branch, they don't even know how to look at the history, I'm the only one a bit worried about it lol	11:31
i7c	skunkz, :( I feel your pain. I have worked with such people before.	11:32
	← dsdeiz left	11:33
wachpwnski-mobi	bremner: I'm not sure I know what you mean?	11:33
bremner	wachpwnski-mobi: it looks like you tried to add something from ./git/annex/objects	11:34
	← raynold left	11:34
skunkz	Only 2 more months and I'm free! Do you confirm using git rebase -p -i would have avoided getting the conflicts again, given that the commits are applied in the same order as they were with the merge?	11:34
wachpwnski-mobi	bremner: I am trying to remove missing files, it spams errors on my repo when I try to git annex get	11:36
	It seems like this worked `git annex dropkey SHA256E-s329400--62e8f76db705f88d366c653c130b3e690765de4c3367ecc1f67b88f1b2a887f8.par `	11:37
bremner	yes, that's the kind of plumbing command I meant. So you did understand ;)	11:37
wachpwnski-mobi	Hah, I have so much to learn.	11:38
	← xintron left	11:38
bremner	yes, unfortunately git-annex is a whole layer of stuff on top of git	11:38
	← vuoto left	11:39
	→ ArchNoob joined	11:39
ArchNoob	Hi, is base the 80c819a characters you see when you say something like `git log`?	11:40
	← fakenerd left	11:40
	← schleppel left	11:40
osse	"base" ?	11:40
ArchNoob	yeah, "BASE"	11:41
	→ fakenerd joined	11:41
osse	where do you see that prase?	11:41
	the only BASE I know of is when you resolve merge conflicts, and that refers to something else	11:42
ArchNoob	Sorry, I'm making a pull-request using hub command. I see BASE and HEAD I wonder which one should I use to point to the particular recent commit I just made.	11:42
osse	so I guess the answer to your question is no	11:42
	HEAD is the commit you just made	11:43
	← Atm0spher1c left	11:43
osse	BASE is the branch you want them to merge in to	11:43
	→ Gloomy joined	11:43
	→ NeverDie_ joined	11:45
	← fakenerd left	11:46
	→ jimi_ joined	11:46
ArchNoob	ooh, Thank you. I understand now.	11:47
	← star_prone left	11:47
	← tvw left	11:47
	← NeverDie left	11:47
_ikke_	Those characters you refer to are the commit hash	11:48
	← NeverDie_ left	11:49
	← rscata left	11:50
	← watersoul left	11:51
	→ steve joined	11:52
	→ dvaske joined	11:52
	→ NeverDie joined	11:52
	→ star_prone joined	11:54
	← borkr left	11:54
	→ gnixev joined	11:59
	→ watersoul joined	12:00
	→ MarioBranco joined	12:00
	← cr1tic left	12:01
	→ dvaske_ joined	12:01
	← watersoul left	12:01
	→ darkbit joined	12:02
	← MarioBranco left	12:02
	→ lordjancso joined	12:03
	← darkbit left	12:03
	→ MarioBranco joined	12:03
	→ darkbit joined	12:03
	← loskutak left	12:03
	→ notebox joined	12:04
	← dvaske left	12:05
	→ watersoul joined	12:05
	← rivarun left	12:05
	→ gregor2 joined	12:05
	← watersoul left	12:05
	→ rivarun joined	12:05
	→ fakenerd joined	12:07
	← darkbit left	12:08
	← theoceaniscool left	12:08
	→ yarekt joined	12:09
	→ watersoul joined	12:10
	← yarekt left	12:10
	← watersoul left	12:10
	→ ygg joined	12:12
jonascj_	Any one familiar with github and pull requests? I've forked a repo, made a feature branch fb on my working copy of the original repo, pushed that branch to my own repo (the github fork), and created a pull request (for the original author to implement my changes).	12:12
	← zeroed left	12:12
jonascj_	Now however, I want to continue to work on other improvements, and I don't know if I should create a new branch for working on other changes. And if I should create a new branch, what about the improvements from my first feature branch? How do I take those with me to feature branch 2?	12:13
i7c	Just branch off the other feature branch?	12:14
	off of*	12:14
	→ mentazoom joined	12:14
	→ watersoul joined	12:15
	← watersoul left	12:15
i7c	Also this is potentially problematic if the upstream repo refuses your pull request or makes major changes, you will have to deal with the quirks of the rebase, but that being said, you can do that.	12:15
	→ jimi_sanchez joined	12:15
	← Cabanossi left	12:15
	← MarioBranco left	12:16
jonascj_	i7c: if upstream refuses my requests I'll just maintain my own fork :P	12:16
	← marcogmonteiro left	12:16
i7c	haha	12:16
jonascj_	i7c: do I have other alternatives, merge my feature branch into master and branch again?	12:17
	← jimi_ left	12:17
	← star_prone left	12:17
	→ Cabanossi joined	12:17
jonascj_	but right, the easiest for me to understand would be if upstream just merge my changes, and then I can do the same thing over again	12:17
i7c	It effectively makes no difference if you merge in your repo or not. Would be a fast-forward merge anyways.	12:18
	→ owlbynight joined	12:18
i7c	jonascj_, I would just work on top of the first branch, and if upstream merges your branch or changes it and merges or does any other change that affects your work, I would just rebase.	12:19
jonascj_	i7c: fast forward since nothing has happened on master while I've been working on the feature branch?	12:19
i7c	exactly	12:20
	→ watersoul joined	12:20
	← xall left	12:20
i7c	jonascj_, also it’s interesting if upstream proceeds work on master and there are conflicts, if they want you to resolve them (i.e. rebase) or if they resolve them when merging.	12:21
	← watersoul left	12:22
i7c	But that’s a separate issue :D	12:22
	← ash_workz left	12:23
	→ alexggordon joined	12:25
	→ watersoul joined	12:25
	← jeffreylevesque left	12:26
	← fbwnd left	12:27
	← nowhere_man left	12:29
	→ courrier_ joined	12:29
jonascj_	i7c: alright, thanks	12:29
	→ ash_workz joined	12:29
	→ nowhere_man joined	12:29
	← jimi_sanchez left	12:30
	→ fahadash joined	12:30
	← notebox left	12:30
	→ zeroed joined	12:31
	← zeroed left	12:31
	→ zeroed joined	12:31
	→ star_prone joined	12:31
	← brk_ left	12:32
	→ d10n-work joined	12:32
i7c	You’re welcome :)	12:33
	← cagedwisdom left	12:34
	→ jimi_ joined	12:34
	← Gloomy left	12:34
	→ darkbit joined	12:35
	← darkbit left	12:36
	→ seni joined	12:36
	← star_prone left	12:36
	→ darkbit joined	12:36
	← darkbit left	12:37
	→ darkbit joined	12:38
	→ dglambert joined	12:39
dglambert	yo	12:39
	← acetakwas left	12:39
	→ dsdeiz joined	12:39
	→ jimi_sanchez joined	12:40
	→ Gloomy joined	12:41
	← jimi_ left	12:41
	→ brk_ joined	12:43
	→ livingstn joined	12:43
	→ loskutak joined	12:44
	← ArchNoob left	12:44
	→ star_prone joined	12:45
	→ jeffreylevesque joined	12:46
	← courrier left	12:46
slidercrank	hello. I want to write a gerrit server hook. it´s invoked as ref-updated --oldrev <old rev> --newrev <new rev> --refname <ref name> --project <project name> --submitter <submitter> . how go I get a list of files knowing newrev <sha1>? In pre-commit I could invoke ¨git diff --cached --name-only¨ for that	12:47
osse	slidercrank: git diff --name-only old-rev new-rev	12:47
slidercrank	thank you, osse	12:48
	← ThomasLocke left	12:48
	← ygg left	12:49
	← Nilesh_ left	12:50
	← Murii left	12:52
	→ mujow joined	12:52
	← ash_workz left	12:53
	← gregor2 left	12:54
	→ ash_workz joined	12:55
	→ peacememories joined	12:55
	← nanga left	12:56
	→ nanga joined	12:57
	← nanga left	12:57
	→ nanga joined	12:57
	← nevodka left	12:58
	← alexggordon left	12:59
	→ schleppel joined	12:59
	← fakenerd left	13:00
	← qt-x left	13:01
	→ fakenerd joined	13:01
	→ ExoUNX joined	13:02
	→ vkareh joined	13:03
	← tarkus left	13:04
	→ acetakwas joined	13:04
	← livingstn left	13:05
	→ marcogmonteiro joined	13:05
	→ TheSimonator joined	13:05
	← manuelschneid3r left	13:07
	← mentazoom left	13:08
	← Introoter left	13:08
	← brk_ left	13:09
zxd	hi	13:10
	what do they mean by 'If you commit at this point then you will lock the submodule into having the new code when other people update.' in https://git-scm.com/book/en/v2/Git-Tools-Submodules	13:10
	→ jameser joined	13:12
	→ monq joined	13:12
	→ ratchet joined	13:12
	ratchet → Guest37119	13:13
	← dvaske_ left	13:14
	→ synthroid joined	13:15
	← sunri5e left	13:15
	gitinfo set mode: +v	13:16
	→ sunri5e joined	13:16
Guest37119	The resently added worktree feature help me with my workflow wanted to say thanks for that to whomever is responsible.	13:17
	← Gloomy left	13:18
	→ ruxu joined	13:19
	← schleppel left	13:19
	← jameser left	13:19
	→ vrach joined	13:19
	← Raging_Hog left	13:19
	→ Gloomy joined	13:20
	← Gloomy left	13:20
	→ eric____ joined	13:21
	gitinfo set mode: +v	13:22
eric____	hi there.. simple question here... Git keeps asking for my username and password when I push to a branch.. how can I make it so that it will only ask upon reboot of my computer?	13:22
tobiasvl	eric____: are you pushing over ssh or https?	13:23
	→ cdg joined	13:23
	← Guest37119 left	13:23
	→ jimmyrcom joined	13:24
	← fakenerd left	13:24
	→ fission6 joined	13:24
	→ fakenerd joined	13:25
	← jason237 left	13:25
eric____	tobiasvl : im not sure, i'll try to find out and get back to you.	13:25
	← cads2 left	13:26
tobiasvl	OK, should be fairly easy to find out	13:26
eric____	my push URL is a https beanstalkapp.com link	13:26
tobiasvl	eric____: then !credential-cache	13:26
gitinfo	eric____: Tired of entering your username and password every time you access an HTTP(S) remote and have good reasons not to use SSH? A summary of shortcuts and supported caching methods can be found here: http://stackoverflow.com/a/5343146	13:26
	→ al-damiri joined	13:26
	← chipotle left	13:27
	→ marianina8 joined	13:27
eric____	tobiasvl : where would i put this in	13:28
	tobiasvl : sorry for my noobness loll	13:28
	→ NeXTSUN joined	13:28
tobiasvl	eric____: the answer should explain everything, the text with gray background are commands you can run in your shell	13:29
eric____	ok	13:29
tobiasvl	man gitcredentials	13:30
gitinfo	the gitcredentials manpage is available at https://gitirc.eu/gitcredentials.html	13:30
	→ cqi joined	13:30
eric____	https://you:password@github.com/you/example.git	13:32
	this worked perfectly :)	13:32
	→ dave0x6d joined	13:32
	← marianina8 left	13:32
	→ theoceaniscool joined	13:33
	→ ig0r_ joined	13:33
tobiasvl	yes, that eliminates the prompt	13:33
	but saves the password in cleartext in bash history and displays it in the terminal	13:34
	← NeXTSUN left	13:35
	← dsdeiz left	13:36
	→ NeXTSUN joined	13:36
eric____	ok... not best then	13:36
	← NeXTSUN left	13:37
	→ jameser joined	13:38
	← eric____ left	13:38
	← ertes left	13:43
	→ Es0teric joined	13:43
	← acetakwas left	13:44
	→ Gsham joined	13:45
	→ thebinary joined	13:45
	→ mentazoom joined	13:46
	← thebinary left	13:48
	→ masuberu joined	13:49
	→ Dougie187 joined	13:49
	→ lewix joined	13:50
	← aavrug left	13:50
	→ DelphiWorld joined	13:51
DelphiWorld	hi giters	13:51
	i have a git data folder backed up from gitlab	13:51
	how can i extract my git repos from it?	13:51
	→ ArchNoob joined	13:53
	→ justin3 joined	13:53
osse	DelphiWorld: you mean a .git dir ?	13:54
DelphiWorld	yes, repos.git	13:54
osse	you can clone it	13:54
	→ livingstn joined	13:54
DelphiWorld	from local?	13:54
	→ publio joined	13:54
osse	yes	13:54
cbreak	git clone can clone from any repository	13:54
DelphiWorld	haha	13:55
	awesome	13:55
cbreak	if it's local, it might only use hardlinks	13:55
	if you want distinct files, you can use file:// urls	13:55
	→ alexggordon joined	13:55
cbreak	or specify --no-hardlinks	13:55
	← fission6 left	13:55
	→ Sgpf joined	13:55
cbreak	other than that it's pretty much a normal clone	13:55
DelphiWorld	HAHAHA.... awesooooooome	13:56
	thanks guys	13:56
	→ oleo joined	13:56
	← mujow left	13:56
	→ oaaao joined	13:57
	← Sgpf left	13:57
	→ acetakwas joined	13:58
	← DelphiWorld left	13:58
	← Es0teric left	13:58
	← theoceaniscool left	13:59
	→ eroux joined	14:01
	→ notebox joined	14:01
	→ Es0teric joined	14:02
	→ xall joined	14:03
	← ayogi left	14:03
	→ theoceaniscool joined	14:03
	← mostlybadfly left	14:05
	→ schleppel joined	14:07
zxd	fatal: reference is not a tree: 7a008cfbecc70c71a586ca6f7b34b01ce7e9fadd	14:07
	Unable to checkout '7a008cfbecc70c71a586ca6f7b34b01ce7e9fadd' in submodule path 'foo/irssi-smartfilter'	14:07
	← telephone left	14:08
	→ maryo joined	14:09
	→ telephone joined	14:10
	← telephone left	14:10
	→ telephone joined	14:10
	→ moei joined	14:12
	← Emperor_Earth left	14:12
guardian	hello, how can I update the index to add/synchronize a submodule to a specific SHA1 without cding into the submodule path and checking out the SHA1 in question	14:13
	← star_prone left	14:14
	← Cabanossi left	14:15
	→ Emperor_Earth joined	14:16
	→ AaronMT joined	14:17
	→ Cabanossi joined	14:17
	← aw1 left	14:19
Vampire0	guardian, do you just want to save the cd, or also the checkout?	14:19
lewix	I have an untracked file (not folder) that being a pain in the butt, git clean -f won't remove it	14:20
Vampire0	guardian, `git -C submodule-path checkout <commit-ish>` would checkout in the submodule without the need of cding into it	14:20
	lewix, is it an ignored file?	14:21
lewix	nope	14:21
Vampire0	lewix, hm, what happens if you do `git clean -f` and / or what is the output of `git clean -n`?	14:21
lewix	it's a test file	14:22
Vampire0	lewix, and do you execute this from the directory (or a parent directory) where the file resides, or from a sibling directory?	14:22
lewix	nothing	14:22
	from a long lost cousin directory	14:23
Vampire0	lewix, what means lost? where exactly is the file and where exactly do you call the clean?	14:23
	→ tymczenko joined	14:24
lewix	i see it's working. Now, it means that the directory i was executing it from was a sibling of a sibling of a sibling	14:24
	→ DarkPsydeLord joined	14:24
lewix	i went to the right directory and it worked	14:24
	← cqi left	14:24
	← TheSimonator left	14:24
	→ kpease joined	14:25
	→ TheSimonator joined	14:25
	← xall left	14:25
lewix	Vampire0: thank you	14:26
Vampire0	lewix, clean only works on the current directory and its descendents. If you want to catch all untracked files, you need to execute it in the root directory or give the root directory as argument to the clean like `git clean -n $(git rev-parse --show-cdup)`	14:26
	→ menip joined	14:27
	→ basiclaser joined	14:28
guardian	I don't want to commit in the submodule	14:28
lewix	Vampire0: thanks	14:29
	→ Nilesh_ joined	14:29
guardian	I want to update the synchronization SHA1 between parent and submodule	14:29
	← Es0teric left	14:29
	← alexggordon left	14:29
	→ xall joined	14:30
	→ Es0teric joined	14:30
	→ star_prone joined	14:30
	→ aw1 joined	14:32
	← menip left	14:33
Vampire0	guardian, just that you checkout does not mean you commit. You just checkout the commit you want to reference in the submodule, then update the reference in the parent and commit in the parent. There will not be any commit in the submodule and you need to checkout in the submodule anyway to have the correct state for the submodule	14:37
	→ fission6 joined	14:37
	← tymczenko left	14:37
guardian	rephrasing: I would like to know whether it's possible to use git update-index since I know the SHA1, instead of doing the dance: cd path/to/submodule ; git checkout SHA1; cd -; git add path/to/submodule; git commit -m 'updated submodule'	14:39
	← holdsworth left	14:39
	→ bilal_ joined	14:39
	← a3Dman left	14:40
	← overlord_tm left	14:40
	→ a3Dman joined	14:41
	← a3Dman left	14:41
	→ a3Dman joined	14:41
	← bilal left	14:42
	← Es0teric left	14:43
	→ NeXTSUN joined	14:44
	← a_thakur left	14:44
Vampire0	guardian, to have what as result? You only want to do update-index and the intended result is?	14:44
	← oaaao left	14:45
	← Tobbi left	14:45
	→ Es0teric joined	14:47
	→ madewokherd joined	14:47
	← Dougie187 left	14:49
Vampire0	guardian, I think you should be able to use update-index with --cacheinfo, but I'm not sure that results in what you intend. You will save the checkout, but then the submodules worktree is not in the state you reference, so it will be shown as changed, as it is not in the state expected	14:49
	→ Dougie187 joined	14:49
	← Es0teric left	14:49
	→ ki0 joined	14:50
	← chele left	14:50
	→ Es0teric joined	14:51
	→ boombatower joined	14:51
	← mozzarella left	14:52
	→ ResidentBiscuit joined	14:52
	← ResidentBiscuit left	14:52
	→ mozzarella joined	14:52
	→ ResidentBiscuit joined	14:53
	← Es0teric left	14:53
	→ p4trix joined	14:53
	← netj left	14:54
	→ netj joined	14:54
	→ onehrxn_ joined	14:54
	→ ZyX-I joined	14:56
	→ CheckDavid joined	14:56
	← eroux left	14:56
	← onehrxn left	14:56
	← Silenced left	14:57
	→ ozcanesen joined	14:57
	→ revoltingPeasant joined	14:57
	→ Macaveli joined	14:57
revoltingPeasant	I'm tracking an svn repo locally using git. here is a copy of it's .git/config https://ptpb.pw/cJDn	14:59
	I want to push this to a new git repo	14:59
	→ oaaao joined	15:00
	→ Es0teric joined	15:00
	← oaaao left	15:00
revoltingPeasant	I also want my changes to be written to this git repo when I push any further commits	15:00
	→ oaaao joined	15:00
	→ thebope joined	15:00
	← clmsy left	15:01
	← ruxu left	15:01
revoltingPeasant	I'm not sure how to do this and google isn't giving me anything relevant. does anyone know where I can read about this?	15:01
	← maryo left	15:01
	← Es0teric left	15:01
	← theoceaniscool left	15:01
	← Macaveli left	15:01
	← Silmarilion left	15:02
	← xall left	15:03
	→ Es0teric joined	15:03
	← ferr left	15:03
grawity	revoltingPeasant: literally regular `git remote add ...` and `git push`	15:04
	← MissionCritical left	15:04
	← cdg left	15:04
	← star_prone left	15:04
	← lordjancso left	15:05
	← Es0teric left	15:05
	← jstimm_ left	15:07
	← telephone left	15:08
	→ Silenced joined	15:08
	← quizzi left	15:08
	→ fission6_ joined	15:09
	← fission6 left	15:09
	fission6_ → fission6	15:09
	→ telephone joined	15:09
	← telephone left	15:09
	→ telephone joined	15:09
	→ Tobbi joined	15:11
	← weakdan left	15:11
	→ ayogi joined	15:12
	← Silenced left	15:12
	→ cousteau joined	15:13
cousteau	sup	15:13
	Does git create one whole copy of all the project for each branch?	15:13
	→ kristofferR joined	15:13
Vampire0	cousteau, no	15:13
	→ tsdev joined	15:13
	→ Murii joined	15:13
Vampire0	cousteau, a branch in Git costs exactly 41 bytes	15:13
cousteau	ah	15:13
	I was thinking that creating the whole copy would simplify the process of checking out another branch, and...	15:14
	ok so a branch is just a tag you put on a commit	15:14
	→ MissionCritical joined	15:14
Vampire0	cousteau, a branch in Git is just like a post-it note sticked to a commit, the same for tags. The only difference is, that the branch post-it is automatically peeled off and sticked onto the new commit if you create a new commit while the branch is checked out (the branch, not the commit, the branch is pointing to)	15:14
	cousteau, if you switch branches, simply the files that are different between the branches are updated to the new branches state	15:15
	→ maryo joined	15:15
Vampire0	cousteau, you can also checkout multiple branches in different directories with man git worktree	15:15
gitinfo	cousteau: the git-worktree manpage is available at https://gitirc.eu/git-worktree.html	15:15
cousteau	I see	15:15
	→ overlord_tm joined	15:15
	→ theiostream joined	15:16
	→ LeBlaaanc joined	15:16
cousteau	ok in that case I think I'll ...yeah I'll use a tag, let me look up what's that	15:17
	← Cabanossi left	15:17
Vampire0	cousteau, it is the exact same thing as a branch technically, with the exception that it never moves automatically	15:17
cousteau	I just got my project reviewed so I want to tag this for future reference	15:17
	← MineCoins left	15:17
	→ Cabanossi joined	15:17
Vampire0	cousteau, yes, then you are probably after a tag	15:17
	← ArchNoob left	15:18
	→ Silenced joined	15:18
	← synthroid left	15:18
	→ borkr joined	15:18
	← peacememories left	15:19
	→ quizzi joined	15:19
	→ thiago joined	15:20
	→ shinnya joined	15:20
	→ robattila256 joined	15:21
	← netj left	15:22
	→ Es0teric joined	15:22
	→ netj joined	15:22
	← dedicated left	15:24
	← acetakwas left	15:24
	← Es0teric left	15:24
	→ eroux joined	15:24
	→ dedicated joined	15:25
	→ alexggordon joined	15:26
	→ Achylles joined	15:26
	→ tyreld joined	15:27
	→ tymczenko joined	15:27
	→ Es0teric joined	15:27
	← mentazoom left	15:30
	← a3Dman left	15:31
	← Es0teric left	15:31
	→ theoceaniscool joined	15:31
	→ ArchNoob joined	15:31
	← theiostream left	15:31
	← Hello71 left	15:31
	→ theiostream joined	15:32
	→ samlamamma joined	15:32
	← vkareh left	15:33
	→ moony22 joined	15:34
	← theiostream left	15:34
	← TheSimonator left	15:35
	→ vkareh joined	15:35
	← LeBlaaanc left	15:35
	→ theiostream joined	15:35
	← jagob left	15:36
	→ a3Dman joined	15:37
	← blackpajamas left	15:39
moony22	Hi, I know this is probably a trivial question but I'm bad at git and don't want to completely mess everything up. I had a remote master which had many commits, and I made changes to a local master which was many commits behind. Then I tried to git pull and it merged instead of rebased, making this in my github network graph (I pushed like an idiot): http://i.imgur.com/UPX1S4F.png - is there a way to revert	15:40
	this	15:40
	→ gregor2 joined	15:40
	→ xall_ joined	15:40
	→ Es0teric joined	15:41
moony22	or is it too late and I can't change it	15:41
_ikke_	moony22: Do you expect anyone to have pulled from master since you pushed?	15:41
	← metachr0n left	15:41
moony22	only myself	15:41
	from another pc	15:42
	→ Gustavo6046 joined	15:42
moony22	other than that theres no changes or anything, the latest commit is the merge commit	15:42
	→ matsaman joined	15:42
	→ Hello71 joined	15:42
	← davimore left	15:42
	→ metachr0n joined	15:43
	← vkareh left	15:44
	→ Macaveli joined	15:44
	← Es0teric left	15:44
	← tymczenko left	15:44
_ikke_	then you can still undo it	15:44
	← Tuor left	15:44
	← tohuw left	15:45
	→ vkareh joined	15:45
moony22	oh great how can I do it? I don't need the changes I made on the first PC before pulling since I can just copy that file	15:45
osse	moony22: use the --force	15:45
	→ tohuw joined	15:45
	tohuw → Guest29517	15:46
	← wachpwnski-mobi left	15:46
moony22	sorry, I know these tips might be good for someone that properly knows git commands but honestly i've got no idea how to start and where to start from	15:47
	→ Es0teric joined	15:48
	← lewix left	15:48
	← rominronin left	15:48
moony22	i guess I should use git reset	15:48
	→ kadoban joined	15:48
	→ rominronin joined	15:48
	← Macaveli left	15:48
	→ acetakwas joined	15:49
	← Derperperd left	15:49
	→ rorro joined	15:49
moony22	or git revert idk	15:50
	→ Derperperd joined	15:50
	← Es0teric left	15:51
	← rominronin left	15:53
moony22	crap I reverted the merge but it didnt fix it	15:55
	→ TbobbyZ joined	15:55
	basiclaser → basicloser	15:55
	→ Es0teric joined	15:55
	← chardan left	15:55
	← Guest29517 left	15:56
	→ Guest29517 joined	15:56
moony22	I guess it's not possible	15:56
	← courrier_ left	15:56
	← Es0teric left	15:56
	Guest29517 → Tohuw	15:56
	→ nexemacs joined	15:57
moony22	is there any way to rewrite history instead?	15:57
	→ GT4066 joined	15:57
	→ LeBlaaanc joined	15:57
	→ synthroid joined	15:59
	← schleppel left	16:00
	← alexggordon left	16:00
	→ jagob joined	16:01
_ikke_	yes	16:01
	→ hobodave joined	16:01
_ikke_	With git reset for example you can undo the revert and the merge	16:01
	← ig0r_ left	16:01
_ikke_	!fixup	16:01
gitinfo	So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!	16:01
	→ peacememories joined	16:02
moony22	!rewrite	16:02
gitinfo	Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	16:02
	→ ki0_ joined	16:02
	→ brent__ joined	16:02
	→ lewix joined	16:03
	← gregor2 left	16:03
moony22	can I use git push -f origin #commit:master	16:03
	→ Es0teric joined	16:03
_ikke_	Yes, but you also want to fix it locally	16:04
	→ nixjdm joined	16:04
moony22	ok so I can use git reset --hard and the commit id of the right one as well im guessing	16:04
	→ TheSimonator joined	16:04
	← ki0 left	16:05
	← Es0teric left	16:05
	← saul left	16:07
	→ jstimm joined	16:07
moony22	it worked great, thanks a lot!	16:08
	→ Es0teric joined	16:10
	← zeroed left	16:10
	← sbulage left	16:11
	→ star_prone joined	16:11
	← Es0teric left	16:11
	← ProLoser left	16:12
	→ MineCoins joined	16:13
	→ zeroed joined	16:14
	← zeroed left	16:14
	→ zeroed joined	16:14
	→ HoierM joined	16:15
	← chll_ left	16:16
	← Cabanossi left	16:16
tcsc	i'd like to close all the branches i have in my local repo that start with a prefix ("bug/") and have been merged into another branch, which is called inbound because reasons.	16:16
	historically i've done this manually. e.g. checkout each branch, rebase against inbound, then see if branch -d works. this is tedious and i've slacked on it and have about 30 branches that i'd have to do this to, and would rather not do it manually, or at least would be interested in any slightly better way of the manual approach i just described	16:17
	→ dvaske joined	16:17
	→ Cabanossi joined	16:18
	→ jordila joined	16:19
	→ Es0teric joined	16:20
_ikke_	tsdev: git branch --merged tells you what branches are reachable from a specific branch	16:20
jordila	hi... newbie here, i just want 'develop' becomes 'master' branch ( no merge here ) , which is the easiest way to accomplish it ?	16:20
tcsc	_ikke_: hm, and i guess i could -D those with confidence	16:21
	→ durham joined	16:21
	jordila ... is wondering... ^^ would a pure branches renaming do the job ?	16:21
	← Murii left	16:21
	→ orbyt_ joined	16:22
	← Es0teric left	16:22
_ikke_	jordila: sure, that's a good way to do it	16:22
	← theoceaniscool left	16:22
	→ theoceaniscool joined	16:23
	← star_prone left	16:23
revoltingPeasant	grawity: Thanks	16:23
	→ star_prone joined	16:23
	→ Es0teric joined	16:24
jordila	_ikke_ i've read here that git doesn't easily allow the deletion of (afterwards needed) 'master' branch :	16:24
	← Es0teric left	16:25
	jordila https://stackoverflow.com/questions/1526794/rename-master-branch-for-both-local-and-remote-git-repositories ... see 'Note:'	16:25
	→ portal_ joined	16:25
	→ ambro718 joined	16:25
	← portal_ left	16:25
	→ dendazen joined	16:26
	← lewix left	16:27
	← nexemacs left	16:27
tcsc	_ikke_: ah, so it appears that something (possibly the fact that they're not yet merged in my local tree, due to the patch submission/code review process we use, or possibly the fact that this is really a mercurial tree i'm interacting with via git-cinnabar) is making it so that git branch --merged doesn't contain any of the branches i'm interested in	16:27
	→ TikityTik joined	16:27
	→ Es0teric joined	16:27
	← star_prone left	16:28
	← zeroed left	16:28
	← maryo left	16:28
tcsc	i know that the approach i outlined above does work, e.g. git co branch-in-question; git rebase inbound; git co inbound; git branch -d branch-in-question	16:28
	← matsaman left	16:28
tcsc	if that ... helps	16:28
	i guess i can just write a shell script or something to do that	16:28
	← oskarkv left	16:28
	← jstimm left	16:28
	→ InfoTest joined	16:28
	← Es0teric left	16:29
	← livingstn left	16:29
tcsc	or i could just delete the ones i haven't touched in several months outright and hope it works out...	16:29
	← kurkale6ka left	16:30
	← InfoTest left	16:31
	← __main__ left	16:32
	← xall_ left	16:32
	→ Es0teric joined	16:32
	← p4trix left	16:32
	→ __main__ joined	16:33
	← skunkz left	16:33
	← mikecmpbll left	16:33
	← Es0teric left	16:33
	← Tobbi left	16:34
	← sds__ left	16:34
	← TheSimonator left	16:34
	← masuberu left	16:35
	← dvaske left	16:35
	→ nexemacs joined	16:36
	← zefferno left	16:37
	→ livingstn joined	16:37
	→ Introoter joined	16:37
	← nexemacs left	16:38
	→ nexemacs joined	16:38
	→ TheSimonator joined	16:39
	→ Darren_ joined	16:39
tcsc	yep, hope i don't regret doing that	16:39
	← ki0_ left	16:40
	→ kfoonamalik joined	16:40
	→ ankit01ojha joined	16:40
	→ shgysk8zer0 joined	16:41
	← kfoonamalik left	16:41
	→ ki0 joined	16:41
	← ki0 left	16:42
	← GT4066 left	16:42
	→ dreiss joined	16:42
	→ Es0teric joined	16:43
	← jimi_sanchez left	16:44
	← peacememories left	16:44
	← Es0teric left	16:44
	→ kfoonamalik joined	16:45
	→ peacememories joined	16:45
	→ dfas joined	16:46
	← freimatz left	16:46
	← chichou left	16:46
	← diogenese left	16:46
	→ maryo joined	16:47
	→ rominronin joined	16:49
	← elect left	16:49
	← theiostream left	16:50
	→ jstimm joined	16:50
	← Nilesh_ left	16:50
	→ theiostream joined	16:50
	→ diogenese joined	16:52
	→ truckcrash joined	16:52
	← kelthan left	16:52
truckcrash	anyone know where I could go to get help for gitbash for windows?	16:52
	→ mikecmpbll joined	16:53
	← imack left	16:53
	basicloser → basiclaser	16:54
	→ Murii joined	16:54
	← jameser left	16:54
	→ alexggordon joined	16:56
	← overlord_tm left	16:57
	→ freimatz joined	16:57
truckcrash	huh. sure is quiet in here for a channel with so many users :)	16:57
	If anyone knows what is going on with this, or knows where I could get help, I'd like to know	16:58
	→ svm_invictvs joined	16:58
truckcrash	http://i.imgur.com/6Vb4g8M.png	16:58
	telnet is installed, and works under the windows command line	16:58
	→ tarkus joined	17:00
	← Darcidride left	17:00
	← nexemacs left	17:01
	→ synthroi_ joined	17:02
	→ s1scha joined	17:03
	→ tnecniv joined	17:03
	← makinen left	17:03
	← acetakwas left	17:03
	→ davimore joined	17:04
	← synthroid left	17:05
	← peacememories left	17:05
	← Snugglebash left	17:05
	← MineCoins left	17:05
	← DarkPsydeLord left	17:05
	← cousteau left	17:06
	→ gopar joined	17:06
	→ peacememories joined	17:06
	→ nexemacs joined	17:08
	→ DarkPsydeLord joined	17:09
	← monq left	17:09
	← theoceaniscool left	17:09
	← seni left	17:12
	← TheSimonator left	17:12
	← rorro left	17:12
	→ TheSimonator joined	17:12
	→ saml joined	17:13
saml	i want to introduce revert commit(s). and also want to create a branch out of sha1...sha2	17:13
	← jstimm left	17:13
saml	so that I keep working on the new branch and be able to merge back to master	17:13
	← vamiry left	17:14
	← marcogmonteiro left	17:15
	→ marianina8 joined	17:15
	← marianina8 left	17:15
	→ marianina8 joined	17:16
	→ vamiry joined	17:17
	→ MineCoins joined	17:17
	← shinnya left	17:18
	→ Discovery joined	17:19
	→ cousteau joined	17:19
	→ oskarkv joined	17:19
saml	A-B-C want to do A-B-C-revertC-revertB but also put B-C to a branch in a way that the branch can be merged back, bringing back B-C	17:19
cjohnson	have you already pushed the current branch?	17:22
	pushed B and C that is	17:23
	← borkr left	17:23
	← duderonomy left	17:23
	← rominronin left	17:23
	→ cr1tic joined	17:23
cjohnson	if you haven't, you can just make a new branch from the current branch at C, and the new branch will be A B C	17:24
	then rewind the current branch to A and push that	17:24
	→ Ryanar joined	17:24
	← cliluw left	17:25
	← cr1tic left	17:25
	→ cr1tic joined	17:26
	→ ki0 joined	17:27
saml	cjohnson, yeah things are already pushed. so i want to create a revert commit	17:28
	looks like more things are pushed... so I want to revert a merge commit. then create a branch in a way that I can work on it further and merge it back	17:28
	← pks left	17:29
	← alexggordon left	17:30
cjohnson	maybe you could make a separate branch where you just revert the revert commits	17:31
	← ki0 left	17:31
	← Cabanossi left	17:31
	→ star_prone joined	17:31
cjohnson	since all the branches will always contain B and C as well as their reverts, any merge won't bring B and C back over when you're ready later to integrate	17:32
	→ ig0r_ joined	17:32
cjohnson	you'll need to make B and C into entirely new commits	17:32
	← tsdev left	17:32
	→ Cabanossi joined	17:33
	← Ryanar left	17:33
	→ pks joined	17:33
saml	how do I turn B-C into new commits?	17:33
	generate patch somehow and create a commit out of patch?	17:34
	→ jtri joined	17:34
	← AaronMT left	17:34
	← livingstn left	17:35
cjohnson	revert revert	17:35
	if you revert revertC you should end up with a commit identical to C	17:35
	in theory	17:35
	→ AaronMT joined	17:35
saml	thanks	17:35
	→ Vinnie_win joined	17:35
	← star_prone left	17:35
	← phase2 left	17:36
jtri	hmm, got myself in a tangle, i did git stash, switched branches to master, did some merging, building, etc, then accidentally edited in master, so i just switched back to my branch and tried a git stash pop, my tree also looks a bit harry: http://dpaste.com/1XCS4X5	17:36
	wondering how to get back to working in my branch with the changes showing when i type git diff	17:37
	← GGMethos left	17:37
	← loskutak left	17:37
	← fahadash left	17:37
	→ phase2 joined	17:39
	→ Acerific joined	17:39
	← Acerific left	17:39
	→ Acerific joined	17:39
jtri	that commit has e47f9aa8 is not my stashed changes	17:40
	→ imack joined	17:42
	← notebox left	17:43
	→ dviola joined	17:43
	→ GGMethos joined	17:45
	→ Ryanar joined	17:46
	→ Tobbi joined	17:46
	← chovy_ left	17:46
	← ozcanesen left	17:48
	→ gugah joined	17:48
	→ livingstn joined	17:49
	→ re1 joined	17:49
	← jordila left	17:49
	← a3Dman left	17:52
	← pbandark left	17:52
	→ doener joined	17:52
	→ peterbecich joined	17:52
	→ pbandark joined	17:53
	← zxd left	17:53
	← Silenced left	17:55
	→ lewix joined	17:55
	← skered left	17:57
	← peterbec` left	17:57
	→ ki0 joined	17:57
	← dfas left	17:58
	→ ezio joined	17:58
ezio	is there a key manager for git bash ssh?	17:58
	→ dfas joined	17:58
preaction	is ssh-agent installed?	17:58
ezio	ah thanks	17:59
	→ a3Dman joined	17:59
ezio	uhh	17:59
	yes	17:59
	thanks	17:59
	← livingstn left	17:59
	→ safe joined	17:59
	→ skered joined	18:00
kadoban	jtri: Not really clear what trouble you're having. You figure it out yet?	18:00
	→ gregor2 joined	18:00
jtri	kadoban: yeah, i'm not sure how i got into it, but i had an unapplied stash item which i was able to recover	18:01
	→ Silenced joined	18:02
	→ livingstn joined	18:03
	→ scoobert1on joined	18:04
	→ chovy_ joined	18:04
	→ cliluw joined	18:04
avar	When I run e.g. `git -c <config> grep --recurse-submodules` the <config> is passed to the child processes spawned, but I don't see how that's happening.	18:04
	← vkareh left	18:05
avar	via ps auxf the invoked child processes don't get their own -c <config>, wondering how this is passed along..	18:05
	→ teroshan joined	18:05
	← afuentes left	18:06
	→ paul424 joined	18:06
	← safe left	18:06
	→ Fallen0223 joined	18:06
	← TheSimonator left	18:07
	← Silenced left	18:07
	→ ProLoser joined	18:07
	← scoobertron left	18:08
	→ leeN joined	18:08
ProLoser	I don't want to have to do `git push origin newbranch -u` every single time i checkout a new branch	18:08
	How can i get this to work byd efault?	18:08
	that it pushes to a branch of the same name unless explicitly configured to do otherwise	18:08
	or like when i create a new branch, it's automatically setup to track a respective branch on the remote of the same name (again, unless explicitly configured otherwise)	18:09
	← Achylles left	18:09
avar	look up push-default in git-config(1)	18:09
	→ jfr_ joined	18:10
	→ vuoto joined	18:10
	← vuoto left	18:10
	→ manoflags joined	18:10
	← ayogi left	18:11
	← cr1tic left	18:11
	← jfr left	18:11
	← fission6 left	18:11
	→ TheSimonator joined	18:11
	→ Sasazuka joined	18:11
	→ cr1tic joined	18:11
	← manoflags left	18:14
	← __main__ left	18:14
	→ jstimm joined	18:14
	→ manoflags joined	18:14
	← gregor2 left	18:14
	← eroux left	18:15
	→ rosiu joined	18:15
	→ __main__ joined	18:15
	→ lekare joined	18:15
	→ nd_ joined	18:15
	← TheSimonator left	18:16
	→ dmj` joined	18:17
	→ bilal joined	18:17
	→ ok91 joined	18:18
	← dfas left	18:18
	← bronson left	18:18
	→ bronson joined	18:18
	→ schleppel joined	18:18
	← ArchNoob left	18:19
	← bilal_ left	18:19
avar	Oh man, that config thing is because git itself passes along GIT_CONFIG_PARAMETERS	18:19
	← nd left	18:19
	← Bock left	18:20
	→ rominronin joined	18:21
	← manoflags left	18:21
	← hobodave left	18:23
	← ki0 left	18:23
	→ ki0 joined	18:24
	→ Silenced joined	18:25
	← Ryanar left	18:25
	→ Dan0maN_web joined	18:25
	→ alexggordon joined	18:26
	→ TheSimonator joined	18:28
	← ki0 left	18:28
	gitinfo set mode: +v	18:28
Dan0maN_web	hi all. i'm trying to make a patch for an RPM. RPMs tend to use the publicly released code from git repos at the time of release. what i'm trying to get a patch of is a fix from where someone forked down the road from that release commit, fixed something, then PR'd it in	18:28
	is there a way to do this easily?	18:29
	→ hobodave joined	18:29
	→ Es0teric joined	18:32
	→ SilverBe joined	18:33
	→ govg joined	18:33
	← imack left	18:33
	← oaaao left	18:34
	← a3Dman left	18:35
	→ TbobbyZ_ joined	18:36
	← maryo left	18:38
	← nexemacs left	18:38
	→ vkareh joined	18:39
cbreak	Dan0maN_web: a pull request is already a commit	18:39
	→ a3Dman joined	18:39
cbreak	you can easily get patches from existing git commits with git format-patch	18:39
	← TbobbyZ left	18:40
	← TbobbyZ_ left	18:41
	→ Mutter joined	18:41
	→ nexemacs joined	18:42
	← gnixev left	18:42
	← cousteau left	18:44
	← Kaisyu left	18:44
	→ manuelschneid3r joined	18:45
	← hobodave left	18:46
	→ dvaske joined	18:46
	→ hobodave joined	18:47
	→ TbobbyZ joined	18:47
	← Mutter left	18:48
	← nexemacs left	18:49
	← vkareh left	18:49
	→ maryo joined	18:50
	← ankit01ojha left	18:50
	→ Macaveli joined	18:51
	← tarkus left	18:51
	← NeXTSUN left	18:51
	← theiostream left	18:53
	← paul424 left	18:54
	→ theiostream joined	18:55
	← rominronin left	18:55
	← kpease left	18:56
	← brent__ left	18:57
	← justin3 left	18:58
	→ justin3 joined	18:58
	→ brent__ joined	18:58
	→ zivester joined	18:59
	→ Ryanar joined	18:59
	← shgysk8zer0 left	18:59
	← theiostream left	18:59
	← a3Dman left	18:59
	→ kpease joined	18:59
	← tribly left	19:00
	← alexggordon left	19:00
	← Cabanossi left	19:00
	→ dvaske_ joined	19:01
	→ Cabanossi joined	19:02
	← chovy_ left	19:03
	← Dan0maN_web left	19:04
	→ a3Dman joined	19:04
	→ notebox joined	19:04
	→ chovy_ joined	19:05
	← dvaske left	19:05
	← jstimm left	19:05
	→ pbandark1 joined	19:06
	→ jimi_ joined	19:07
	← hahuang65 left	19:07
	← pbandark left	19:08
	pbandark1 → pbandark	19:08
	→ synthroid joined	19:10
	→ ozcanesen joined	19:12
	← SilverBe left	19:12
	← synthroi_ left	19:12
	← doener left	19:13
	← Peetz0r left	19:13
	→ suck joined	19:14
	← pbandark left	19:15
	→ Oatmeal joined	19:15
	→ blow_ joined	19:15
	← blow_ left	19:15
	→ blow_ joined	19:16
	← peacememories left	19:17
	→ peacememories joined	19:18
	← suck left	19:21
	← __main__ left	19:21
	→ hsiktas joined	19:21
	← ali1234 left	19:21
	→ __main__ joined	19:22
	→ p4trix joined	19:23
	← p4trix left	19:23
	→ fission6 joined	19:24
	→ p4trix joined	19:24
	← blow_ left	19:25
	← cebor left	19:26
	→ cebor joined	19:26
	→ Achylles joined	19:26
	→ jstimm joined	19:26
	← a3Dman left	19:27
	→ Matt``` joined	19:29
	→ a3Dman joined	19:31
	← Cabanossi left	19:32
	→ star_prone joined	19:32
Matt```	if I make a change in branch A, in branch B if I try to update from master it complains about conflicts so I have to manually duplicate what I did in branch A	19:32
	→ Cabanossi joined	19:32
Matt```	even though nothing changed in branch B	19:32
	← star_prone left	19:33
	→ NeverDie_ joined	19:33
	→ Peetz0r joined	19:34
	← NeverDie left	19:35
	→ ali1234 joined	19:36
	→ ArchNoob joined	19:38
	← peacememories left	19:40
	→ druonysus_ joined	19:40
	← davimore left	19:41
	→ Cavallari joined	19:41
	← zerow left	19:42
	→ davimore joined	19:43
	← lewix left	19:43
	← fission6 left	19:45
	DigitallyBorn\|zz → DigitallyBorn	19:46
	DigitallyBorn → DigitallyBorn\|zz	19:46
	DigitallyBorn\|zz → DigitallyBorn	19:46
	← DigitallyBorn left	19:47
	← lekare left	19:47
	→ nexemacs joined	19:48
	→ overlord_tm joined	19:48
	← rosiu left	19:52
	→ rorro joined	19:52
	→ rominronin joined	19:52
	→ peterbec` joined	19:53
	→ Primer joined	19:56
	← rorro left	19:57
Primer	Hi. I'm trying to understand how IDEs work with git. For example, it seems that some IDEs associate a directory with a single "project", and since switching branches in git doesn't change the directory, a "project" and concepts associated with it, such as a list of files you've worked on in the branch, don't carry over very well.	19:58
	I'm finding that I can't maintain a list of files on a per-branch basis in my IDE, phpstorm	19:59
	← Darren_ left	19:59
Primer	I'm wondering if I'm just missing something, or if this is in fact some shortcoming of the IDE	19:59
kadoban	Hm? Typically each project is a git repository. I don't follow why you'd want per-branch lists of files? For the most part branches share the vast majority of their files.	20:00
_ikke_	Well a branch in git does not represent a work context	20:00
Primer	Say what?	20:00
	How does a branch in git NOT represent a work context?!	20:00
	→ gregor2 joined	20:00
_ikke_	a branch represents comitted content	20:00
	← Dewin left	20:01
Primer	Ok...	20:01
_ikke_	Uncomited changes stay behind if you switch branches for example	20:01
Primer	So you're saying this is a workflow issue?	20:02
	← hobodave left	20:02
_ikke_	Primer: Well, some IDE's do have features to manage work contexts	20:02
kadoban	I personally don't understand the goal ...	20:03
_ikke_	kadoban: branch A, files a, b and c are open. Branch B, files d, e and f are open	20:03
Primer	Because it's not uncommon for me to have more than one branch. For example: I start work on a feature. That feature opens 10 files. I then get a bug report. I make a branch of the WIP, commit, switch back to master, create a bug branch, open 10 other files...	20:04
preaction	does the ide support git-work-tree?	20:04
Primer	Fix the bug, commit, merge to master, switch back to the feature branch...and now I have to reset and open the dirty files	20:05
kadoban	_ikke_: Oh is that what they're looking for? Never would have guessed	20:05
_ikke_	"list of files you've worked on in the branch, don't carry over very well."	20:06
	Primer searches for git-work-tree	20:06
	→ gareppa joined	20:06
	← gareppa left	20:06
Primer	Well, that's doable via git diff master --name-only	20:06
_ikke_	well, git-work-tree also requires IDE specific files to cary over	20:06
Primer	presuming the branch is rebased often	20:06
	→ medeirosthiiago joined	20:07
	← medeirosthiiago left	20:07
	→ medeirosthiiago joined	20:07
Primer	http://stackoverflow.com/questions/36438333/how-do-i-use-git-worktrees-in-intellij-idea-2016-1	20:07
	→ GT4066 joined	20:07
_ikke_	Primer: intellij idea does have contexts	20:07
Primer	Honestly, I'm looking for concepts that I feel I've probably just haven't heard of, such as worktree	20:08
	phpstorm == intellij	20:08
_ikke_	they are just not tied to branches	20:08
	right, same for phpstorm	20:08
	← freimatz left	20:08
Primer	So back to workflow then...what is YOUR workflow, and how does it differ from using branches for features/bugs?	20:09
	→ crankslider joined	20:09
_ikke_	I do use brances for reatures/bugs, but I do not expect my editor to open all files that have changed in a branch	20:09
Primer	I don't expect mine to open them either, but I do want it to track them, preferably in a view that shows all the files I've modified for the branch	20:10
	I just want a convenient view of the files touched by the branch. And if I open an untouched file and modify it, that it gets added to this view.	20:10
	→ aielima joined	20:10
	← MineCoins left	20:10
	← Ryanar left	20:11
	→ rorro joined	20:11
Primer	I have a co-worker that uses...Kate, I believe (despite the fact that has has a license for phpstorm) simply because it supports this concept, and he says he's unwilling to change IDEs because of this	20:11
_ikke_	Right, that's a feature request you'd have to make then	20:11
	I would just open a pane with a terminal that shows git diff --name-only output	20:12
	→ MineCoins joined	20:12
	→ hahuang65 joined	20:12
	← rokups left	20:12
Primer	Yes, that is what I myself have been doing	20:12
_ikke_	(I use tmux with panes)	20:12
	← MineCoins left	20:12
Primer	But within the context of the IDE	20:12
	I can open an IDE view of git diff master --name-only (note master there)	20:12
	→ MineCoins joined	20:12
Primer	But that view, by default, is a diff viewer, so it's a 2 step process to actually open the file	20:13
	← MineCoins left	20:13
Primer	I realize this is a shortcoming of the IDE	20:13
	← d10n-work left	20:13
	→ MineCoins joined	20:13
_ikke_	You can write a plugin for it	20:13
	← MineCoins left	20:14
Primer	But again, I'm just trying to figure out if 1) I'm doing something incorrectly, 2) I'm just not aware of concepts that make this possible, 3) there's a better workflow that is more conducive to what I need	20:14
	← cr1tic left	20:14
	→ MineCoins joined	20:14
	← CheckDavid left	20:14
kadoban	I typically just manually open the files I need, though I could see where that'd sometimes be annoying.	20:14
_ikke_	I manuallo do the diff when I need it	20:14
	← MineCoins left	20:14
kadoban	If I had to, I'd probably just do a quick little command-line script to have it open the files outputted by that 'git diff' I guess	20:14
	← Es0teric left	20:15
Primer	_ikke_: and by that I'm guessing you don't mean in your IDE, but in a terminal?	20:15
	← Lunatrius left	20:15
kadoban	If I really wanted to get fancy I guess I'd add it to vim as a thing ... though I tend to get creative with my branch names so I couldn't fix "master" as the comparison	20:15
_ikke_	correct, but I do everything in the terminal anyway	20:15
	I used to use intellij, but switched to vim completely	20:15
	← s1scha left	20:16
	→ Lunatrius joined	20:16
Primer	kadoban: I'm just using master as an example here. We also do feature branches and branch off of those.	20:16
	← aw1 left	20:16
	NeverDie_ → NeverDie	20:16
	← Macaveli left	20:16
kadoban	Yeah, it'd be hard to handle that automatically then, because I'm not sure how you'd programatically come up with "the branch I based this on" that easily	20:16
	← darkbit left	20:17
Primer	kadoban: having that be a one-time configuration thing should be simple enough	20:17
	but that'd have to be tied to the git metadata, I would think	20:17
	← rorro left	20:17
Primer	surely easily done with git config?	20:17
	Anyhow	20:17
	← dviola left	20:17
kadoban	Probably could go in the config I suppose, ya.	20:18
	→ Sazhen86 joined	20:18
Primer	I'm going to read up on worktree	20:18
	I had never heard of this until now	20:18
	thanks	20:18
_ikke_	I don't think IDEs support work-trees that well	20:18
	You'd have to open the project multiple times	20:19
	→ Macaveli joined	20:19
	← dglambert left	20:19
kadoban	All of the IDE support for git I've seen was very limited and kind of annoying to me. But I never looked that hard either I suppose.	20:19
Primer	My co-worker tells me this Kate feature is in fact a plugin	20:19
_ikke_	The only thing I used IDE git integration for is the revert change per hunk option	20:20
	and see what lines were changed	20:20
Primer	Honestly, I do all my git operations from the terminal too, but it's nice seeing a graphical side-by-side diff with a list of files	20:21
	← dave0x6d left	20:21
_ikke_	but an actualy diff would be much more useful to me than just the filenames	20:21
Primer	git ops such as pull/push/rebase are done in the terminal, but I prefer to do diffs in the IDE	20:21
	and by that I mean actual diffs, not just --name-only	20:21
	→ hobodave joined	20:22
_ikke_	but if your coworker wants to use kate, let them use kate	20:23
Primer	I also have a co-worker that uses nano	20:24
	← davimore left	20:24
preaction	so?	20:24
Primer	over ssh	20:24
	An IDE has the ability to quickly show, for example, where a method is used, throughout an entire project, using a search index.	20:24
	→ Es0teric joined	20:25
preaction	so?	20:25
Primer	I'm one single key stroke away from finding all usages of a method, for example	20:25
preaction	congratulations?	20:25
_ikke_	ctags can do that too	20:25
Primer	My nano-using co-worker has to drop to a shell and do a recursive grep of the project	20:25
	→ brigadier7 joined	20:25
preaction	i mean, i use vim, so i am too	20:25
	so?	20:25
Primer	Ok, say the method name is "get"	20:26
preaction	are you trying to impose your IDE on these people? because how do you intend to approach that conversation without insulting them in some way?	20:26
Primer	Good luck filtering out all the false hits from grep?	20:26
preaction	condescension. that'll get them on your side, yep.	20:26
Primer	So far I've been pretty pragmatic about what I've written here. If you feel insulted, that's on you.	20:27
	← rominronin left	20:27
Primer	At no time did I write anything insulting.	20:27
preaction	i'm not the one who you're going to insult. it's your cow-orkers, who you have to ork with	20:27
	"stop using nano, use my thing instead because it's better" "how is it better" "i can do these things fast" "i don't care about doing those things fast" </scene>	20:28
	← peterbec` left	20:28
	← gregor2 left	20:29
Primer	One time I observed a co-worker spend an hour opening hundreds of files manually and changing text in them manually.	20:29
	← winfli left	20:29
	→ QwertyDragon joined	20:29
	← Macaveli left	20:29
Primer	I then showed this person how I would have done it with sed, in about 30 seconds.	20:30
osse	inb4 "so?"	20:30
cjohnson	lol	20:30
	← vrach left	20:30
	→ cagomez joined	20:30
Primer	I feel that my nano-using co-worker is wasting a lot of time with his choice to continue doing only what he knows.	20:31
	gitinfo set mode: +v	20:31
preaction	that's an entirely different situation. you're asking someone to take on the arduous task of re-learning their entire development workflow just so they can do one rare thing they may or may not care about "fast"	20:31
	→ chardan joined	20:31
	← Sazhen86 left	20:31
	→ darkbit joined	20:32
brigadier7	I'm fairly new to git, and I made a branch called freq from master. Someome made changes to master, and I merged them into my branch on 4/13. I want to undo that. What is the best way?	20:32
Primer	This same co-worker had to switch from svn to git.	20:32
preaction	and again i ask you: How do you intend on telling your co-worker that without insulting them?	20:32
Primer	Was my insistence of this equivalent?	20:32
	→ andrew9184 joined	20:32
Primer	He had a really hard time with it	20:32
preaction	in the context of this conversation, yes	20:32
_ikke_	brigadier7: Did you made commitsa after that?	20:32
brigadier7	yes :(	20:33
osse	if a person is insulted by another person offering advice then let them be insulted	20:33
cjohnson	Primer it sounds like all you need to do is configure your editor to detect workfing file changes and either reload or warn/close the tab for files that disappear	20:33
	→ cr1tic joined	20:33
cjohnson	Me personally I much prefer to have to manually do it, in case I screw something up	20:33
_ikke_	brigadier7: Did you push your branch?	20:33
cjohnson	so I would hate to have your preference of wanting your editor to automate it dictated to me via git	20:33
brigadier7	_ikke: yes :( :(	20:33
Primer	cjohnson: agreed. I was trying to figure out if this is an uncommon thing with IDEs. I only have the context of intellij so far.	20:33
cjohnson	Most IDEs default to reloading as files change afaik	20:34
	→ davimore joined	20:34
cjohnson	I don't think vim does though	20:34
	← tnecniv left	20:34
_ikke_	brigadier7: Do you expect someone else to have fetched this branch ?	20:34
	cjohnson: vim can do it	20:34
cjohnson	sorry I just mean, by default	20:34
preaction	yes, but not by default, as was said	20:34
kadoban	If you have the files open in vim and they change with like git, vim will ask if you want to reload them. If that's what you mean.	20:34
brigadier7	_ikke_: No, it's only me, and there have been no changes on my branch since the merge	20:35
cjohnson	yeah that's my preference	20:35
Primer	preaction: anyhow, I've had to approach this switch to the IDE diplomatically. I currently have 3 developers that don't want to get on board, but only because they're set in their ways, and are unwilling to change.	20:35
	← dvaske_ left	20:35
cjohnson	detect, warn, and ask me to reload	20:35
	but give me the option to keep what I have	20:35
brigadier7	Actually, I merged twice: 4/13 and today	20:35
Primer	preaction: they have not been required to change, nor will they	20:35
cjohnson	Primer: your personal IDE preferences don't need to be spread like gospel to the world	20:35
preaction	Primer: and my belief is that it would be better to make the project more open to any kind of development environment, including IDEs or yes, your coworker who uses nano	20:35
cjohnson	other people who want to use their own workflow should be free to do so	20:35
	→ tnecniv joined	20:35
cjohnson	that's the beauty of git	20:35
	→ holdsworth joined	20:36
brigadier7	So the state as of 4/12 is what I want	20:36
cjohnson	Primer: If you think they are wasting a huge amount of time, take the time to make the case to them for why your approach might help them	20:36
	← thebope left	20:36
cjohnson	but respect that they may disagree	20:36
_ikke_	brigadier7: and any commits that came after it?	20:36
preaction	and also respect that it may damage your working relationship with them	20:37
_ikke_	brigadier7: what should happen to those?	20:37
	→ thebope joined	20:37
brigadier7	_ikke_: no, there were no code changes except on master. My branch is pretty much only mine.	20:37
cjohnson	Well making a suggestion shouldn't damage any relationship if they are reasonable people	20:37
	← tnecniv left	20:37
preaction	depends on if the person making the suggestion is making it reasonably	20:37
osse	and whether the person getting it is reasonable	20:37
	polyzen → dmc	20:38
preaction	most "you should use my ide instead of vim" suggestions i've received have been decidedly unreasonable conversations	20:38
brigadier7	_iike_: I don't need anything before the merge, but perhaps in 2 months, I'd want to merge master for real.	20:38
_ikke_	nothing before or after the merge?	20:38
	← ArchNoob left	20:38
preaction	that said, i did have to do quite a bit of work to get Adobe Flex working right using standard Unix toolchain... so annoying...	20:38
osse	would you consider what damage to your working relationship with someone before suggesting that to the person that he should put on a new pot of coffee if he empties it?	20:39
brigadier7	_ikke_: I meant after. I'd like the code in the state it was in on 4/12. No changes were made to the branch except the merges	20:39
cjohnson	I would consider damaging that person that took the last of the coffee osse	20:39
preaction	"vim is stupid. you should use X instead" <- not reasonable, and hugely common	20:39
cjohnson	With a pipe	20:39
	lol	20:39
	← cr1tic left	20:39
	← Discovery left	20:40
_ikke_	brigadier7: git reset --keep <commit> resets it back to that commit	20:40
	← finalbeta left	20:40
_ikke_	find the commit hash of the commit you want on that ate	20:40
	← thebope left	20:41
	← dendazen left	20:41
brigadier7	_ikke_: I just did that, and I'll let you know how it works....	20:42
	← jtri left	20:42
	← ExoUNX left	20:43
	→ tymczenko joined	20:44
brigadier7	Once I do that, should I somehow push to the server respository?	20:45
	← diogenese left	20:45
	← jeffreylevesque left	20:45
	→ nexemacs_ joined	20:46
	← justin3 left	20:46
_ikke_	git push --force-with-lease <remote> <branch>	20:47
	← jstimm left	20:47
	← jimi_ left	20:47
	← synthroid left	20:47
Primer	I only hope that by me demonstrating that I can run circles around them with an IDE that they'll choose to adopt its usage.	20:48
	Anyhow, I didn't want to turn this into a debate about IDEs.	20:48
	← nexemacs left	20:48
	nexemacs_ → nexemacs	20:48
Primer	or lack thereof	20:48
cjohnson	consider time wasted evangelizing about your IDE. Who knows, maybe they're more efficient than you even if they're slower with their IDE	20:49
	lol	20:49
	→ jstimm joined	20:49
preaction	this debate is not about IDEs, it's about people	20:49
	← kpease left	20:50
cjohnson	and coffee	20:50
	and why I will cut you if you take the last ofi t	20:50
	← teroshan left	20:51
	← livingstn left	20:51
Primer	I think you made it about people. I can think of several equivalent scenarios where pointing out that there exist better tools to do your job.	20:51
brigadier7	_ikke_: Thank you so much. This is so potentially destructive I really feared doing anything, but I was stuck. I will toast you this evening with an over-caffeinated beverage.	20:51
Primer	And said job becoming faster, better, more efficient...heck, even more pleasant	20:52
	← moei left	20:52
_ikke_	:)	20:53
	→ zerow joined	20:53
Primer	This was the case for me. I just want my co-workers to share in my happiness!	20:53
	→ diogenese joined	20:53
preaction	and those scenarios may involve less change to use. changing how someone does every single aspect of their job is a huge change to ask for	20:54
	→ gnixev joined	20:54
cjohnson	so did the christians Primer	20:54
preaction	but i don't work with you, thank yhwh, so i don't care. good luck	20:54
Primer	I feel like I've touched a nerve here	20:54
osse	Who said anything about "every single aspect" except you?	20:54
cjohnson	batman	20:55
preaction	what else is an IDE but "the single place you spend most of your time in as a developer"?	20:55
Primer	I also have a co-worker who refuses to use phpstorm specifically because he disagrees with its license. I've had to point out to him that he's not paying for it, but he doesn't care.	20:56
	Do you agree that he should be exempted from using it because of that?	20:56
cjohnson	licenses are a philosophical issue as well, not just economic	20:56
preaction	yes, i do	20:56
osse	I combine using an ide and not using that ide every day	20:56
cjohnson	Primer: exempted from what?	20:56
	who died and made you king of the office editor choices?	20:56
Primer	cjohnson: exempted from being "encouraged" to use it	20:56
cjohnson	Nobody is stopping you from encouraging	20:57
	→ alexggordon joined	20:57
cjohnson	I'm sure if you took the time to make a positive and constructive case to them they would hear what you have to say	20:57
	← zerow left	20:57
cjohnson	but it sounds like you don't mean encouraging	20:57
Primer	This is exactly what I've been doing. In fact, this is exactly why I'm here, to find a way to satisfy a co-worker's desire to manage project/branch based files in the IDE I'm encouraging him to use.	20:58
cjohnson	Have them set editor to reload files automatically	20:58
	done	20:58
Primer	Right...if only such an option existed, given the criteria	20:59
	→ Atm0spher1c joined	20:59
cjohnson	pretty much every editor supports reloading files as they change	20:59
	if it doesn't then you are encouraging them to use a bad editor :P	20:59
preaction	they also want to reload groups of files based on what branch is checked-out (so, some kind of "session")	21:00
osse	but are you suggesting that they use that IDE for every single aspect of their job? Or just some of it?	21:00
	→ thebope joined	21:00
cjohnson	lol	21:00
	→ cdown joined	21:00
brigadier7	_ikke_: Bingo! I'm in business again. You rock	21:00
	← Silenced left	21:00
	→ Dewin joined	21:00
	← tymczenko left	21:00
cjohnson	preaction: oh, lots of editors support that too	21:00
	Primer ^	21:00
preaction	cjohnson; yes, i know	21:00
	→ Silenced joined	21:00
Primer	The goal was to maintain a "view of project files" which would refresh based on the branch	21:00
cjohnson	nah, that's not necessary, just use sessions	21:01
	one session for 1 feature 1 session for another	21:01
	lots of editors support that too	21:01
preaction	osse: so, Primer will be satisfied if nano-guy uses the IDE just to do search/replace over the code and not actually write code with it?	21:01
Primer	osse: I'm only suggesting that they try the IDE and avail of the features that have the potential to make their jobs easier, better, faster	21:01
	← Silenced left	21:01
Primer	preaction: that's a start	21:01
	→ livingstn joined	21:01
cjohnson	If they don't want to, they don't want to. If you continue to push beyond that, you are not doing encouragment	21:02
osse	preaction: no idea, but it seems to me that what you're arguing against is not what Primer is saying but quite the hyperbole of it	21:02
preaction	trying a new tool takes weeks to get up-to-speed and comfortable. you're requiring them to go through weeks of frustration	21:02
	sorry, not requiring, requesting	21:02
	← druonysus_ left	21:02
	← livingstn left	21:02
osse	some tools are worth it	21:02
Primer	These guys have had a license for this IDE close to 1 year now. I've not forced anyone to do anything.	21:03
osse	how to drive a car comes to mind	21:03
preaction	you don't get to make that judgement for me	21:03
osse	i don't	21:03
	and i'm not	21:03
cjohnson	Primer: no but you are taking offense that they haven't jumped ship onto what you personally believe is good	21:03
	that's what is annoying	21:03
Primer	I do, however, take the time to point out how I would do tedious and time-consuming takes in the IDE when I see them do something their way.	21:03
cjohnson	nothing wrong with making a suggestion, just like there's nothing wrong with them disagreeing and not taking it	21:04
preaction	and the more time you spend trying to convince them that you're right, the less likely they'll think you're just trying to be helpful	21:04
	← jstimm left	21:04
osse	but I would also argue that refusing to learn these tools shows attitudes that developers should not have	21:04
preaction	i refuse to learn phpshark or whatever the ide is	21:04
cjohnson	Sure but that's something for the manager to fix, not the coworker	21:04
	bring it up to the manager if it's such a major issue	21:04
	if they're wasting such monumental amounts of time	21:04
Primer	cjohnson: Taking offense would imply this is something personal. Is asking for more efficiency in your job something that I, as a manager, should not expect?	21:04
preaction	are they meeting project deadlines?	21:05
	are those deadlines reasonable?	21:05
	if yes, then why does it matter?	21:05
cjohnson	Primer: I can say definitively that you are definitely taking it personal lol, just based on all your interactions here	21:05
Primer	Scotty factor	21:05
	I'm guilty of it too	21:05
	← schleppel left	21:05
preaction	... so you're saying if they picked a different tool, you wouldn't have to pad your estimates for unknown variables because... why?	21:06
	← nexemacs left	21:06
	← cdown left	21:06
osse	in this case offense is taken, not given.	21:07
	← Es0teric left	21:07
osse	even if deadlines are met, if a dev feels insulted from being given friendly advice (yes, friendly is a condition in my opinion) then screw them	21:08
preaction	that doesn't make it unoffensive	21:08
Primer	I'm trying really hard not to go into hyperbole myself here.	21:08
osse	if the advice is not friendly then it's a different story	21:08
preaction	repeating advice over and over is not friendly	21:08
cjohnson	I agree with that osse	21:08
	and I agree with that preaction	21:08
	lol	21:08
	← brigadier7 left	21:08
cjohnson	if you make the case and they don't agree with you, that's that. maybe bringi t up once or twice more	21:08
	but buying them a license to an editor and continually pushing them to use it is not friendly	21:09
Primer	But the only thing I can think of are examples of times when sloppy code has been turned in, code that could have been better if the developer had been using better tools.	21:09
preaction	"hey i just found this new thing that really helped me" <- friendly advice	21:09
cjohnson	if they are missing deadlines or something and it's entirely because of their editor choices then sure, that's a performance issue	21:09
	→ kyan joined	21:09
	→ nexemacs joined	21:09
cjohnson	I doubt that Primer	21:09
preaction	how would it be better if they were using better tools?	21:09
cjohnson	sloppy code comes from sloppy coders	21:09
osse	that's what CI is for!	21:09
	→ jstimm joined	21:09
cjohnson	editors, like guns, cannot be blamed for the things the monkeys you give them to do	21:10
kent\n	everyone has a CI installation	21:10
	→ Es0teric joined	21:10
kent\n	just some people also have a production environment as well	21:10
Primer	Pardon my ignorance, but...CI?	21:10
preaction	if you are having a problem with sloppy code, that's a lot easier to fix: point it out, explain how it should be corrected, and then you even have a good reason to say "the phpstorm thing even does this automatically for you if you want to try it out"	21:10
cjohnson	continuous integration Primer	21:10
Primer	I'm not being facetious here either	21:10
cjohnson	automatically testing their code	21:10
	If it fails they get warnings traight away to fix it	21:10
Primer	yeah, I had a feeling it was something like this	21:10
preaction	Travis or Jenkins, like	21:10
	the server judges the code and tells them if they live or die!	21:11
cjohnson	you're trying to fix this from the wrong end	21:11
	check it in the release pipeline and don't let shit pass. you can do linting as well	21:11
	and fail if they fail linting	21:11
osse	I like it when people write #include "StuFF.h" and the CI picks up on it because it's running runix	21:11
Primer	In a perfect world, every place has all of these things.	21:12
	→ cdown joined	21:12
preaction	except the mandated IDE	21:12
cjohnson	CI is not hard to set up if your project is on github	21:12
	just plug in the command that runs your tests	21:12
osse	"mandated". there's the hyperbole again	21:12
Primer	What tests? :)	21:12
cjohnson	and if your codebase isn't tested, well, imo, that's a failure of you	21:12
	for not allocating time and enforcing testing requirements	21:12
	← YuGiOhJCJ left	21:12
cjohnson	assuming you're the manager	21:12
preaction	osse: if my boss continually harangued me for not using a certain tool, i would consider that a mandate, yes	21:13
osse	Primer: on the other hand, if devs come to you and ask for time to set up a build server or the like, you should consider letting them.	21:13
cjohnson	if you are letting people push code live that doesn't have associated tests then you are the one generating the sloppy code Primer	21:13
Primer	"Hey management, I'd like to setup automated testing."	21:13
osse	At our place we've waasting soooo much time trying to do stuff in a way that saves time	21:13
cjohnson	Primer: Use whatever logic you are currently trying to use to enforce they use an editor	21:13
Primer	"Sounds good! We can pencil that into Q4 next year. How does that sound?"	21:13
cjohnson	if it's good enough to get them to use a different editor it's good enough to justify spending time testing	21:13
preaction	it was different when i thought this was just a dev talking to another dev. this is a boss talking to their devs, that makes "suggestions" into a bit more	21:13
cjohnson	if you can't justify testing then you have no valid reason to try to get them to change editors either	21:14
	code clarity and quality, stability, etc	21:14
	it's an easy sell. If you are so slammed that it's impossible to fit in then why is it reasonable to spend soe much of your time trying to get them to switch editors? Obviously they are slammed right?	21:14
	← rnsanchez left	21:15
	← Vaelatern left	21:15
	→ dsdeiz joined	21:15
Primer	So far all I've done is obtain licenses for my co-workers and encouraged them to use it. The use is not mandated, nor will it be.	21:15
	← gugah left	21:15
cjohnson	a manager continually hounding you to use something is soft-mandated	21:15
	→ safe joined	21:15
cjohnson	or at the very least a waste of time	21:16
Primer	The nano guy tells me he wants to use the IDE, but that he wants to start using it on a "smaller project". Except, none are on the horizon.	21:16
osse	then perhaps let him spend a day of the week on a pet project. something internal maybe	21:16
	← cdown left	21:16
osse	like... a testing suite!	21:16
Primer	osse: wonderful idea!	21:16
cjohnson	You don't have to have 100% coverage out of hte gate either	21:17
	set up tests and then mandate that all new code be tested	21:17
	you can come back next year to test the rest	21:17
	← medeirosthiiago left	21:18
cjohnson	no major time cost there	21:18
Primer	So...mandate testing...what if I meet resistance?	21:18
	→ askb joined	21:18
Primer	"Sorry, I don't like this idea of testing..."	21:18
cjohnson	I thought you were the manager	21:18
	Well testing has a huge list of pros	21:19
Primer	Ok...	21:19
	→ rorro joined	21:19
cjohnson	You can come up with their entire argument against it ahead of time	21:19
Primer	Should I reach for some popcorn?	21:19
cjohnson	and write out an argument for why the pros outweigh the cons	21:19
Primer	Sorry	21:19
	Biting my lip here	21:19
osse	Primer: then you quit your job as a manager, start working somewhere else as a dev, because who wants to be a manager in the first place :O	21:19
cjohnson	don't hurt yourself	21:19
	osse on point	21:19
	← zivester left	21:20
Primer	osse: you're firing on all cylinders, man!	21:20
osse	:P	21:20
Primer	It's funny, but I've had this conversation so many times before. And it all starts from something innocent.	21:21
	→ livingstn joined	21:21
cjohnson	Seriously though, if your devs are pushing shit/sloppy code to production, it's because you are letting them. To fix that, you can either start code reviewing every commit, which is simply not feasible, or you can set up automated enforcement	21:21
	tests, linting, etc	21:21
	← kristofferR left	21:21
cjohnson	and if they refuse to participate, and they refuse to improve the quality of code, and it's not because you are running them ragged and not giving them enough time to do things	21:22
	→ tribly_ joined	21:22
	← jstimm left	21:22
cjohnson	fire them	21:22
	← manuelschneid3r left	21:22
	→ jstimm joined	21:23
	← treeman left	21:23
Primer	We've had this project called "major upgrade" on the books now for over 1 year. It's where I get to do all that: company-wide consensus-based code review, automated testing, aggressive pre-commit hooks for linting (I have this, but it's very informal), etc.	21:23
	→ kristofferR joined	21:23
	→ medeirosthiiago joined	21:23
cjohnson	it doesn't need to be anything major, like I said	21:23
Primer	Thing is, it's kind of become a running joke.	21:23
cjohnson	you don't need 100% coverage out of hte gate	21:23
	tribly_ → tribly	21:24
cjohnson	in the time you have spent in this channel you could have signed up for circle-ci and gotten your app deploying there :P	21:24
Primer	Well, it's called major upgrade for a different reason, which has to do with upgrading from stale APIs and libraries.	21:24
cjohnson	then spend a little time adding a testing suite	21:24
	yeah that's a different project	21:24
	→ rominronin joined	21:24
cjohnson	don't try to mix them into one	21:24
Primer	Historically I've had to "ear mark" such things here.	21:25
cjohnson	I'm saying that you yourself could get the bare tools needed to do these things up and running in the next day or two	21:25
	← Es0teric left	21:25
cjohnson	and obviously you've got time to sit on IRC (no offense)	21:25
	then write a couple tests for a few small things, make sure they work, teach others how to write tests, and then start enforcing it. it doesn't have to be this major thing that people make it out to be	21:26
Primer	It's like a bill (a feature request). That gets sent to committee (my boss), and I then "ear mark" what I can onto it. As long as I can make the thing I want land within the projected time frame, it's all good.	21:26
cjohnson	come back during your refactor and make sure you add time while refactoring to write tests for the refactored code	21:26
	yeah that's pretty standard	21:26
Primer	But I often have to deal with unrealistic dealines.	21:26
cjohnson	Ok so why are you blaming your devs and their editors then? lol	21:26
Primer	Part of my job is research. Spending time on IRC is time well spent.	21:27
	→ Snugglebash joined	21:27
	→ rahtgaz joined	21:27
cjohnson	Yeah I know, I agree. I was just saying, you aren't SO slammed that you don't have time to spend the next couple days setting up testing suites and CI	21:27
	so when people suggest it to you and you snort and act like it's an impossible goal, it's telling	21:27
Primer	It's obviously not an impossible goal. It's just that something like this, currently, has to be done out of band.	21:28
	→ cdown joined	21:29
cjohnson	right, and my point was, you could be using your IRC time as that out of band time	21:29
	to get it bootstrapped	21:29
Primer	I'm lucky in that my boss actually acknowledges when I do this.	21:29
	← rahtgaz left	21:30
Primer	I'm feeling more motivated after this discussion.	21:30
	→ courrier joined	21:30
	← a3Dman left	21:30
	→ cads2 joined	21:30
	← nexemacs left	21:31
Primer	Thank you cjohnson, osse, preaction, kent\n	21:31
	← alexggordon left	21:31
cjohnson	!!! good	21:31
	tests!	21:31
	do them	21:31
	or die	21:31
Primer	That will be my new motto!	21:31
	→ nexemacs joined	21:31
kent\n	a test that passes is a useless test.	21:31
	you want tests that fail.... then you fix them so they pass.	21:32
Primer	test aut mori motto nostrum est!	21:32
	→ anuxivm joined	21:33
Primer	kent\n: I excel at failing	21:33
	← medeirosthiiago left	21:33
	← Cavallari left	21:33
kent\n	Cogito ergo sum ego temptare	21:34
	← gopar left	21:34
kent\n	hm, not parity-safe :/	21:34
	→ gopar joined	21:35
	→ a3Dman joined	21:36
	← maryo left	21:36
	← nexemacs left	21:37
	← gigq left	21:37
	→ druonysus_ joined	21:37
	← maroloccio left	21:38
	← hobodave left	21:38
	→ gigq joined	21:39
	→ maroloccio joined	21:39
	← p4trix left	21:40
	← livingstn left	21:42
	← rivarun left	21:42
	← TheSimonator left	21:43
	← GT4066 left	21:44
	→ tnecniv joined	21:44
	← Cabanossi left	21:45
	← jstimm left	21:45
	→ Cabanossi joined	21:47
	← gopar left	21:48
	→ tymczenko joined	21:48
	→ portal_ joined	21:48
	→ gopar joined	21:48
	← kyan left	21:48
	→ Vaelatern joined	21:50
	← overlord_tm left	21:51
	← ozcanesen left	21:52
	→ overlord_tm joined	21:53
	← jagob left	21:54
	← thebope left	21:55
	← Dougie187 left	21:55
	← samlamamma left	21:57
	← Murii left	21:57
	← rominronin left	21:58
	→ nugb joined	21:58
	← holdsworth left	21:59
	← portal_ left	22:01
	← hahuang65 left	22:01
	→ gunnaro joined	22:02
	← truckcrash left	22:02
	→ zulutango joined	22:03
	← ok91 left	22:03
	← chardan left	22:04
	← elijah left	22:06
	← safe left	22:07
	← tyreld left	22:07
	← andrew9184 left	22:10
	→ andrew9184 joined	22:11
	← bannakaffalatta left	22:12
	→ bannakaf_ joined	22:12
	← dersand left	22:15
	← albel727 left	22:16
	← maroloccio left	22:18
	→ fahadash joined	22:20
	← diqidoq left	22:20
	← systemovich left	22:20
	→ NeXTSUN joined	22:21
	→ systemovich joined	22:21
	← overlord_tm left	22:24
	→ Darren_ joined	22:24
	← Snugglebash left	22:25
	→ albel727 joined	22:26
	← nugb left	22:26
	← moony22 left	22:27
	→ zivester joined	22:27
	← gopar left	22:28
	→ gopar joined	22:28
	← al-damiri left	22:28
	← Darren_ left	22:29
	→ pandeiro joined	22:30
	→ ChrisF79 joined	22:31
	← gopar left	22:31
	← chrysa left	22:32
	gitinfo set mode: +v	22:32
	gitinfo set mode: +v	22:32
ChrisF79	Hi everyone. I have some repos at bitbucket and just reformatted my machine. I copied my ~/Sites folder back to where it should be but I'm confused how I relink the two.	22:32
	→ gopar joined	22:32
	← cagomez left	22:33
	← DarkPsydeLord left	22:33
kadoban	ChrisF79: Hmm? What is in that folder, and why should it be linked to bitbucket? Is it a git repo? Git repos are just files, so if you successfully restored from backups, congratulations, you're all done really.	22:33
ChrisF79	It isn't working. Let me get the exact message.	22:34
	← darkbit left	22:34
	→ dendazen joined	22:34
ChrisF79	actually... it's on the server side	22:34
kadoban	Oh. You probably don't have your SSH keys/aliases set up correctly maybe.	22:35
ChrisF79	when I do git pull "git@bitbucket.org:cfarrugia/mybucket.git master" it lists every wordpress file (too many so I can't even see the top) and says at the bottom "Please move or remove them before you can merge. Aborting"	22:35
	I did have to add an SSH key	22:35
kadoban	That doesn't sound server-side	22:35
	← navidr left	22:36
	← LeBlaaanc left	22:36
ChrisF79	well, on my local machine I changed one file. I added everything and did a git push. It says my branch is up-to-date with 'origin/master'	22:37
	so then I go to the server to do git pull and that's what I get	22:37
kadoban	Oh, you're talking about some server you have?	22:37
ChrisF79	yes	22:37
kadoban	Wouldn't know what states your separate repos are in ... not really sure what to help with that. That pull command looks suspicuous, rarely is it a good idea to be specifying a URL like that really, and I ... don't see how that command could even work with the quotes around both the URL and the ref name like that	22:39
ChrisF79	I just quoted it	22:39
	but yeah, it is a weird one	22:39
	Just doing git pull shows this: There is no tracking information for the current branch.	22:39
kadoban	Well, how did you set up the "server" repo? Are you using this for deployment or something it sounds like? How does it usually work, what command do you usually run?	22:40
	Are you saying the quotes don't exist in the command you actually ran? Because that would make more sense.	22:41
ChrisF79	yes on the quoets	22:41
	→ bilal_ joined	22:41
ChrisF79	Normally what I do is develop locally and as I go, I just commit and do git push	22:41
	← bilal left	22:41
ChrisF79	so bitbucket has my files... then, I head onto the server and USUALLY just do git pull	22:41
	and suddenly that isn't working	22:41
kadoban	Which machine are you talking about that you reformated and restored?	22:42
ChrisF79	my local machine	22:42
kadoban	Then that wouldn't have changed how the "server" machine works, so that doesn't make a lot of sense :-/	22:42
ChrisF79	although, I had someone trying to help me and I'm thinking he may have removed my .git folder on the server	22:42
	that's all I can think of	22:42
kadoban	Did you run any other commands on the server machine?	22:42
	Oh	22:42
	Well, that sounds like a mess.	22:42
ChrisF79	heh, you're right about that!	22:43
	← Gustavo6046 left	22:43
kadoban	Can you ask them what they did I guess? But without doing that, I'm not sure what to suggest. I guess I'd start with looking at the server git repo, seeing what state the files are in, if it seems like it matches what's expected and the remotes are set up correctly and etc.	22:44
ChrisF79	The remote on bitbucket is great	22:44
Vampire0	ChrisF79, what does `git status` on the server say?	22:44
	→ bilal joined	22:44
	← bilal_ left	22:45
kadoban	That's good at least. And is the history on your current branch on the server look the same as is on bitbucket? And yeah, that too ^	22:45
ChrisF79	https://www.dropbox.com/s/metm26wu73in8lp/Screenshot%202017-04-20%2018.45.15.png?dl=0	22:45
kadoban	By the way, 'git pull' isn't exactly what I'd recommend for deployment	22:45
ChrisF79	kadoban, I'm here to learn. What do you recommend?	22:45
	← frobnic left	22:46
	← aielima left	22:46
kadoban	Not using git for deployment. I use 'rsync' usually. Typically I track a bash script with the correct rsync command and run that when I want to.	22:46
Vampire0	ChrisF79, there you have it, it tells you all you need to know	22:46
	← gunnaro left	22:46
Vampire0	ChrisF79, "On branch master ... Initial commit"	22:46
	← gopar left	22:46
	← alexandre9099 left	22:46
kadoban	But even if you want to use git, pull doesn't make a ton of sense because merging on the server is just a weird thing to want.	22:46
	Yeah, initial commit sounds weird	22:47
Vampire0	ChrisF79, so indeed someone nuked your history, probably by deleting .git and then doing `git init`	22:47
	→ gopar joined	22:47
Vampire0	ChrisF79, just re-clone the repo on the server and you are probably fine	22:47
ChrisF79	that's exactly what I think happened	22:48
Vampire0	ChrisF79, and regarding deployment with git, you might want to read !deploy	22:48
gitinfo	ChrisF79: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html	22:48
ChrisF79	ok, just googled it and I think I fixed it now that I understand the problem	22:48
kadoban	Make a backup of the files first, this kind of thing would usually have untracked files that a re-clone isn't going to have for you	22:48
	→ alexandre9099 joined	22:49
	→ Gustavo6046 joined	22:49
ChrisF79	yep, I'm working again!	22:49
	although wrongly according to what you guys have taught me	22:50
	but, at least I'm back to where I should be for now	22:50
	→ cagomez joined	22:50
ChrisF79	oh, one other question. I have /blog/wp-config.php on both servers. I added blog/wp-config.php to the .gitignore file but it still tries to sync	22:50
	← ZyX-I left	22:50
	→ frobnic joined	22:51
kadoban	ChrisF79: .gitignore and other similar mechanisms doesn't have any effect at all on already-tracked files.	22:51
	← dendazen left	22:51
kadoban	All it really does is make git not list them in 'git status' as untracked and prevents 'git add' from accidentally adding them, that's about it.	22:51
ChrisF79	got it	22:51
	thanks so much	22:51
kadoban	Anytime, glad you figured out your thing	22:51
	→ AfroThundr joined	22:53
	← AfroThundr left	22:53
	← Matt``` left	22:54
	→ rominronin joined	22:55
	→ holdsworth joined	22:56
	← Fallen0223 left	23:00
	→ hahuang65 joined	23:01
	← Achylles left	23:01
gitinfo	ChrisF79: This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them with "thank you", "thankyou", "thanks", "thx", "ty" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person.	23:01
	← AaronMT left	23:02
	← oleo left	23:07
	← cdown left	23:07
	← jnewt left	23:08
	→ monq joined	23:10
	← ambro718 left	23:10
	← bket left	23:14
	← crankslider left	23:16
	← nixjdm left	23:16
	← rorro left	23:17
	→ fakenerd_ joined	23:17
	← Tobbi left	23:17
	← bl0w3d_0ut left	23:19
	← robattila256 left	23:19
	→ ki0 joined	23:19
	→ robattila256 joined	23:19
	← fakenerd left	23:20
	← gnixev left	23:21
	→ gnixev joined	23:23
	→ snowkidind joined	23:24
	→ dirtyroshi joined	23:24
	← andrew9184 left	23:25
	→ alexggordon joined	23:27
	← fakenerd_ left	23:28
	→ oleo joined	23:28
	→ fakenerd joined	23:28
	→ bket joined	23:28
	← rominronin left	23:29
	← msonntag left	23:30
	→ msonntag joined	23:30
	→ bl0w3d_0ut joined	23:30
	→ Achylles joined	23:31
	→ gunnaro joined	23:31
	→ Noodlewitt joined	23:31
	← Cabanossi left	23:31
cagomez	I have already made changes in my branch. will applying a stash remove those changes?	23:32
	or will I end up with original changes + stash changes?	23:32
	→ menip joined	23:32
	→ Cabanossi joined	23:33
kadoban	The latter. If there are conflicts, you'll have to resolve them	23:33
	→ FrostCandy joined	23:34
	→ Gustavo6046_ joined	23:35
	← Gustavo6046_ left	23:36
	→ jaziz joined	23:37
	→ Noldorin joined	23:37
	← courrier left	23:38
	← Gustavo6046 left	23:39
	← ki0 left	23:42
	→ ki0 joined	23:43
	← weaksauce left	23:44
	← FrostCandy left	23:46
	→ maroloccio joined	23:46
	← gnixev left	23:46
	→ TbobbyZ_ joined	23:47
	← ChrisF79 left	23:47
	← ki0 left	23:48
	→ ki0 joined	23:48
	← Introoter left	23:48
	← TbobbyZ left	23:51
	← TbobbyZ_ left	23:52
	→ Kaisyu joined	23:54
	→ Gustavo6046 joined	23:54
	← kfoonamalik left	23:55
	→ rmesta joined	23:55
	← pandeiro left	23:56
	← anuxivm left	23:57
	→ shgysk8zer0 joined	23:59
	← ispn left	23:59

Logs Search ←Prev date Next date→

Channels Documentation