IRCloggy #git 2014-06-23

Provider of IRC logs since 2005.

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

	2014-06-23
	← Radivarig left	00:00
	← Goplat left	00:03
	← VinceZa left	00:04
	→ mizu_no_oto joined	00:06
	→ watabou joined	00:06
	← Reskp left	00:07
	← monty left	00:07
	→ fstd_ joined	00:08
	→ jeffreylevesque joined	00:08
	→ godgodgodgo joined	00:09
	→ Mitchbones joined	00:10
	→ marscher joined	00:10
	← watabou left	00:11
	→ rlazoti joined	00:11
	← fstd left	00:12
	fstd_ → fstd	00:12
	→ geomyidae_ joined	00:12
	← geomyidae_ left	00:13
	→ geomyidae_ joined	00:13
	← mizu_no_oto left	00:13
	← juvenal left	00:14
	← choffstein left	00:14
	→ unreal_ joined	00:15
	→ m0ltar joined	00:16
	← boombatower left	00:16
	→ Reskp joined	00:16
	← unreal left	00:17
	→ mizu_no_oto joined	00:18
	← aartist left	00:19
	→ MrJoshua joined	00:20
	← marscher left	00:21
	← morenoh150 left	00:23
	← MrJoshua left	00:23
	← MattMaker left	00:23
	→ kcj joined	00:24
	→ msm` joined	00:25
	→ toothr joined	00:26
	← rlazoti left	00:27
	← msm left	00:28
	← shinnya left	00:28
	→ dsdeiz joined	00:29
	← mizu_no_oto left	00:30
	→ Arkaniad\|Laptop joined	00:30
	→ Arkaniad joined	00:30
	← Arkaniad\|Laptop left	00:30
	→ jftf joined	00:31
	→ rlazoti joined	00:32
	← Reskp left	00:32
	→ Reskp joined	00:33
	← devoldmx left	00:33
	→ devoldmx3 joined	00:33
	← Reskp left	00:33
	→ tmcmahon joined	00:33
	→ mlimaloureiro joined	00:33
	← mlimaloureiro left	00:34
	← dauntl3ss left	00:34
	← dsdeiz left	00:34
	→ Reskp joined	00:35
	→ mizu_no_oto joined	00:35
	← jftf left	00:36
	→ devoldmx joined	00:36
	→ bezet joined	00:36
	→ a_le joined	00:37
	← leeN left	00:37
	← Reskp left	00:37
	← devoldmx3 left	00:38
	← mizu_no_oto left	00:39
	← Guest351O2 left	00:40
	→ phoric joined	00:40
	→ morenoh150 joined	00:40
	→ zivester joined	00:40
	← bezet left	00:40
	← sleepee left	00:41
	→ mizu_no_oto joined	00:42
	← m0viefreak left	00:42
	← kevinb left	00:43
	← ojacobson_ left	00:43
	→ ojacobson joined	00:44
	← morenoh150 left	00:45
	→ kevinold joined	00:46
	← rlazoti left	00:47
	→ kevinb joined	00:48
	← devoldmx left	00:51
	→ devoldmx joined	00:51
	← kevinold left	00:51
	→ moritzschaefer joined	00:52
	← harish left	00:53
	← kpreid left	00:54
	← moritzs left	00:56
	→ MrJoshua_ joined	00:56
	← tmcmahon left	00:57
buhman	when it was my intention to rebase a commit into a different branch, it looks like I ended up creating a new commit instead--after merge, I now have two commits that have the same message/blobs.	00:58
	→ hkon_ joined	00:58
buhman	how do I rewrite history so that the branch was properly based off of said commit so the merge doesn't look completely insane	00:59
	← MrJoshua_ left	00:59
	→ MrJoshua_ joined	00:59
	→ rlazoti joined	00:59
	← quazimodo left	01:00
	← godgodgodgo left	01:00
	→ northfurr_ joined	01:00
	← northfurr_ left	01:00
	→ victorhos_ joined	01:01
	← MrJoshua_ left	01:01
	← shruggar left	01:02
	→ Ankhers joined	01:02
milki	its often the case that you have multiple commits with the same commit message and tree	01:02
	← nkouevda left	01:02
	← kcj left	01:02
milki	buhman: can you !paste things to illustrate what you have and what you want it to be?	01:03
gitinfo	buhman: Please paste snippets longer than one line at a pastebin site, such as https://gist.github.com/ rather than in-channel.	01:03
	← hkon_ left	01:03
buhman	http://ix.io/d65 'plugin-interrupt-hook' should be retroactively rebased from 8d2bbeb, not e6330fb	01:04
	→ daito joined	01:06
milki	hm ok	01:07
	← hyperair left	01:07
	→ mcc_ joined	01:07
milki	so you'll need to make a new branch on f054fe2, !undo the last two commits, then rebase the new branch on 8d2bbeb before merging again	01:07
gitinfo	[!fixup] 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!	01:07
	← mcc_ left	01:08
buhman	hrm	01:08
	→ ehmatthes joined	01:08
milki	if the rebase doesnt realize that 8d2bbeb and c1c29f7 are the same, then the commits are slightly different	01:08
	you can find out using cherry i think	01:09
	→ gsingh93_ joined	01:09
	→ Nicholas_Rishel joined	01:09
milki	or git patch-id	01:09
	if the patch-id's are different for those two commits, they commits are different	01:10
	→ MattMaker joined	01:10
	← daito left	01:10
	→ tokik joined	01:11
	→ rjurney joined	01:13
	← Nicholas_Rishel left	01:13
	→ k_sze[work] joined	01:14
	← LucasTT left	01:14
	← warthog9 left	01:15
	← oojacoboo left	01:15
	→ weiyang joined	01:17
	← toothr left	01:17
	→ Vampire0_ joined	01:19
	→ FreezingCold joined	01:21
	→ robarelli joined	01:22
	← mueslo left	01:22
	← Vampire0 left	01:22
	← Arkaniad left	01:22
	← n-st left	01:24
	← robustus left	01:24
	→ wrouesnel joined	01:26
	→ robustus joined	01:26
	← Muchoz left	01:30
buhman	http://ix.io/d67 \o/	01:31
	milki: thanks :D	01:31
	→ jftf joined	01:32
	→ daito joined	01:33
	← zamabe left	01:34
	← jayrobot left	01:34
	→ oojacoboo joined	01:34
offby1	buhman: I think you're the first person I've run into who uses ix.io besides me	01:35
	→ z00t joined	01:35
	← jftf left	01:36
	← jon_r left	01:36
	→ dsdeiz joined	01:37
	← alkimome left	01:38
	← NaStYdoG left	01:38
	← rlazoti left	01:39
	→ Reskp joined	01:40
	← ender42 left	01:40
	← robarelli left	01:40
	← Mocramis left	01:41
	gitinfo set mode: +v	01:41
	z00t → NaStYdoG	01:42
	→ Mocramis joined	01:42
	→ harish_ joined	01:42
	← CheckDavid left	01:42
	→ Goplat joined	01:43
	Cathy → catherinejf	01:43
	catherinejf → cathyjf	01:43
	cathyjf → Cathy	01:43
	→ Guest351O2 joined	01:43
offby1	z00t suit! White jacket with side vents -- five inches long!	01:44
	← Reskp left	01:45
	← m0ltar left	01:45
	→ warthog9 joined	01:46
	→ jon_r joined	01:47
	→ kevinold joined	01:47
	→ hyperair joined	01:48
	← drjeats left	01:48
	← rjurney left	01:50
	→ therealGent joined	01:51
	← diegoviola left	01:51
	← Guest351O2 left	01:51
	← jrajav left	01:51
	→ luc_ joined	01:52
	← veebers left	01:52
	→ veebers joined	01:52
	← kevinold left	01:52
	← JeanCarloMachado left	01:54
	← theRealGentleman left	01:54
	→ JeanCarloMachado joined	01:54
	→ Nizumzen joined	01:56
	← jonmorehouse left	01:56
	→ orbisvicis joined	01:57
	→ rednaks joined	01:58
	← stealthii left	01:58
	→ balazs joined	01:58
	← cebor left	01:58
	→ stealthii joined	02:00
	← stealthii left	02:00
	→ stealthii joined	02:00
	← stealthii left	02:00
	→ stealthii joined	02:00
	← Sonderblade left	02:00
	← Mitchbones left	02:01
	← phix left	02:01
	← orbisvicis left	02:01
	→ silviof3 joined	02:01
	→ cebor joined	02:02
	→ phix joined	02:02
	← cnj left	02:02
	→ Sonderblade joined	02:02
milki	buhman: excellent	02:03
	→ cnj joined	02:04
	← silviof2 left	02:04
	← LemonyB left	02:04
	→ joelm joined	02:05
milki	says you need username and password?	02:05
	← rednaks left	02:05
	← mribeirodantas left	02:05
milki	and anonymous pastes are in the todo list	02:05
	← madewokherd left	02:06
	→ rednaks joined	02:06
	← stealthii left	02:07
	→ LemonyB joined	02:07
	→ Mitchbones joined	02:07
	← Derander left	02:07
	← _rgn left	02:08
	← rednaks left	02:08
	→ Derander joined	02:08
	→ _rgn joined	02:10
	→ doubled112 joined	02:11
	← Zamerick left	02:11
	→ gabeio- joined	02:12
	← gabeio left	02:12
	→ stealthii joined	02:12
	→ morenoh150 joined	02:13
	← mizu_no_oto left	02:14
	← FabTG left	02:14
	← bkero left	02:15
	→ FabTG joined	02:15
	→ mattstratton joined	02:16
	→ ninseiH joined	02:16
	← doubled112 left	02:17
	→ choffstein joined	02:17
	← stealthii left	02:17
	← morenoh150 left	02:18
	→ diegoviola joined	02:19
	→ stealthii joined	02:19
	← choffstein left	02:20
	← dilfridge left	02:20
	→ cads joined	02:21
	→ tjcravey joined	02:22
	→ dilfridge joined	02:22
	→ hgl joined	02:22
	← Noldorin left	02:24
	← ninseiH left	02:24
	→ sleepee joined	02:24
	→ tsuyoshi_ joined	02:25
	→ rjurney joined	02:27
	→ pheaver joined	02:28
	← WaReZ left	02:29
	→ victorhos__ joined	02:30
	→ CKyle joined	02:31
	→ LuxuryMode joined	02:31
	← geomyidae_ left	02:31
	← rjurney left	02:31
	→ echo-area joined	02:33
	→ jftf joined	02:33
	← victorhos_ left	02:33
	→ VelesTheGod joined	02:34
	→ toothr joined	02:35
	← hgl left	02:36
	→ dreiss joined	02:36
	← jftf left	02:38
	← tsuyoshi_ left	02:38
	→ morenoh150 joined	02:39
	→ mribeirodantas joined	02:41
	→ Reskp joined	02:41
	← il_ left	02:42
	→ il_ joined	02:42
	← Ankhers left	02:43
	→ kerrick joined	02:44
	→ sgambino joined	02:46
	→ Reflow joined	02:46
Reflow	would someone recommend a book for introduction to git	02:46
	i want to learn how git works and what is is useful for	02:46
	→ hgl joined	02:46
Reflow	also how is it used for big companies and stuff like that	02:46
	← Reskp left	02:46
krasnus	I guess http://git-scm.com/ helps a lot	02:47
	→ hkon_ joined	02:47
	→ kevinold joined	02:48
offby1	Reflow: perhaps things have changed, but up until not long ago few big companies used it. It's too new and big companies are afraid to try anything new.	02:48
	← Rich_52696368 left	02:48
	→ Textmode joined	02:48
HedgeMage	Meh, it depends on one's definition of "big"...that said, I think "big" doesn't neccessarily equate to "more effective" (more often the opposite), so I'd rather look at how effective dev teams use it than just teams that happen to be embedded in giant bureaucracies	02:49
Reflow	exactly yeah	02:50
	thanks a lot :)	02:50
HedgeMage	np	02:50
	I also think the docs at the gitolite site are pretty good	02:50
	"pro git" (the book) has a good rep but I've never read it	02:50
	I tend to pick things up on the fly.	02:50
	HedgeMage shrugs	02:51
krasnus	pro git (http://git-scm.com/book) is actually quite good, indeed	02:51
	and it's free	02:51
	so I guess there's that :)	02:51
ISmithers	I ordered that book actually, waiting for it to arrive. Will become some break-time reading I think.	02:51
	← echo-area left	02:51
	← hkon_ left	02:51
	← kevinold left	02:53
	→ Arkaniad joined	02:53
	← Nizumzen left	02:54
	→ devoldmx3 joined	02:54
	→ deanclkclk_ joined	02:54
	← deanclkclk left	02:57
	← devoldmx left	02:58
	→ juvenal joined	02:59
	← str left	03:00
	← sleepee left	03:00
	→ str joined	03:00
	← dreiss left	03:00
	← ORiON-- left	03:03
	→ gandalfcome joined	03:03
	→ ORiON-- joined	03:05
	→ echo-area joined	03:05
	← HelloShitty left	03:05
	→ mgolawala joined	03:05
	← mgolawala left	03:05
	→ mgolawala joined	03:06
	← echo-area left	03:07
	← Fandekasp left	03:07
	→ dreiss joined	03:08
	→ monty joined	03:08
	← cobakobodob left	03:09
	→ echo-area joined	03:09
	→ Ankhers joined	03:10
	← morenoh150 left	03:10
	← mgolawala left	03:11
	→ morenoh150 joined	03:12
	← MarionDaly left	03:13
	← CKyle left	03:13
	← gandalfcome left	03:14
	→ Nicholas_Rishel joined	03:14
	zz_anildigital → anildigital	03:15
	← il_ left	03:16
	← Guest10150 left	03:16
	→ lng joined	03:17
	→ Reskp joined	03:17
	lng → Guest92255	03:17
	→ nkouevda joined	03:17
	← Guest92255 left	03:18
	→ lng joined	03:19
lng	Hi! Is it okay to update feature branch with the latest commits? I'm asking because feature branch might have a commits of the other developers and it might look confusing on Pull Request review	03:19
	← danmackay left	03:19
	← Ankhers left	03:20
	anildigital → zz_anildigital	03:21
preaction	lng: most likely you want to rebase your feature branch onto whatever branch you want to be merged into	03:21
	← Reskp left	03:22
lng	preaction: can you show me the commands sequence please?	03:22
	preaction: let's say you are on feature branch	03:22
	and you completed the feature	03:22
	→ cilly joined	03:22
preaction	and you want to merge into master?	03:22
lng	yes	03:22
preaction	and your local master is up-to-date with the remote master?	03:22
lng	yea	03:22
preaction	then `git rebase master`	03:23
lng	from feature?	03:23
preaction	oh, and you didn't push your feature branch anywhere?	03:23
lng	nope	03:23
preaction	yes, from feature	03:23
	oh, you branched your feature branch from master?	03:23
lng	yea	03:24
	← diegoviola left	03:24
	→ boombatower joined	03:24
lng	is it updating feature? git rebase master	03:24
	→ danmackay joined	03:24
preaction	then yes. rebase means "take all my commits, then start with <master> and apply all my commits". so "rewind, update, and apply"	03:24
	← Reflow left	03:25
lng	so I'm rebasing my feature	03:25
	→ diegoviola joined	03:26
	offby1 is mortgaging his future	03:26
lng	preaction: should it bring others commits to it?	03:26
preaction	lng: whatever is in master will be like the start of your feature branch. it's as though your feature branch started at the current state of master	03:27
lng	preaction: what if master diverged, do I need to update my feature?	03:28
	→ rjurney joined	03:28
preaction	that is what you're doing	03:28
	→ jonmorehouse joined	03:28
	→ ErKa joined	03:29
lng	preaction: then, my feature will have a commits belonging to some other devs	03:29
preaction	it will have whatever commits were in master	03:29
lng	preaction: yes	03:29
preaction	and those commits come before any of your commits	03:29
lng	preaction: is it okay?	03:29
	→ crxz0193 joined	03:29
	← dreiss left	03:30
preaction	so when you make your pull request, they will see only the changes, your changes	03:30
	→ CKyle joined	03:30
lng	preaction: so when I merge it, those similar commits will not go back to matser?	03:30
preaction	they're already _in_ master, so no	03:30
lng	aha ok	03:30
thiago	they are not similar commmits. They are the same commits.	03:30
preaction	they're not similar, they're the exact same	03:30
lng	I see	03:30
	← morenoh150 left	03:31
	→ epifanio joined	03:31
lng	thanks a lot	03:31
	Rein Henrichs suggests to `git rebase origin/master` - http://reinh.com/blog/2009/03/02/a-git-workflow-for-agile-teams.html	03:32
preaction	but really, you could make a throwaway copy of your repository, and see the differences between `git rebase master` and `git merge master`	03:32
	lng: which is why i asked if your local master was up-to-date with the remote master	03:32
	← rjurney left	03:33
	→ jftf joined	03:34
	→ jstimm joined	03:34
	← otter768 left	03:34
	← jstimm left	03:35
	→ rjurney joined	03:35
	→ cobakobodob joined	03:36
	← boombatower left	03:37
	← a_le left	03:37
	→ a_le joined	03:38
	← jftf left	03:38
	← rjurney left	03:40
	← pheaver left	03:41
	← Mitchbones left	03:41
	← simesy left	03:42
	← a_le left	03:42
sitaram	offby1: a lot of big companies are using git actually. They just won	03:43
	oops	03:43
	't talk about it	03:43
	(the single quote key is too close to the enter key!)	03:44
offby1	weird	03:44
	can't understand why you'd keep secret the use of Open Source	03:44
SamB	so your bosses at MS don't report you?	03:45
	→ morenoh150 joined	03:45
offby1	actually MS, to my astonishment, is up front about supporting some open source	03:45
	dogs and cats living together	03:46
lng	preaction: but do I really need to rebase feature branch? what if it's simply merged to master?	03:47
	zz_anildigital → anildigital	03:47
	→ kevinold joined	03:48
	← toothr left	03:49
preaction	lng: rebasing tends to be polite, as it makes the history more linear and also makes the merge easier, as all potential conflicts have been worked out during rebase	03:49
	anildigital → zz_anildigital	03:50
offby1	hell, if you're rebased, then a merge will just be a fast-forward	03:50
preaction	exactly	03:51
	← sgambino left	03:51
	← VelesTheGod left	03:51
lng	preaction: ff is nice	03:52
	preaction: do you use rerere?	03:52
SamB	well, if you're posting a patch series for a busy project, it'll probably get rebased a bit more as a side effect of the format-email/review/am process ...	03:52
preaction	i've never used rerere	03:52
lng	ok	03:53
offby1	every time I see "rerere", I think of Aretha Franklin. Now, why is that?	03:53
	→ pheaver joined	03:53
	← kevinold left	03:54
	← LemonyB left	03:54
	← oojacoboo left	03:54
	← TDJACR_ left	03:56
	← zivester left	03:57
	→ TDJACR joined	03:58
	← LuxuryMode left	03:59
	← archdori left	03:59
	→ rchavik joined	04:00
	← pheaver left	04:00
	← Carlitos__ left	04:01
	← krasnus left	04:02
	→ sword joined	04:02
	→ dougsland joined	04:02
	← Nicholas_Rishel left	04:02
	← Dougie187 left	04:03
	→ pheaver joined	04:08
	← FreezingCold left	04:08
	← ErKa left	04:08
	← morenoh150 left	04:10
	→ LuxuryMode joined	04:12
	→ jftf joined	04:12
	← cilly left	04:12
	← the_cybersphinx left	04:13
	→ morenoh150 joined	04:13
	→ cilly joined	04:14
	→ bkero joined	04:16
	→ Reskp joined	04:17
	← LuxuryMode left	04:18
	← supernaut left	04:19
	← daito left	04:20
	← jftf left	04:20
	→ supernaut joined	04:21
	← Reskp left	04:22
	→ quazimodo joined	04:23
	→ Junior joined	04:25
	→ longbeach joined	04:27
	← dougsland left	04:27
	→ eletuchy joined	04:27
	→ mennea joined	04:27
	→ LoRdToLsToI joined	04:28
	← morenoh150 left	04:29
	→ morenoh150 joined	04:30
	← devoldmx3 left	04:35
	→ hkon_ joined	04:35
	→ Hecter joined	04:35
	← cilly left	04:37
	→ bezet joined	04:37
	← reaverb left	04:37
	→ reaverb joined	04:38
	← Tommy[D]_ left	04:38
	← hkon_ left	04:39
	← bezet left	04:41
	← JeanCarloMachado left	04:42
	→ irqq joined	04:42
	→ r0ok joined	04:43
	← mattstratton left	04:43
	→ beautifulmind joined	04:43
	← CKyle left	04:43
	← morenoh150 left	04:44
	← Gamecubic left	04:45
lng	I run into this issue for few times and it's really annoying when you deleted some functionality, but somehow it will appear in master again and again. Probably because it still exists in feature branches of other devs?	04:46
	← therealGent left	04:49
	← str left	04:49
	→ kevinold joined	04:49
	→ Tommy[D]_ joined	04:50
	← Junior left	04:51
ISmithers	But if they are merging, or whoever is merging, they will see that you have removed it and so they should not add it back in right?	04:52
	→ Fandekasp joined	04:52
lng	right, but somehow it's coming	04:53
	← yacks left	04:53
lng	so I need to remove it again and again	04:53
	← JerryT left	04:54
lng	so maybe they are adding it blindly?	04:54
	← kevinold left	04:54
	→ devoldmx joined	04:55
	→ devoldmx3 joined	04:56
	← devoldmx3 left	04:56
	→ devoldmx3 joined	04:56
	← devoldmx left	04:57
ISmithers	Could be, do a git blame and see where it came from.	04:58
	If people are working on remote branches perhaps they are not rebasing often? So they are forging ahead and building stuff on systems that are then deprecated/removed and so when it comes time to merge they are like, oh crap, I'll just throw that whole system back since I used/needed it. Which is terrible practice and they should be eliminated without prejudice.	04:59
	← cads left	04:59
	← mribeirodantas left	05:00
	→ tgkokk joined	05:02
lng	Are HEAD and HEAD~0 equivalent?	05:02
	← rchavik left	05:03
ISmithers	I'm going to go with 'yes' for $100?	05:03
	← Fandekasp left	05:04
	→ morenoh150 joined	05:04
	→ yacks joined	05:06
lng	ISmithers: $100 is too much	05:06
	← Megaf left	05:06
lng	or you want to pay me?	05:06
	← FabTG left	05:07
	→ SimonNa joined	05:07
	→ alexO joined	05:07
	→ FabTG joined	05:07
	← reaverb left	05:07
	→ Fandekasp joined	05:07
ISmithers	:p	05:07
	← morenoh150 left	05:09
	→ kcj joined	05:09
	← phoric left	05:09
	→ shingshang joined	05:09
lng	:)	05:11
	→ ersatzbeardr joined	05:12
	→ maveneagle joined	05:13
	← maveneagle left	05:13
	→ bartman`` joined	05:13
	← Fandekasp left	05:14
	→ maveneagle joined	05:14
ersatzbeardr	i'm not sure the right way to ask this, i have a directory on one machine that contains some files (within a git repo) and git doesn't seem to think anything needs to be commited after i git add it, on the other machine if i pull the directory turns up but no files inside it turn up	05:14
	← maveneagle left	05:14
ersatzbeardr	there is no .gitignore affecting it that i can tell	05:14
	moved it out then re added it and it seems fine, weird	05:16
	← megawac left	05:17
	→ sdrfnord1 joined	05:17
	→ Reskp joined	05:18
	→ lindenle joined	05:19
	→ rchavik joined	05:20
	→ morenoh150 joined	05:21
	→ Fandekasp joined	05:22
	→ daito joined	05:22
	← Reskp left	05:23
	← ferreum158 left	05:23
	← lindenle left	05:24
	← jonmorehouse left	05:24
	← causasui left	05:24
	← quazimodo left	05:28
	→ rollcake joined	05:28
	→ ajc_ joined	05:29
	← gsingh93_ left	05:29
	→ jonmorehouse joined	05:30
	→ diegovio1 joined	05:31
	← mennea left	05:31
	← Polymorphism left	05:31
	← diegoviola left	05:31
	← irqq left	05:34
	→ lite_ joined	05:35
	← sdrfnord1 left	05:36
	→ FilipNortic joined	05:37
	→ cilly joined	05:38
	→ jdmf joined	05:39
	→ watabou joined	05:40
	→ SittingShiva joined	05:41
	→ ThomasLocke joined	05:41
	← balazs left	05:43
	→ fairuz joined	05:43
	← fairuz left	05:45
	→ saurabh joined	05:46
	saurabh → Guest72467	05:47
	→ causasui joined	05:48
	→ HelloShitty joined	05:48
	→ charpent joined	05:49
	→ kevinold joined	05:50
	gitinfo set mode: +v	05:52
charpent	I have two problems with git 2.0.0 as packaged for Debian testing :	05:52
	→ rath joined	05:52
charpent	1) the .gitattributes file seems to not be used in all cases	05:53
	→ jnavila joined	05:54
	← Fandekasp left	05:54
charpent	2) Perusing the doc did not allow me to divine how to use different diff/merge tools for different file types (according to their extensions)	05:54
	← kevinold left	05:56
	← Goplat left	05:57
	← veebers left	05:59
	← MattMaker left	06:00
	→ MattMaker joined	06:00
	→ nnyk_ joined	06:05
	→ Kicer86 joined	06:06
	→ ciampix_ joined	06:06
	→ Macaveli joined	06:07
	→ nour_ joined	06:07
	→ stodan joined	06:08
	← HelloShitty left	06:08
	← daito left	06:08
	← rchavik left	06:09
	← Hecter left	06:09
	→ SimonNaa joined	06:09
	→ NoScope joined	06:09
	← Arkaniad left	06:09
	→ zumba_ad_ joined	06:10
	← zumba_addict left	06:10
	← pandeiro left	06:11
	← NoScope left	06:11
	← tgkokk left	06:11
	→ cbreak-work joined	06:12
	← kevinb left	06:12
	← SimonNa left	06:13
	← devoldmx3 left	06:13
	→ papegaaij joined	06:13
	← jnavila left	06:14
	← kcj left	06:14
	→ kevinb joined	06:15
	→ tgkokk joined	06:16
	← beautifulmind left	06:16
	← diegovio1 left	06:16
	→ Errorical joined	06:16
	→ jftf joined	06:17
	→ Junior joined	06:18
	→ devoldmx joined	06:18
	→ rchavik joined	06:18
	→ rob_w joined	06:19
	→ jerv joined	06:19
	→ Reskp joined	06:19
	→ daito joined	06:20
	← tgkokk left	06:21
	→ Arkaniad joined	06:21
	← longbeach left	06:21
	← jftf left	06:22
	→ tgkokk joined	06:22
	← Reskp left	06:24
	← nnyk_ left	06:25
	→ Gizburdt joined	06:25
	← jerv left	06:25
	← JanC left	06:27
	→ doev joined	06:27
	← doev left	06:27
	→ hoschi joined	06:27
	→ nnyk_ joined	06:28
	← philp_ left	06:28
	→ philp joined	06:28
milki	charpent: email the debian maintainer	06:30
	charpent: and not really sure what you are complaining about tahts specific for debian	06:30
	o.O	06:30
charpent	miki : thanks ! I have no other installation than Debian and cannot test other packaging. I wondered if this was a known 2.0-specific bug.	06:31
milki	neither sounds like a bug at all	06:32
ersatzbeardr	more like a policy disagreement	06:32
	→ pedda joined	06:33
	← deanclkclk_ left	06:33
	→ ferreum joined	06:34
	← pheaver left	06:34
	→ HelperW joined	06:34
charpent	miki : Hmmm... I tried something inspired from the book (7.2) to call an user-specified shell script, and never got "git diff" to call it. However, "git diftool" did (and worked as expected...).	06:34
	ersatzbeard : Wha do you mean ???	06:35
	→ roelmonnens joined	06:35
	→ ender42 joined	06:36
	→ hkon_ joined	06:36
	→ roelmonn_ joined	06:36
	→ HeN joined	06:36
	→ bezet joined	06:37
	← Sleepy63 left	06:37
	→ LeMike joined	06:38
	→ jceb_ joined	06:38
	→ Balliad joined	06:38
	→ jluc joined	06:38
	→ doev joined	06:38
	← roelmonnens left	06:40
charpent	miki, ersatzbeard : I just stumbled on the FAQ and discovered "alias", which, as far as I know, is never alluded to by "the book".	06:40
	← rollcake left	06:40
	← hkon_ left	06:40
	→ rollcake joined	06:41
	→ JanC joined	06:41
	← nkouevda left	06:41
	← bezet left	06:42
	← OIS left	06:43
	← rollcake left	06:43
	← tgkokk left	06:44
	→ mennea joined	06:44
	→ pantsman- joined	06:45
	← cxz left	06:45
	→ hkon_ joined	06:46
	← polyzen left	06:49
	→ Sleepy63 joined	06:50
	→ maveneag_ joined	06:51
	→ kevinold joined	06:51
	→ jargon joined	06:51
	← ThomasLocke left	06:52
	→ tgkokk joined	06:52
	→ ThomasLocke joined	06:52
	← devoldmx left	06:52
	← tpollard left	06:54
	→ Wiz_KeeD joined	06:55
	→ lavong joined	06:55
	← kevinold left	06:56
	→ smss1995 joined	06:56
	← MattMaker left	06:56
	→ vurma joined	06:57
	→ devoldmx joined	06:58
	← tgkokk left	07:00
	→ mishok13 joined	07:01
	← Gizburdt left	07:01
	→ cxz joined	07:03
	← victorhos__ left	07:03
	→ JohnBat26 joined	07:04
	→ tgkokk joined	07:05
	→ elbeardmorez joined	07:05
	← cxz left	07:05
	← Tuna-Fish left	07:05
	← nour_ left	07:05
	→ Tuna-Fish joined	07:05
	← thiago left	07:06
	Vampire0_ → Vampire0	07:07
	→ jnavila joined	07:07
	→ rjurney joined	07:09
	← pantsman- left	07:10
	→ krasnus joined	07:10
	← tgkokk left	07:11
	→ morenoh151 joined	07:11
	→ ojacobson_ joined	07:11
	→ dangerousdave joined	07:12
	→ Gizburdt joined	07:12
	← morenoh150 left	07:13
canton7	charpent, "the book" is an unofficial, community-lead project. if you have suggestions for improvements, open an issue on github, or submit a pull request	07:13
	← rjurney left	07:13
	← ciampix_ left	07:14
	← ojacobson left	07:15
	→ fabio_p joined	07:15
	← moritzschaefer left	07:16
	→ Hecter joined	07:17
	→ dreiss joined	07:17
	→ jftf joined	07:18
	→ TomyWork joined	07:19
	→ lindenle joined	07:21
	← tureba left	07:22
	← weiyang left	07:22
	← jftf left	07:23
	→ tureba joined	07:24
	← lindenle left	07:25
	→ dregad joined	07:25
	← Dreamer3 left	07:30
	→ jackneill joined	07:32
	→ mlechner joined	07:32
	← ScottG489 left	07:34
	← tureba left	07:34
	→ fr33domlover joined	07:36
	→ oodavid joined	07:36
	← fr33domlover left	07:39
	→ fr33domlover joined	07:39
	→ tureba joined	07:40
	→ xificurC joined	07:40
	← harish_ left	07:40
	← northfurr left	07:41
	→ Trudko joined	07:42
	← fr33domlover left	07:42
	→ fr33domlover joined	07:42
	← ojacobson_ left	07:44
	← causasui left	07:44
	→ causasui joined	07:45
	← gerty_ left	07:45
	→ gua_ould joined	07:45
	→ gerty_ joined	07:46
	→ alorence joined	07:46
lng	branch is listed as remotes/origin/SEARCH-1402_query_cache, but when I got: error: unable to delete 'SEARCH-1402_query_cache': remote ref does not exist	07:46
	← r0ok left	07:46
lng	why?	07:46
	→ numdig joined	07:46
lng	oops	07:46
	branch is listed as remotes/origin/SEARCH-1402_query_cache, but when I'm trying to `git push origin :SEARCH-1402_query_cache`, I got: error: unable to delete 'SEARCH-1402_query_cache': remote ref does not exist	07:47
	sorry	07:47
	← ISmithers left	07:47
dcpc007	hello	07:48
	is it possible to search if a specific word were in a versionned file one day ?	07:48
	r0bby → robbyoconnor	07:48
	← rchavik left	07:48
osse	lng: git ls-remote origin	07:49
	maybe it has a different name	07:49
tobiasvl	dcpc007: there's probably a better way to do it, but maybe you could use git bisect? just write a test that greps/acks for the word ;P	07:49
lng	osse: it returns hashes along with refs	07:49
dcpc007	ha ok, think about this but never used (near new to git and basic use)	07:50
lng	osse: git branch -r	07:50
	→ weiyang joined	07:51
	→ kevinold joined	07:52
	← Schadenfreud left	07:52
osse	lng: mhm, and what is the exact name of the ref you want to delete?	07:52
dcpc007	arf easy; git log -Sword myfile.sh ... pffff	07:52
osse	dcpc007: there's also git grep	07:53
lng	osse: there's another issue	07:53
dcpc007	ha ? will look :)	07:53
lng	the branch doesn't exist in remote anymore, but still listed	07:53
osse	lng: git fetch --prune origin	07:53
	→ adphillips joined	07:54
	← jonmorehouse left	07:54
lng	osse: oh nice	07:54
	→ kriks joined	07:55
lng	but usually, when I delete it in remote, it also disappears locally	07:55
osse	yes	07:55
lng	but not now	07:55
	why?	07:55
	← bgerber left	07:55
osse	maybe someone else deleted it	07:55
	← nnyk_ left	07:56
osse	or you deleted it from a different computer	07:56
lng	osse: ah yes, because of pull req	07:56
	osse: tnx	07:56
	← kevinold left	07:56
	← SimonNaa left	07:58
	← fabio_p left	07:58
	← shingshang left	07:59
	→ m0nkmaster joined	08:00
	→ thevishy joined	08:00
	→ ScottG489 joined	08:01
	← adphillips left	08:01
	→ jnavila_ joined	08:01
	→ sfranke joined	08:02
	→ Anticom joined	08:02
	← Guest72467 left	08:03
	← kriks left	08:04
	← m0nkmaster left	08:05
	→ rchavik joined	08:08
	→ ayaz joined	08:08
	→ CheckDavid joined	08:08
	→ ArSn joined	08:08
	→ moritzs joined	08:09
	→ Quincy joined	08:11
	gitinfo set mode: +v	08:11
Quincy	hi guys	08:11
gitinfo	Quincy: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	08:11
	← watabou left	08:11
Quincy	quick question, I want to rebase my local repo to the online repo, but my coworker changed directory names causing problems with rebasing	08:11
	How could I fix this ?	08:11
	← ersatzbeardr left	08:12
	→ nfk joined	08:12
	→ shruggar joined	08:12
	→ shingshang joined	08:12
	← zarubin left	08:13
	→ psoo joined	08:14
	→ h0bbit joined	08:14
	→ lb1a joined	08:16
	← moritzs left	08:17
	← ifdm_ left	08:17
	← jnavila_ left	08:17
	→ weevieL joined	08:17
	← tureba left	08:18
	→ moritzs joined	08:18
	→ francisfish joined	08:18
	→ jftf joined	08:19
	← francisfish left	08:19
	→ francisfish joined	08:20
	→ tureba joined	08:20
	← joelm left	08:20
	← nowhereman left	08:22
	→ nowhere_man_ joined	08:22
	← psoo left	08:23
	← moritzs left	08:23
	→ psoo joined	08:23
	← jftf left	08:23
	→ amcsi_work joined	08:24
Quincy	would it be just as easy as changing directory names? :D	08:24
	← dreiss left	08:25
Trudko	Hi guys some tool which could show me some interesting git statics? Something like number of lines commited by each develoepr	08:27
	→ moritzs joined	08:29
osse	Quincy: if you fix the first conflict manually maybe all the rest of them work fine	08:30
	→ ifdm_ joined	08:31
	→ kriks joined	08:33
	→ mikecmpbll joined	08:33
	← moritzs left	08:34
	← tureba left	08:34
	→ tureba joined	08:34
	→ moritzs joined	08:35
	→ skylite joined	08:36
	→ rgr joined	08:36
	← moritzs left	08:36
	→ moritzs joined	08:37
	→ fabio_p joined	08:37
	← moritzs left	08:37
	→ bezet joined	08:38
	→ moritzs joined	08:38
	← Quincy left	08:39
	← rchavik left	08:39
	→ saurabh joined	08:41
	saurabh → Guest41551	08:42
	← bezet left	08:42
	← moritzs left	08:43
	→ Lemony joined	08:43
	← tureba left	08:44
	→ kcj joined	08:44
	→ drupalgeek joined	08:45
	← hkon_ left	08:45
	→ bezet joined	08:45
	→ tureba joined	08:45
	→ W0rmDr1nk joined	08:46
	→ Transfusion joined	08:46
	← Hecter left	08:46
	→ shodan_ joined	08:47
	→ King_Hual joined	08:47
	→ adkins joined	08:47
	← Lemony left	08:47
	← thevishy left	08:47
	← rgr left	08:47
	gitinfo set mode: +v	08:47
	→ as_ joined	08:47
sfranke	Trudko: http://stackoverflow.com/questions/1265040/how-to-count-total-lines-changed-by-a-specific-author-in-a-git-repository	08:48
	second answer helps	08:48
	← shodan_ left	08:48
	→ bas_ joined	08:49
bas_	Hey, I want to set up a git server that uses ldap authentication with group checking. What would be the best way to do this? I've been thinking of just 'abusing' apache to do this but that seems like a messy way to do it.	08:49
	← Junior left	08:49
qsuscs	maybe !gitolite can deal with that	08:49
gitinfo	Gitolite is a tool to host git repos on a server. It features fine-grained access control, custom hooks, and can be installed without root. Download: https://github.com/sitaramc/gitolite Docs: http://gitolite.com/gitolite/	08:49
	← daito left	08:49
lb1a	yes gitolite has ldap support	08:50
	→ St_Marx joined	08:50
lb1a	http://gitolite.com/gitolite/auth.html#ldap	08:50
	← Gizburdt left	08:50
	→ rchavik joined	08:50
bas_	Thanks lb1a, I'd been looking at gitolite. The documentation seems to be all over the place though. I figured that it'd be smart to ask around first.	08:51
	I'll give it a go	08:51
	Does gitolite have support for group checking?	08:52
	← tureba left	08:52
bas_	so the git_sec_r group can only read and git git_sec_rw group can read+write	08:52
	→ kevinold joined	08:52
lb1a	bas_, there is #gitolite for special questions about the tool	08:52
bas_	Okay then, thanks	08:53
	→ hkon_ joined	08:56
	← silviof3 left	08:56
	→ silviof joined	08:56
	→ Hounddog joined	08:56
	← silviof left	08:57
	→ silviof joined	08:57
	← kevinold left	08:57
	→ tureba joined	08:59
	→ Kamal joined	09:00
	← Kamal left	09:00
	→ boris joined	09:03
	→ sinkensabe joined	09:03
	→ moritzs joined	09:04
	→ irqq joined	09:05
	→ amcsi_work_ joined	09:05
	→ cxz joined	09:06
	→ luc____ joined	09:06
	→ Zariel_ joined	09:09
	→ barrbrain joined	09:09
	← luc_ left	09:09
	→ Hecter joined	09:09
	← tureba left	09:09
	← amcsi_work left	09:09
	← barrbrain left	09:09
	→ tureba joined	09:10
	→ barrbrain joined	09:10
barrbrain	heya ~ just wondering if anyone here has ever generated diff3 formated conflicted merges with jgit	09:10
	→ dipendra joined	09:11
	← ifdm_ left	09:11
	→ dobalina joined	09:12
	→ Gizburdt joined	09:12
	← moritzs left	09:16
	→ moritzs joined	09:16
	→ jillesme joined	09:16
	← morenoh151 left	09:17
	← moritzs left	09:18
	→ daito joined	09:18
	→ newbie999 joined	09:19
	→ jftf joined	09:19
	← ScottG489 left	09:23
EdwardIII	hey, i tend to use git for deployment i have a project-hub repo, and then when i push to that it runs cd /actual/project/root && unset GIT_DIR && git pull hub master	09:23
	it works pretty fantastically for the most part, however i now have a project with a submodule and i'm not sure how to approach?	09:24
	i want to run a different branch of the submodule, a dev one rather than master	09:24
	← jftf left	09:24
	← dipendra left	09:25
EdwardIII	maybe for deployment i should just ignore the submodule thing and just have a nested git project?	09:25
	ooh git-scm.com is down: http://git-scm.com/book/en/Git-Tools-Submodules	09:25
	→ ifdm_ joined	09:26
xender	EdwardIII: Have you read !deploy?	09:27
gitinfo	EdwardIII: 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	09:27
EdwardIII	xender: no i haven't, thanks	09:28
xender	There are different approaches compared, maybe you'll find something.	09:28
	You're welcome ;)	09:28
	← Hecter left	09:28
xender	EdwardIII: Also submodules works by using a given commit (SHA) from submodule repo. Not a branch	09:30
EdwardIII	xender: i'm not sure i agree with the bit about git pull. as long as there are no comitted changes to live, git pull will always FF rather than merg eright?	09:30
	← Tuna-Fish left	09:30
	→ moritzs joined	09:30
xender	EdwardIII: But you're screwed in case of upstream rebase	09:31
	← moritzs left	09:31
xender	Not necessarily rebase, any force-push will make pull lang in non-ff merging land	09:31
	→ moritzs joined	09:31
EdwardIII	xender: that's true, but we generally we try to avoid force pushes	09:32
	git pull would automatically merge in that case, would it?	09:33
xender	EdwardIII: Ok, but I think that better be safe than sorry in this case	09:33
	Yes, and then no subsequent pull will be fast-forward	09:33
EdwardIII	i guess 4.2 is better	09:33
	git fetch then get reset --hard	09:33
	however what i like aobut the git pull method is that if any files have been changed locally it kicks up an issue and makes it super obvious user intervention is required	09:34
	now, that should never ever happen, but it's a handy extra failsafe (e.g. we keep some configs in git)	09:34
xender	EdwardIII: so you actually want to have interactive messages on deploy?	09:34
	→ Foldager joined	09:35
EdwardIII	xender: only if something unexpected happens	09:35
xender	Yes, but does your deploy system requires manual supervision?	09:35
	← weiyang left	09:35
xender	If not, how you'd detect that something gone wrong?	09:35
tobiasvl	and is this really an "unexpected" scenario?	09:36
bas_	Everybody in the gitolite channels seems to be asleep...	09:36
	← happytux left	09:36
EdwardIII	xender: well our deploymentds tend to be quite simple. we can do most of what we need with bash in the post-update script	09:36
bas_	I'll just do it the messy way then..	09:36
EdwardIII	xender: so when we deploy, we just 'git push' and read the output. if there are no problems then the deploy happens without intervention, job done, if it doens't the person can see that in the output, ssh to the server and investigate/resolve	09:37
	← smss1995 left	09:37
	→ smss1995 joined	09:38
EdwardIII	tobiasvl: mmm yes, the expectation here is that no git-tracked files in production are changed	09:38
	tobiasvl: so if one has changed, that's unexpected	09:38
tobiasvl	changed how? I realize that locally changed files is unexpected, but is it unexpected for someone to force-push a changed history?	09:38
	so unexpected that it affects the deployment	09:39
xender	EdwardIII: But doesn't having files with merge conflict on production means that a disaster could happen?	09:39
	You know, the >>>>> ===== \|\|\|\|\| <<<<< lines	09:39
EdwardIII	tobiasvl: what we're talking about is the other way around. i'm saying we pretty much never force a push here	09:39
	← hgl left	09:40
EdwardIII	xender: yes, it would be a problem if there was a merge conflict. in that rare condition, yes it would require someone git reset --hard and deploy again	09:40
	well they'd have to do more wouldn't they, they'd have to delete the deployment and checkout again	09:41
	so yes that would be a horrible yes	09:41
	← St_Marx left	09:41
EdwardIII	horrible yes/horrible mess	09:41
	→ nnyk_ joined	09:41
	→ thevishy joined	09:41
	→ Tuna-Fish joined	09:41
	→ mueslo joined	09:41
	← Gizburdt left	09:42
EdwardIII	ah the fight club method actually solves the different files issue: git diff --quiet \|\| exit 1	09:42
	looks like a perfect solution for me	09:42
	← tureba left	09:42
	→ tureba joined	09:42
	← kerrick left	09:42
EdwardIII	so that's all awesome, however it doens't help me out much with my submodule quandry heh	09:42
	→ hgl joined	09:42
	→ Novitsh_ joined	09:43
	→ Gizburdt joined	09:43
xender	EdwardIII: Wouldn't sumbodule update in deploy hook help?	09:44
	(I don't know submodules well, so I won't help much...)	09:44
	← mennea left	09:44
	→ dipendra joined	09:45
	← Baluse left	09:45
EdwardIII	xender: mmm it would, but i want it to track a specific project-hub dir on the server	09:45
	and it needs to update whenever that gets updated... i guess that's no problem, i can just do the submodule update in project-hub's post-update hook	09:45
	← molqr left	09:45
	← dangerousdave left	09:46
	→ dangerousdave joined	09:46
EdwardIII	however as this is just a quick dev deployment on ec2 i'll be blowing away in a couple of days, and the parent repo probably won't be updated, what's the impact of doing a quick and dirty hack and just nesting the sub repo, e.g. git clone ~/nested-project.hub ./existing-proj/nested-project	09:46
	→ mennea joined	09:47
	← Tuna-Fish left	09:47
	← tureba left	09:48
	→ tureba joined	09:50
	→ ScottG489 joined	09:50
	→ WaReZ joined	09:51
	← Streward left	09:52
tobiasvl	depends on your deployment routine I guess	09:52
	I git fetch on a central deployment server and then rsync to the production servers	09:52
	rsyncing allows for that	09:52
	but if the production servers have live repos you fetch into then that could get messy I guess	09:53
	→ kevinold joined	09:53
Trudko	sfranke: thanks for the tips, but I would like to have something more advanced with more optiosn and some grahps ideallz	09:53
EdwardIII	tobiasvl: yeah that's a config similar to that in the guide	09:53
	tobiasvl: well, on using rsync heh	09:54
	→ tgkokk joined	09:55
EdwardIII	hrm ok	09:56
	← teran left	09:56
	→ Baluse joined	09:57
EdwardIII	so it looks like at some point i cloned in a separate module, or added a submodule that the reference to has been removed: No submodule mapping found in .gitmodules for path 'web/ConstantContactApi'	09:57
	← hgl left	09:57
	← dangerousdave left	09:57
	→ dangerousdave joined	09:58
EdwardIII	web/ConstantContactApi has a .git dir. i don't care about keeping history for this dir, so i tried moving web/ConstantContactApi/.git out of there, but git submodule is still grumbling	09:58
	← kevinold left	09:58
sfranke	Trudko: maybe this helps? http://git-scm.com/downloads/guis	09:58
EdwardIII	but i did grep 'Constant' .git/ in the parent project, and the only reference to it is in the index. where's git storing this info?	09:58
	→ Tuna-Fish joined	09:58
EdwardIII	oh ok, so it does just store info about that in the index: 160000 8ee13a84d03604de5771709a18349f7370fa9911 0web/ConstantContactApi	10:00
sfranke	Trudko: But I'm just guessing here. To really help you we'd need more specific information on what exactly you are looking for.	10:00
Trudko	sfranke: stats from git repository	10:00
	→ happytux joined	10:00
	→ jerv joined	10:00
EdwardIII	perhaps i can just git rm web/Constant* i guess that should fix it, then put it back in	10:00
	→ nickd__ joined	10:01
	→ jcvfen joined	10:01
	← CheckDavid left	10:02
	→ jcvfen_ joined	10:02
	→ deniz1a joined	10:02
EdwardIII	hrm this is confusing: https://gist.github.com/EdwardIII/8c7500c35be7779557b0	10:03
	← maxb left	10:03
EdwardIII	i'm using rm -rf, then it tells me to use rm -rf heh	10:03
	← ferreum left	10:03
	← FabTG left	10:04
	→ ciampix joined	10:04
	→ goTAN joined	10:04
	→ [EddyF]_ joined	10:04
sitaram	bas_: http://gitolite.com/gitolite/auth.html#ldap is what gitolite can do. If you want an expanded example I can probably type one up and pastebin it, but the basic idea is you define rights in gitolite.conf based on group names, and you let gitolite determine what groups a user belongs to by asking LDAP	10:05
	bas_: gitolite does not inherently do anything about LDAP; you just write a script that does that. The script takes a username as arg-1, and prints a space-separated list of group names.	10:06
	← jcvfen left	10:06
	← echo-area left	10:06
	→ daedeloth joined	10:06
	← HelperW left	10:06
	→ vtunka joined	10:07
	→ morenoh151 joined	10:07
sitaram	bas_: gitolite documentation being "all over the place": I don't think that's true for basic install/setup etc., though exotic topics like LDAP will benefit from loading the "whole damn thing in one big page" URL at http://gitolite.com/gitolite/gitolite.html and Ctrl-F-ing that in your browser	10:08
	← Gizburdt left	10:08
	← tureba left	10:08
	→ tureba joined	10:08
bas_	thanks sitaram	10:10
	→ HelperW joined	10:10
	← gua_ould left	10:13
	→ marscher joined	10:13
	→ ferreum joined	10:16
	→ carandraug joined	10:16
	→ beautifulmind joined	10:17
	→ toomanysecrets joined	10:17
	→ stamina joined	10:17
	→ maxb joined	10:18
sitaram	bas_: one very unusual entry point for gitolite documentation is http://gitolite.com/gitolite/basic.html -- which is a graphical (meaning a graph, not a picture!) overview of the documentation. Also http://gitolite.com/gitolite/advanced.html	10:18
	→ joelm joined	10:18
	← tureba left	10:18
	← kriks left	10:19
	← hkon_ left	10:20
	→ jftf joined	10:20
sfranke	Trudko: what kind of stats are you looking for other than lines of code/per dev? what kind of graphs are you looking for? what do you want to achieve with that? here's another guess: http://www.ohloh.net/p/linux	10:21
	→ leeN joined	10:22
sfranke	imho most stats won't tell much... since lines of code contributed don'T tell you whether the code is of high quality	10:22
	→ pantsman- joined	10:22
	← joelm left	10:23
	→ martinklepsch joined	10:23
	→ gua_ould joined	10:25
	← jftf left	10:25
	→ tvw joined	10:26
	→ CheckDavid joined	10:26
	← nickd__ left	10:27
	→ listochkin joined	10:28
	→ barrbrain_ joined	10:29
	← listochkin left	10:29
osse	the only measure of whether code is bad is the GDP of the author's coutnry of residence	10:29
	higher GDP, better code	10:29
	→ listochkin joined	10:29
sfranke	lol	10:29
barrbrain_	wow	10:29
EdwardIII	hahaha	10:30
	← morenoh151 left	10:30
	← hoschi left	10:30
	← kyb3r_ left	10:31
	→ ja` joined	10:31
	→ Gizburdt joined	10:32
	gitinfo set mode: +v	10:32
	→ polyzen joined	10:37
	→ teran joined	10:37
ja`	hi guys. Is there a separate channel for gitweb or can I ask an gitweb related question here?	10:38
	→ groolot joined	10:38
	→ OliverJAsh joined	10:39
	← gua_ould left	10:39
osse	I'm unaware of such a channel and gitweb is part of Git so go ahead	10:42
	→ kriks joined	10:42
	→ Hecter joined	10:42
	← teran left	10:43
	→ hkon_ joined	10:45
	← JohnBat26 left	10:45
	← barrbrain_ left	10:45
	→ lucha joined	10:47
	→ Muchoz joined	10:48
ja`	ok. So, how is possible to hide tag markers from being displayed in getweb shortlog? I didn't such option in gitweb manpages. However, in one of our projects project on our local gerrits tag markers are missing in gitweb webpage. There are tags in this project because I can see them on my local repo and there in a fresh repository after cloning. Also, I can see tags when I replace `shortlog' with `tags' in gitweb link. I have run `git	10:50
	instaweb' on localhost and I can see tags markers correctly. There are only no tags in gitweb interface on our gerrit. What can be the reason?	10:50
	→ jottr_ joined	10:53
	← HelperW left	10:54
	→ kevinold joined	10:54
	→ HelperW joined	10:54
	→ bgerber joined	10:54
	← tokik left	10:55
	← tgkokk left	10:56
	← deniz1a left	10:57
	← kevinold left	10:58
	← nfk left	10:59
	→ gar_onn joined	10:59
	← kcj left	11:00
	→ mnagele joined	11:00
	← Tuna-Fish left	11:00
gar_onn	How do I ignore files that are not already in a repo? I've been looking at .gitignore for a while now, but I can't find a solution.	11:01
	← vtunka left	11:01
tobiasvl	gar_onn: you can't	11:01
	gar_onn: !ignore_tracked	11:01
gitinfo	gar_onn: Git only applies ignore patterns to untracked files. You can't use ignore patterns to ignore changes to files that are already tracked by git. To remove files only from git, but keeping them on disk, use git rm --cached <file>. Still, see https://gist.github.com/1423106 for ways people have worked around the problem.	11:01
	← jnavila left	11:02
	→ gua_ould joined	11:02
	← francisfish left	11:03
	← bartman`` left	11:04
gar_onn	Aaah the patern is only applied to untracked files. So if i ignore * my problem is fixed :) thanks tobiasvl	11:04
	→ teran joined	11:04
	→ teran_ joined	11:05
	→ echo-area joined	11:06
	← LeMike left	11:06
	← TomyWork left	11:07
	→ mcc_ joined	11:07
	→ LeMike joined	11:08
	→ TomyWork joined	11:08
	← Hecter left	11:09
	← teran left	11:09
	→ Tuna-Fish joined	11:11
	→ lindenle joined	11:12
	← HelperW left	11:13
	← gar_onn left	11:14
osse	ja`: are the tags somewhere else than in refs/tags perhaps?	11:14
	→ tgkokk joined	11:14
	← Gizburdt left	11:15
	← luc____ left	11:16
	← martinklepsch left	11:17
ja`	osse: there are tags in .git/refs/tags/	11:17
	← lindenle left	11:17
	→ Rich_52696368 joined	11:17
	← Rich_52696368 left	11:17
	→ Rich_52696368 joined	11:18
	← Rich_52696368 left	11:18
	→ javor joined	11:19
	→ joelm joined	11:19
javor	Hi. I'm trying to convert cvs to git repo but i dont know how to exclude some directories during convertion (i using cvs2git) any sugestions?	11:20
	← tgkokk left	11:20
	→ HelperW joined	11:21
	→ jftf joined	11:21
	← nnyk_ left	11:21
	→ oriba joined	11:21
	← k_sze[work] left	11:23
	→ martinklepsch joined	11:23
	← joelm left	11:23
	→ gain joined	11:25
	← jftf left	11:25
	→ zoso joined	11:26
	← zoso left	11:27
	→ zoso joined	11:27
	→ VinceZa joined	11:28
	→ SimonNa joined	11:28
	← polyzen left	11:30
	→ _mdk joined	11:30
	← dangerousdave left	11:30
	→ str joined	11:30
	→ dangerou_ joined	11:31
	→ DoniRS joined	11:32
	← LeMike left	11:33
	→ wingness joined	11:33
	→ LeMike joined	11:34
	→ St_Marx joined	11:34
	→ ghostlines joined	11:35
	→ hebz0rl joined	11:38
	→ nodiscc joined	11:39
	→ nnyk_ joined	11:39
	→ hoschi joined	11:42
	→ jnavila joined	11:43
	← ciampix left	11:43
	→ francisfish joined	11:44
	→ awkwardusername joined	11:45
	← jon_r left	11:45
	→ northfurr joined	11:45
	→ jmpp joined	11:46
	← jmpp_ left	11:46
	← groolot left	11:47
	← _mdk left	11:47
	→ intellix joined	11:48
	← bas_ left	11:48
	← dipendra left	11:48
	→ _mdk joined	11:48
	→ jon_r joined	11:48
	→ balazs joined	11:49
	← ChrisF- left	11:49
	← awkwardusername left	11:50
	→ barrbrain_ joined	11:51
	→ awkwardusername joined	11:51
	→ p4denis joined	11:52
	→ lsiv568 joined	11:52
	→ Megaf joined	11:52
	← robbyoconnor left	11:53
	→ polyzen joined	11:53
Vampire0	javor, you can exclude specific tags or branches, but afaik you cannot exclude specific paths	11:53
	← pantsman- left	11:53
	→ robbyoconnor joined	11:54
Vampire0	javawizard, but you can easily throw out the unwanted paths afterwards with man git filter-branch and the index-filter	11:54
gitinfo	javawizard: the git-filter-branch manpage is available at http://jk.gs/git-filter-branch.html	11:54
	← jerv left	11:54
Vampire0	javor, I meant, not javawizard	11:54
	→ kevinold joined	11:55
Vampire0	javor, but you can easily throw out the unwanted paths afterwards with man git filter-branch and the index-filter	11:55
gitinfo	javor: the git-filter-branch manpage is available at http://jk.gs/git-filter-branch.html	11:55
	→ matheus23 joined	11:56
	← mnagele left	11:56
	← TomyWork left	11:56
	← Guest41551 left	11:56
	← Textmode left	11:56
	← nnyk_ left	11:58
	→ Christer\| joined	11:58
	→ lsiv568_ joined	11:58
	← lsiv568 left	11:59
javor	ok	11:59
	→ TomyWork joined	11:59
javor	thx Vampire0, gitinfo	11:59
gitinfo	javor: you're welcome, but please note that I'm a bot. I'm not programmed to care.	11:59
javor	:P	11:59
Vampire0	yw :-)	11:59
	← kevinold left	12:00
	→ davividal joined	12:00
	→ Junior joined	12:01
Trudko	francisfish: yes th eohloh does looks googd and you are right that stats doesnt tell you that much and I certain wont use it as measurement. Its more for personal interest, for fun.	12:02
	→ MarionDaly joined	12:03
	→ freestyl3r joined	12:04
	← VinceZa left	12:05
	← daito left	12:05
	← barrbrain_ left	12:07
	→ linojon joined	12:08
	← amcsi_work_ left	12:09
	← alexO left	12:09
	→ LBV_User joined	12:09
	← _mdk left	12:09
	← Errorical left	12:09
	← cilly left	12:09
	→ Baluse2 joined	12:10
	→ amcsi_work joined	12:10
	← Zariel_ left	12:12
	← Entomo left	12:12
	→ rjurney joined	12:12
	→ frege joined	12:13
frege	hey guys	12:13
	I added files that I didn't mean to add	12:13
	haven't committed yet	12:13
osse	frege: git reset file	12:13
frege	how do I roll back for that?	12:13
	← Baluse left	12:13
frege	there are alot of files	12:13
Vampire0	frege man git reset	12:13
gitinfo	the git-reset manpage is available at http://jk.gs/git-reset.html	12:13
osse	pro top: git status tells you	12:13
	tip	12:13
	frege: a plain 'git reset' then	12:14
frege	got it	12:14
	→ jeremy_c_ joined	12:14
	← northfurr left	12:15
	→ tokik joined	12:16
	← rjurney left	12:17
	→ Zariel_ joined	12:17
	→ JeanCarloMachado joined	12:18
	zz_veatch → veatch	12:18
	→ dipendra joined	12:18
	→ nnyk_ joined	12:19
	veatch → zz_veatch	12:20
	← mtk left	12:21
	→ deanclkclk joined	12:21
	→ jftf joined	12:22
	← CheckDavid left	12:22
	→ kikimeter joined	12:23
	→ Muchoz_ joined	12:23
	← Muchoz left	12:23
	→ deanclkclk_ joined	12:25
	← jftf left	12:26
	→ tureba joined	12:26
	← linojon left	12:27
	← lamont left	12:27
	← devoldmx left	12:27
	→ devoldmx joined	12:27
	← dsdeiz left	12:28
	← jeffreylevesque left	12:28
	← crxz0193 left	12:28
	← nodiscc left	12:28
	← deanclkclk left	12:29
	→ choffstein joined	12:29
	← rchavik left	12:30
	→ HelperW_ joined	12:30
	← awkwardusername left	12:30
	→ lamont joined	12:30
	→ awkwardusername joined	12:30
	→ fstd_ joined	12:31
	← choffstein left	12:31
	Mapley → Mapley[AUS][NED]	12:31
	→ choffstein joined	12:32
	← as_ left	12:32
	← HelperW left	12:33
babilen	Hi there. We'd like to transition an old Python project from tabs to spaces, but fear that we would lose a lot of useful information in the process (e.g. it would render git blame completely pointless). Can you think of approaches to do this in a less intrusive manner?	12:33
sfranke	Trudko: glad I could be helpful, if you you are interested in that kind of projects google "git stats", you will find quite some projects. some names: gitstat, Git Statistics gitinspector and many more	12:34
	← fstd left	12:34
	fstd_ → fstd	12:34
sfranke	enjoy	12:34
Trudko	cool ty	12:35
osse	babilen: I think iẗ́'s easier to rip the band aid off. Get it over with.	12:35
	babilen: you can start blaming from any revision	12:35
sonOfRa	babilen: if you really want to keep your git blame-usefulness, you will have to write a very painful script to migrate it	12:35
	→ CheckDavid joined	12:35
osse	babilen: when I use git blame I end up using it a couple of times in a row digging throgu hhistory. this whitespace commit would just be another one	12:36
	→ dougsland joined	12:36
sonOfRa	and if you choose to do it this way, you will end up with a LOT of useless commits, so that's not what you want either, I assume	12:36
markmarkmark	git blame also has -w to ignore whitespace changes	12:36
	← Tuna-Fish left	12:37
	→ mizu_no_oto joined	12:38
	← HelperW_ left	12:39
	→ Gamecubic joined	12:39
	← WormDrink left	12:40
	→ HelperW_ joined	12:40
	← ajc_ left	12:40
	→ akim_ joined	12:41
	→ _mdk joined	12:41
osse	that would certainly make it easier	12:41
	→ the_cybersphinx joined	12:42
babilen	osse, sonOfRa: yeah, I know that it is not that horrible and if it were only up to me I would have gotten it over a long time ago, but it's simply the only argument that I can't dispell so far	12:42
	markmarkmark: Ah, that's great!	12:42
osse	babilen: even without -w it's not like coming across this commit in git-blame is a dead end or anything	12:43
markmarkmark	:)	12:43
babilen	Yeah, I totally agree ... I'm just a fervent advocate of this change and try to push it within the team and other people are arguing "but, but, but ... would anybody please think of the git blame?"	12:44
osse	now you can say "it's already been thought of"	12:44
babilen	yeah	12:44
	Now I only have to figure out if I can teach that to fugitive (or magit for our emacs-impaired people) :)	12:45
osse	haven't any of them run 'git blame foo.py' to find the commit abc123, discover that the commit in question only changed the code in some unrelated way, then proceeded to run 'git blame abc123~1 foo.py' ?	12:46
	babilen: I can't speak for magit but fugitive already knows how	12:46
	→ m0viefreak joined	12:46
bremner	that's one of the rare times I use git gui, following git-blame backwards	12:46
	← nnyk_ left	12:47
	akim_ → akim	12:48
	→ Tuna-Fish joined	12:48
	→ zarubin joined	12:48
	→ lbv-user joined	12:48
	← OliverJAsh left	12:48
	← bezet left	12:48
	← LBV_User left	12:48
	← lbv-user left	12:49
	→ k_sze[work] joined	12:49
	→ nnyk_ joined	12:49
	→ as_ joined	12:49
	→ devoldmx3 joined	12:49
osse	babilen: if you press ~ in the "blame buffer" when using figutive then it will rerun git blame starting from that commit (well, its parent)	12:49
	→ barrbrain_ joined	12:50
	← Tuna-Fish left	12:50
	← barrbrain_ left	12:51
	→ WormDrink joined	12:51
	→ Silex joined	12:52
	← WormDrink left	12:52
	→ WormDrink joined	12:52
	→ rlazoti joined	12:52
	← kriks left	12:52
	← devoldmx left	12:53
	← k_sze[work] left	12:53
babilen	osse: yeah, I know that one	12:54
	← toomanysecrets left	12:55
	→ kevinold joined	12:55
	→ Ankhers joined	12:56
	→ Diemuzi joined	12:56
	gitinfo set mode: +v	12:56
	→ jerius joined	12:56
	→ totte joined	12:57
	→ VinceZa joined	12:57
	← Muchoz_ left	12:57
	← rlazoti left	12:57
	← leeN left	12:57
	→ mmitchell joined	12:57
	← weevieL left	12:57
	→ Muchoz joined	12:58
	← lavong left	12:58
	→ rlazoti joined	12:59
	← kevinold left	13:00
	→ Tuna-Fish joined	13:01
	→ thierryp joined	13:02
	← thierryp left	13:02
	→ thierryp joined	13:02
	→ sgambino joined	13:03
	→ Reflow joined	13:03
	→ FortySix2 joined	13:03
	→ luc_ joined	13:04
	← mizu_no_oto left	13:04
frege	can I create a new repo from a branch?	13:04
	carrying all the commits to the new repo?	13:04
	← jerius left	13:04
	→ northfurr joined	13:04
osse	frege: sounds like all you need is a clone	13:05
frege	very cool!	13:05
	← jeremy_c_ left	13:05
	← tokik left	13:05
	← dobalina left	13:07
	← _mdk left	13:08
	→ doubled112 joined	13:08
ws2k3	hello, is it possible to push a bare repo to a remote server ?	13:08
	← frege left	13:08
ws2k3	currently we login onto the remote server and do git pull but i wanne replace that with logging in onto the dev server and do git push	13:09
tobiasvl	ws2k3: you first create the bare repo/clone on the server, and then you can push to it normally	13:09
ws2k3	we already have a bare on the dev server	13:09
	← cobakobodob left	13:09
jast	then you can push, yes	13:09
ws2k3	and we all developers are currently pushing to that bare	13:10
tobiasvl	ws2k3: http://stackoverflow.com/questions/2199897/how-to-convert-a-git-repository-from-normal-to-bare	13:10
	to convert the production repo to a bare repo	13:10
ws2k3	oure which one is the production repo in my situation?	13:10
	→ CKyle joined	13:10
tobiasvl	"the live repo on the remote server" I guess?	13:10
jast	I believe the repo in question is a bare one already	13:10
tobiasvl	was just guessing that was production	13:10
	oh	13:10
	→ Guest351O2 joined	13:11
ws2k3	we have 4 develoepr that work on a dev server on the dev server there is a bare repo they commit evrything to that bare repo	13:11
	then they login onto the remote server server( oure production server) and do a git pull from that bare on the dev	13:11
jast	so the repo on the production server is non-bare?	13:11
ws2k3	yes	13:11
tobiasvl	how does that work	13:12
	→ pantsman- joined	13:12
tobiasvl	doesn't the production environment need the actual files?	13:12
jast	okay, that brings us to a deployment scenario... see !deploy	13:12
gitinfo	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	13:12
	→ dgsrgs37063 joined	13:12
	→ Mitchbones joined	13:12
jast	the pushing itself is basically just 'git push repourl --all' or something like that	13:12
	→ Gizburdt joined	13:12
ws2k3	the production server does need all the files	13:13
	but i'm pretty sure that the way how they work now	13:13
	→ bartman`` joined	13:13
	← luc_ left	13:14
	← nnyk_ left	13:14
	→ achadwick joined	13:15
	← RandomGuy5432 left	13:15
	→ qwyeth joined	13:15
	→ zivester joined	13:16
	← alorence left	13:16
	→ paul424 joined	13:17
paul424	hello , why this ain't working	13:17
	→ _mdk joined	13:18
	→ alorence joined	13:18
jast	why ain't what working	13:18
jpentland	Ok if I know a line of code was added in a specific patch, but at some point was removed, how can I find out which patch removed it?	13:18
jast	jpentland: git log -S<string>	13:19
	→ devoldmx joined	13:20
	→ joelm joined	13:20
	← qwyeth left	13:21
jpentland	jast, that doesn't really seem to return anything, not even the original patch that created that line	13:21
	→ qwyeth joined	13:21
jpentland	ah unless i don't specify a path	13:21
	← Trudko left	13:22
	→ jftf joined	13:22
	← doubled112 left	13:23
	→ bezet joined	13:23
	← martinklepsch left	13:23
	→ amitprakash joined	13:23
	← devoldmx3 left	13:23
	→ Fang0716 joined	13:23
	← northfurr left	13:24
jpentland	but now it only seems to show the original patch	13:24
	→ mnagele joined	13:24
	→ Trudko joined	13:24
paul424	git diff HEAD-1 HEAD-2 , jast why ?	13:24
	→ Quincy joined	13:25
	→ vtunka joined	13:25
	← lite_ left	13:25
	← TomyWork left	13:25
	gitinfo set mode: +v	13:25
	gitinfo set mode: +v	13:25
	← CKyle left	13:25
	← joelm left	13:25
osse	paul424: use ~, not -	13:25
Quincy	Hey guys	13:25
	← Fang0716 left	13:25
	← DoniRS left	13:26
	← maveneag_ left	13:26
	← choffstein left	13:26
	← raptelan left	13:26
Quincy	I've got a question, I have got my own branch quincy/workingdir on my own repo on which I have been working. I want to update my own branch from another repo (Online/master) whithout losing my changes	13:26
	gitinfo set mode: +v	13:26
	gitinfo set mode: +v	13:26
Owner	Hey ladies	13:27
	→ martinklepsch joined	13:27
	← jftf left	13:27
	← Owner left	13:27
Quincy	How would I do this?	13:27
	→ TomyWork joined	13:27
tobiasvl	Quincy: sounds like you want to !rebase	13:28
gitinfo	Quincy: 'git rebase' takes away your local commits, updates your branch with new stuff from <upstream> (argument), then re-applies your local commits on top. This makes it look like your commits were created "after" the new stuff, and it can look cleaner than doing a !merge. Beware of !rewriting_public_history, though. Not to be confused with !interactive_rebase.	13:28
osse	Quincy: either merge that branch into yours, or rebase your branch on top of that branch	13:28
	→ TimmyTones joined	13:28
	← kermit left	13:28
	→ yosito joined	13:28
Quincy	When I do that, I get errors XD	13:29
	→ kermit joined	13:29
Quincy	CONFLICT (modify/delete): frontend/index.js deleted in Baibai old folders, hello new folders and modified in HEAD. Version HEAD of frontend/index.js left in tree.	13:29
tobiasvl	then you need to solve your conflict	13:29
osse	!conflict	13:29
gitinfo	[!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, don't panic. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II	13:29
	← pantsman- left	13:29
Quincy	I deleted that file, that's correct but it keeps putting them back :/	13:29
osse	Quincy: git rm; git commit	13:30
Quincy	oh	13:30
	→ mewm joined	13:30
	→ nnyk_ joined	13:31
	← TheMadMechanic left	13:31
	→ shinnya joined	13:32
	← oriba left	13:32
	← devoldmx left	13:32
	← JeanCarloMachado left	13:32
	→ TheMadMechanic joined	13:33
	→ JeanCarloMachado joined	13:33
	→ AaronMT joined	13:34
ws2k3	on my dev server i changed the config and did a git push master but it given me an error http://pastebin.com/j1m8krN6	13:35
	when i do a git pull on my production server from the dev it seems to work fine	13:36
tobiasvl	you tried to push to where? you mean you did a "git push master" on dev, to prod?	13:36
sfranke	have a nice one everyone!	13:36
	← sfranke left	13:36
ws2k3	yes	13:36
ToxicFrog	ws2k3: did you actually read the error message? It explains quite clearly what's happening and why.	13:36
	→ jaspertheghost joined	13:36
	→ cobakobodob joined	13:37
	← deanclkclk_ left	13:37
ws2k3	yes i noticed but why i do a pull on the production server from my dev server works fine	13:37
	but when i do a push on the dev server to prod that doesnt work	13:37
osse	those aren't symmetric	13:37
	if pull works then it's not a bare repo, and then push won't work	13:38
	← FortySix2 left	13:38
	→ mizu_no_oto joined	13:38
	→ RecoJohnson joined	13:39
	→ plains joined	13:41
ws2k3	then how should i push it ?	13:41
	→ DoniRS joined	13:41
ws2k3	i just wanne push the code to the production server	13:41
	← ascarter left	13:41
	→ Dougie187 joined	13:41
	→ FortySix2 joined	13:42
ToxicFrog	ws2k3: !deploy	13:42
gitinfo	ws2k3: 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	13:42
ToxicFrog	ws2k3: also, read the error message, it tells you why this is not allowed by default, how to enable it, and what the pitfalls are when you do	13:42
	→ knownasilya joined	13:43
	← mizu_no_oto left	13:43
	← amitprakash left	13:44
	← dangerou_ left	13:45
ws2k3	what i only dont understand is i'm pretty sure this is a bare repo	13:45
	but they realy do a git pull from the bare repo and then its up to date	13:45
	→ dangerousdave joined	13:45
	← beautifulmind left	13:45
	→ ascarter joined	13:46
	← Hounddog left	13:46
	← ender42 left	13:46
	→ ingu_cloud_ joined	13:47
ws2k3	didnt know is that that hard simple send some code from a to b...	13:47
Quincy	I'm still not able to make any sense out of rebasing, I'm very confused right now :x	13:48
	← TheMadMechanic left	13:49
	→ jeffreylevesque joined	13:49
tobiasvl	Quincy: man git rebase	13:49
gitinfo	Quincy: the git-rebase manpage is available at http://jk.gs/git-rebase.html	13:49
tobiasvl	Quincy: or ask specific questions ;)	13:49
	_mdk → _mdk_off	13:50
	→ m0ltar joined	13:50
	← drupalgeek left	13:50
	_mdk_off → _mdk	13:52
	← jluc left	13:52
	→ Chrille joined	13:52
	→ TheMadMechanic joined	13:52
	gitinfo set mode: +v	13:53
Chrille	Hi, I removed file a.txt and added file b.txt, git status says it's a "rename", but it's not. Can I force it to handle it as two seperate add/remove actions?	13:53
smss1995	commit -a	13:53
	→ thevishy_home joined	13:54
osse	Chrille: it doesn't matter.	13:54
m0viefreak	Chrille: there is no such thing as a rename internally	13:54
Chrille	So my history will not display a "rename" ?	13:54
jast	depends	13:54
	with -M ('detect renames') it might, otherwise it won't	13:54
	→ yano joined	13:54
	→ dsdeiz joined	13:54
ws2k3	i have read the document a couple of times	13:55
	→ infernix joined	13:55
	→ fatalhalt joined	13:55
ws2k3	but i still dont understand why i can do a pull but i cannot do a push from the dev	13:55
	→ Guest35122 joined	13:55
jast	!bare	13:56
gitinfo	an explanation of bare and non-bare repositories (and why pushing to a non-bare one causes problems) can be found here: http://bare-vs-nonbare.gitrecipes.de/	13:56
Chrille	jast: -M for what command?	13:56
jast	git log	13:56
	→ kevinold joined	13:56
	→ mizu_no_oto joined	13:56
	← Guest351O2 left	13:56
ws2k3	jast then why i can do a pull from a production server from a bare and that works fine	13:56
	← Ankhers left	13:57
	← asakura1 left	13:57
jast	ws2k3: pull to a non-bare is fine. push to a non-bare is not.	13:57
	→ VaticanCameos joined	13:57
jast	the other side of the transaction doesn't matter	13:57
VaticanCameos	How does one roll back to the previous commit? I see git revert and git reset HEAD, what is the difference?	13:57
	← thevishy left	13:57
	→ shawndumas joined	13:57
osse	!revert	13:57
gitinfo	That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?	13:57
VaticanCameos	osse: I should probably go with c) then	13:58
	→ asakura1 joined	13:58
VaticanCameos	Since I want to undo this merge I did just now	13:58
jast	VaticanCameos: most relevantly, 'git reset HEAD' does nothing to your history :)	13:58
VaticanCameos	I haven't pushed it yet	13:58
	jast: I see..	13:58
jast	okay, but --soft may or may not be the right option	13:58
	what it means is: change my history but leave my index and working files untouched	13:59
	i.e. this will remove the merge commit but leave all the files as they were after you merged	13:59
	→ mtk joined	13:59
VaticanCameos	jast: I should do --hard then, I don't want it to leave the working files untouched. I want it to remove the files that came in with the merge of course.	13:59
jast	right	13:59
VaticanCameos	It should completely undo the changes. So --hard then.	13:59
	→ derdon_ joined	13:59
jast	as long as you don't mind losing uncommitted changes	13:59
	← TheMadMechanic left	13:59
	← JeanCarloMachado left	14:00
VaticanCameos	jast: I made sure to commit some changes I'd made earlier before I did the git merge.	14:00
	there are no uncommitted changes as of now I think	14:00
jast	right. can't hurt to do a 'git status' before using 'reset --hard', in any case.	14:00
	_mdk → _mdk_off	14:01
	← kevinold left	14:01
	→ kevinold_ joined	14:01
VaticanCameos	The merge has caused me to go ahead of the remote branch by 263 commits.	14:01
	No uncommitted changes though	14:01
	gitinfo set mode: +v	14:02
	derdon_ → derdon	14:02
jast	that's a lot of commits :)	14:02
	← Guest35122 left	14:02
	← Christer\| left	14:03
VaticanCameos	jast: None of which I want to spoil the remote with.	14:03
	← mizu_no_oto left	14:03
derdon	hello. I need some help with the stash command. If I use "git stash show", I get back the info which files have changed and how many insertions/deletions have been made in this stash. But how do I get the info what actually has been changed, i.e. how do I get the corresponding diff?	14:04
	← francisfish left	14:04
	→ svector joined	14:04
	← ifdm_ left	14:05
	→ akim_ joined	14:05
	→ Guest351O2 joined	14:05
tobiasvl	derdon: git stash show -p	14:05
	shows patch	14:05
derdon	tobiasvl: thanks! that's exactly what I was searching for!	14:06
	→ jftf joined	14:06
	← akim left	14:07
	→ JeanCarloMachado joined	14:07
	_mdk_off → _mdk	14:07
	→ deciph3r joined	14:07
	← deciph3r left	14:07
	→ deciph3r joined	14:07
jaspertheghost	paths in .gitignore are they relative or absolute and how do i specify	14:07
tobiasvl	jaspertheghost: put a / in front to make it an absolute path (to the repo root)	14:08
	that is, it makes it absolute to the location of the .gitignore file. no leading / matches the line against any location in the repo	14:09
thegorn	tobiasvl: that is not really true	14:09
	oh, ok, nm, you fixed it	14:09
	:)	14:09
tobiasvl	hehe	14:09
jaspertheghost	thnks	14:09
	← __class__ left	14:10
Quincy	so lets say I want to rebase foo1/bar2 to foo2/bar1, I would do rebase bar1?	14:10
	← lsiv568_ left	14:10
Quincy	git rebase bar1?	14:10
	← mnagele left	14:10
	← rlazoti left	14:10
jast	not sure what you want to achieve	14:10
	→ ojacobson joined	14:11
	← ThomasLocke left	14:12
	← Guest351O2 left	14:13
	→ Guest351O2 joined	14:13
	← zivester left	14:14
	→ Kamaljeet joined	14:14
	→ JerryT joined	14:14
	→ tyler1212 joined	14:14
	→ rjurney joined	14:14
	← JerryT left	14:14
	← Kamaljeet left	14:15
Quincy	okay so we have branch master on main (main/master), I'm working in workingdir on quincy (quincy/workingdir), The branch master is up to date with the latest code, but I'm working in workingdir. I want to update workingdir without losing my changes but I cannot seem to figure out (even after reading the man page) how rebase works exactly	14:15
	→ JerryT joined	14:15
	→ mizu_no_oto joined	14:15
	← paul424 left	14:16
	→ Foldager_ joined	14:16
	→ choffstein joined	14:16
	→ oojacoboo joined	14:16
ws2k3	a git bare repository does not contain any source code files rights ?	14:17
osse	right	14:17
ws2k3	is it possible we are able to pull from the bare repository cause it knows all the changes maby ?	14:18
	so it can apply those changes to the files on the production server	14:18
	→ bambams_ joined	14:18
xender	Of sourse it's possible	14:18
osse	Quincy: is quincy a repo? a remote?	14:18
xender	Also !deploy	14:18
gitinfo	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	14:18
	→ dobalina joined	14:19
	← rjurney left	14:19
ws2k3	have read that document about 3 times now, but i still dont get it, currently we do a pull on oure production server from oure dev server but i would like to do a push on the dev server to prod server instead of a pull	14:19
	← tyler1212 left	14:20
	← strictlyb left	14:20
	← Foldager left	14:20
	→ __class__ joined	14:20
ToxicFrog	ws2k3: so, which part of this is unclear?	14:20
Quincy	I'm guessing quincy is the repo and workingdir is the remote ? I'm not even sure	14:20
ToxicFrog	Why it's not allowed by default?	14:20
	How to enable it?	14:20
	→ strictlyb joined	14:20
osse	ws2k3: are you sure you do a pull and not a fetch ?	14:20
ws2k3	yes i am sure we do a pull	14:20
osse	Quincy: what is main, then? :S It's hard to help without knowing this. What do you have on your local computer and what is "out there" ?	14:21
ws2k3	i just run git pull on oure production server and then its the code on the dev is live	14:21
	→ joelm joined	14:21
ToxicFrog	ws2k3: yes, BECAUSE YOU ARE DOING A PULL, NOT A PUSH, and thus it assumes you are ok with the contents of the working directory being changed!	14:22
	When you push to a non-bare repo IT CANNOT ASSUME THAT	14:22
moritz	!bare	14:22
gitinfo	an explanation of bare and non-bare repositories (and why pushing to a non-bare one causes problems) can be found here: http://bare-vs-nonbare.gitrecipes.de/	14:22
tobiasvl	I think Quincy (thinks that (s)he) has turned the production repo into a bare repo?	14:22
ws2k3	no its not like that, in the current setup we Pull From a bare	14:22
tobiasvl	mentioned something like that	14:22
	sorry	14:22
	s/Quincy/ws2k3	14:23
jast	ws2k3: the reason you can't push to the prod server isn't that the dev repo is bare. it's that the prod server is non-bare. pushing to non-bare repos does update the history, but it does not update the associated working tree. since that is confusing, by default push is disabled completely to the checked out branch in a bare repo.	14:23
	← papegaaij left	14:23
jast	*in a non-bare repo, sorry	14:23
ToxicFrog	ws2k3: the fact that you are getting the error you are means that either (a) the repo you are pushing to is not the same one you are pulling from or (b) the repo is not bare.	14:23
ws2k3	ah okay	14:23
jast	and the deploy page explains how you might work around that	14:24
ToxicFrog	ws2k3: and if you don't believe me, check the output of 'git config --local --get core.bare' in that repo.	14:24
	→ rajul joined	14:24
	← zoso left	14:24
	← rajul left	14:24
	← Macaveli left	14:24
	← javor left	14:25
Quincy	On my local computer I have my working directory which is the directory I work in, this has its own gitlab project and only I use this, my colleagues have this same setup. We have our own gitlab server with the project 'main' that every once in a while gets merged with our independent projects	14:25
	← joelm left	14:26
Quincy	Wait, now I am confusing myself XD	14:26
	→ akim joined	14:26
	→ ifdm_ joined	14:27
Quincy	lets start over: We have a gitlab server with our main project. in order to not f things up I have my own project in which I work in.	14:27
	→ chiromante joined	14:27
	← akim_ left	14:27
	→ treehug88 joined	14:27
	← gargola left	14:28
ToxicFrog	Quincy: What is a "project" here?	14:28
	→ GT joined	14:28
Quincy	I'm guessing a repo	14:28
	← skul left	14:29
tobiasvl	but is it a clone of the "main" repo?	14:29
	→ skul joined	14:29
Quincy	it is a fork	14:29
	i forked it from the main repo	14:30
	zz_jrhorn424 → jrhorn424	14:31
Quincy	lets just say i want to update my working directory from our main repo and not lose the work I have done XD I don't know if this makes it a bit clearer (in case you didn't notice, I'm fairly new to GIT ;p)	14:31
	Megaf → Megaf_	14:32
ws2k3	i think i should review oure git structure	14:32
osse	Quincy: run git remote -v	14:32
	→ joelm joined	14:32
tobiasvl	Quincy: first of all your use of the word "working directory" is very confusing. you mean you want to !sync your fork with the upstream, main repo?	14:33
gitinfo	Quincy: [!fork_sync] You can read a nice guide on how to update your fork with the upstream repository here: https://help.github.com/articles/syncing-a-fork	14:33
	← Balliad left	14:33
	← hkon_ left	14:34
Quincy	I'm thinking that tobiasvl has the golden tip, let's try :p	14:34
	← ascarter left	14:34
	← jottr_ left	14:34
ToxicFrog	Quincy: by "fork" you mean "clone"? This is very confusing. But I think tobiasvl probably has the right idea.	14:35
	→ homework1 joined	14:35
	→ frege joined	14:35
frege	how do I pull a branch from a remote repo?	14:36
	→ Ankhers joined	14:37
	← lucha left	14:37
tobiasvl	frege: git pull REMOTE_NAME BRANCH_NAME	14:38
	frege: but read man git pull	14:38
gitinfo	frege: the git-pull manpage is available at http://jk.gs/git-pull.html	14:38
	← aretecode left	14:38
tobiasvl	"a branch" and "a remote repo" are kinda vague (are you remote-tracking the branch, have you set up the remote). and since you said "pull" I'm guessing you want to fetch+merge.	14:39
	→ groolot joined	14:39
	← skylite left	14:39
	→ JesseCW joined	14:39
frege	thanks	14:39
	← rypeck left	14:40
	→ acharlieh joined	14:40
	← JesseCW left	14:40
	→ tang^ joined	14:40
	← joki left	14:42
frege	I get this error	14:42
	'remote-branch' does not appear to be a git repository	14:43
	fatal: Could not read from remote repository.	14:43
tobiasvl	frege: uh, what command did you run?	14:43
frege	git pull branch01 branch01	14:44
ws2k3	currently all oure developers are doing a git pull from from the dev server and then they go change code and then they commit and push, then we login onto the production server and do a git pull from the dev but i think this is the wrong way to use git	14:44
frege	branch01 doesn't exist locally	14:44
tobiasvl	frege: branch01 isn't the name of one of your remotes	14:44
frege	well it's	14:44
Quincy	ToxicFrog: I guess, we use gitlab (not github) xD	14:44
tobiasvl	frege: it is?	14:44
frege	I can see it on github	14:44
	do I need to add it somehow to my local git config?	14:45
tobiasvl	by "remote" I mean a remote repository	14:45
	not remote branch	14:45
bremner	!four	14:45
gitinfo	[!fetchfour] [pre 1.8.4 only] We recommend against using 'git fetch/pull <remote> <refspec>' (i.e. with branch argument), because it doesn't update the <remote>/<branch> ref. The easy way to fetch things properly is to get everything: 'git fetch' or 'git pull' are sufficient if you have one remote; otherwise we recommend 'git fetch <remote>' (plus 'git merge <remote>/<branch>' if you wanted to pull/merge).	14:45
frege	ahh	14:45
	← israelpattison left	14:45
tobiasvl	and also what bremner said, and also read the man page I showed you	14:45
frege	tobiasvl: no I cloned the remote repo but it doesn't have all the branches, it only has the master	14:45
	← lb1a left	14:45
	→ pantsman- joined	14:47
	→ mattstratton joined	14:47
	← MarionDaly left	14:47
	→ MarionDaly joined	14:47
	← jillesme left	14:48
	← vurma left	14:48
	← Gizburdt left	14:48
	← psoo left	14:48
	→ lsiv568 joined	14:48
	→ svector_ joined	14:48
	→ joki joined	14:48
	← yosito left	14:49
	← rob_w left	14:49
	← VaticanCameos left	14:50
	← dsdeiz left	14:50
	← rath left	14:50
	→ maes joined	14:51
	→ yosito joined	14:51
	← mizu_no_oto left	14:52
	← svector left	14:52
	← freestyl3r left	14:53
	→ wilirius joined	14:54
	→ Nizumzen joined	14:54
	← yosito left	14:55
	← zumba_ad_ left	14:57
	→ francisfish joined	14:57
	→ harish joined	14:57
	← Chrille left	14:57
	→ jottr_ joined	14:57
	→ zumba_addict joined	14:57
	← lsiv568 left	14:58
jeffreylevesque	I just committed something on a branch, but did not push. How do I undo the commit?	14:58
	→ mribeirodantas joined	14:58
	← smss1995 left	14:58
jeffreylevesque	it was the very last commit	14:58
	← ifdm_ left	14:58
	→ smss1995 joined	14:58
xender	jeffreylevesque: git reset --hard HEAD~	14:59
	← mennea left	14:59
xender	WAIT	14:59
	← FortySix2 left	14:59
xender	Thiss will wipe any uncommited changes though	14:59
	← smss1995 left	14:59
jeffreylevesque	ok, i think that's fine	14:59
xender	If you want to keep the working tree as it is, use --mixed instead of --hard or just omit it	15:00
	ok then	15:00
	→ sprnet joined	15:00
	→ dangerou_ joined	15:00
jeffreylevesque	thanks	15:00
ToxicFrog	Quincy: "fork" is a general open source term used by github (and I think gitlab), "clone" is the git term for a repo spawned from another one (using the 'git clone' command)	15:00
	← dangerousdave left	15:00
	→ JesseCW joined	15:00
	← moritzs left	15:01
	→ FortySix2 joined	15:01
	← FilipNortic left	15:01
	→ VaticanCameos joined	15:02
	← roelmonn_ left	15:02
	→ jfran joined	15:02
	→ roelmonnens joined	15:02
	→ Junior` joined	15:03
	← DoniRS left	15:04
	← JeanCarloMachado left	15:06
	← Junior left	15:07
	← roelmonnens left	15:07
	← Quincy left	15:07
	→ moritzs joined	15:07
	← mribeirodantas left	15:08
	← shinnya left	15:08
	→ thiago joined	15:08
	→ lsiv568 joined	15:09
	→ mribeirodantas joined	15:09
	← dipendra left	15:10
	← cbreak-work left	15:10
	← jceb_ left	15:11
	→ Xethron joined	15:11
	← Xethron left	15:11
	→ Xethron joined	15:11
	→ msm joined	15:12
	→ robarelli joined	15:12
	→ ifdm_ joined	15:12
	← msm` left	15:14
	→ rjurney joined	15:15
	← mribeirodantas left	15:16
	← Trudko left	15:16
	→ mribeirodantas joined	15:17
	← mribeirodantas left	15:17
	→ mribeirodantas joined	15:17
	← pantsman- left	15:17
	← GodEater left	15:17
	→ aberrant joined	15:17
	← LeMike left	15:18
	→ GodEater joined	15:18
	← GodEater left	15:18
	→ GodEater joined	15:18
	← xificurC left	15:20
	← rjurney left	15:20
	← ghostlines left	15:21
	← mlechner left	15:22
	→ JeanCarloMachado joined	15:23
	→ codeurge joined	15:23
	→ saorge_ joined	15:23
	→ lite_ joined	15:26
	→ MarionDa_ joined	15:26
	← saorge left	15:27
	← sinkensabe left	15:27
	← mnathani left	15:27
	→ mnathani joined	15:28
	→ drupalgeek joined	15:28
	← kikimeter left	15:28
	← nikita left	15:28
	→ EmmEight joined	15:28
	← EmmEight left	15:28
	← MarionDaly left	15:29
jaspertheghost	when i do a git merge does it copy over all my commit msgs from the branch that im merging ... also it always asks for a commit msg ... whats a good commit msg for merges so i know what i did in the branch i am merging	15:30
	← Reflow left	15:30
	→ gargola joined	15:30
	← ayaz left	15:30
	← lite_ left	15:30
	→ nikita joined	15:30
	→ cjwilburn joined	15:32
	← gua_ould left	15:33
	← listochkin left	15:33
	→ LeMike joined	15:34
	→ listochkin joined	15:34
canton7	jaspertheghost, no, it doesn't copy anything. it creates a merge commit which references both bits of history which are being merged	15:34
	jaspertheghost, the default message is usually fine. if you want to expand, say what feature(s) the merge is bringing in, or why you did the merge, etc. Don't give too much detail - you can get that by examining the commits being merged in	15:34
ToxicFrog	jaspertheghost: git merges are not like svn merges. It doesn't patch in the changes from the branch you're merging in, it creates a commit that has both branches as parents.	15:34
	← jdav_gone left	15:35
	→ dauntl3ss joined	15:35
	← cjwilburn left	15:35
	→ cjwilburn joined	15:35
	→ tgkokk joined	15:35
	← HelperW_ left	15:35
	→ deniz1a joined	15:35
	← tgkokk left	15:36
	← SimonNa left	15:36
	→ mellernoia joined	15:37
	← listochkin left	15:38
	→ jdav_gone joined	15:39
	→ jwest joined	15:39
	→ tyreld joined	15:41
	← thierryp left	15:41
	→ Sl0vi joined	15:42
	→ yosito joined	15:42
	← svector_ left	15:44
	→ devoldmx joined	15:44
	→ orbisvicis joined	15:45
	→ ericeatsbrains_ joined	15:45
orbisvicis	git clone urls always end in /reponame.git, is it guaranteed that the directory containing the git repo will be named "reponame" ?	15:45
	→ dreiss joined	15:46
osse	yes	15:46
jast	locally, after cloning? yes	15:46
osse	that's the documented behaviour at least	15:46
orbisvicis	ok, thanks	15:47
	← stodan left	15:47
	osse goes source diving	15:47
	← ericeatsbrains left	15:48
	→ benjwadams joined	15:48
benjwadams	can I merge another git repository's changes into an already existing repo?	15:48
osse	orbisvicis: BOOM https://github.com/git/git/blob/master/builtin/clone.c#L152-L219	15:48
	benjwadams: yes	15:49
	MarionDa_ → MarionDaly	15:49
benjwadams	*on a separate feature branch	15:49
	← dougsland left	15:49
benjwadams	so repo2:master -> repo1:feature_branch	15:49
osse	also yes	15:50
	git remote add repo2 <URL>; git fetch	15:50
	git branch feature_branch repo2/master	15:50
benjwadams	Nice!	15:50
	that will also include all the history?	15:50
	→ koell joined	15:50
	← lsiv568 left	15:50
osse	you betcha	15:51
	benjwadams: are these repos unrelated? do they not have any common history at all?	15:51
	gitinfo set mode: +v	15:51
orbisvicis	osse: hmm, ok thanks	15:52
	→ Thra11 joined	15:52
Sl0vi	how do I add a submodule to a branch when it already exists in another branch?	15:52
	and I cannot merge the branches	15:52
benjwadams	Yes, I'm trying to migrate a series of web pages to use different php drivers. I also wanted to update one of the applications, so i just copied the files i had presently into a new repo	15:52
	→ CKyle joined	15:53
	→ Cadair joined	15:53
	← Cadair left	15:53
	← mewm left	15:54
	→ neurodrone_ joined	15:54
	← shawndumas left	15:54
	→ Baluse joined	15:55
osse	orbisvicis: don't ask me what that code does. that greek is like code to me	15:55
	← Baluse2 left	15:56
osse	benjwadams: then know that git can't do shit to help you merge. if there are no files in common then it's all fine but if there are clashes then git can't do The Right Thing because there is no common history to look at	15:56
	... or so I've heard	15:57
benjwadams	well fortunately i take back what i said	15:58
	i'm wrong :)	15:58
	but good to know anyhow	15:58
	→ lsiv568 joined	15:58
	← jnavila left	16:00
	→ shawndumas joined	16:00
	→ tranzfuse joined	16:01
	← parcs left	16:01
	← ojacobson left	16:01
	→ Quevin joined	16:04
	→ c74d3 joined	16:04
	← bartman`` left	16:04
	← c74d left	16:04
	← thevishy_home left	16:04
	→ MattMaker joined	16:04
	← jargon left	16:05
	→ freestyl3r joined	16:05
	→ bartman`` joined	16:06
	→ hockey567 joined	16:06
Sl0vi	I figured it out, just had to create and write everything in .gitmodules manually	16:07
	→ Nicholas_Rishel joined	16:07
	← LeMike left	16:07
	← dreiss left	16:08
	← Muchoz left	16:09
	← jeffreylevesque left	16:09
	← krasnus left	16:10
	→ lindenle joined	16:10
	→ Jacob_ joined	16:11
	← Jacob_ left	16:11
	→ deanclkclk joined	16:11
Kingsy	I was on the master branch and I did this --> git branch -m test_13 <-- so its renamed my master branch to that.. how caqn I reverse this? can I just do git branch -m master ?	16:12
	← wilirius left	16:12
canton7	yup	16:13
	→ whomp joined	16:13
	← Anticom left	16:13
	→ FabTG joined	16:13
	→ rbartos joined	16:14
	← oodavid left	16:14
	→ Kamaljeet joined	16:14
	← martinklepsch left	16:14
	→ rypeck joined	16:14
	← chiromante left	16:15
	→ Quevin_ joined	16:15
	← fstd left	16:15
	→ rjurney joined	16:16
Kingsy	thanks	16:16
	→ jnavila joined	16:17
	← Ankhers left	16:17
	← Novitsh_ left	16:18
	← sjohnson left	16:18
	← Mitchbones left	16:18
	← msm left	16:19
	← JeanCarloMachado left	16:19
	← awkwardusername left	16:19
	← nnyk_ left	16:19
	← rjurney left	16:20
	← Nicholas_Rishel left	16:21
	← Quevin_ left	16:21
	← alorence left	16:21
	← donmichelangelo left	16:22
	← aberrant left	16:22
	→ mennea joined	16:22
	→ donmichelangelo joined	16:23
	→ imachuchu joined	16:23
	→ kballou joined	16:24
	→ crxz0193 joined	16:24
	→ dts joined	16:24
	gitinfo set mode: +v	16:25
	← gain left	16:25
	← TomyWork left	16:25
	→ LucasTT joined	16:26
	← koell left	16:26
dts	Hi. My company is using SVN and so I was working in a svn repo. When the server broke down I started a git repo in the svn repo root directory to continue working. Now I want to commit all the commits I did on a svn-git branch I fetched into the same git repo. This fails all the time. I tried it on a lot of ways. What do you recommend me doing?	16:27
	← doev left	16:27
	→ Muchoz joined	16:27
	← CKyle left	16:28
ToxicFrog	dts: wait, you have an svn checkout, and then you created a git repo in that, and then you somehow changed that git repo into a git-svn repo?	16:29
	← batrick left	16:29
milki	magic	16:30
	→ ojacobson joined	16:30
	→ dik_dak joined	16:31
	← fabio_p left	16:32
dts	ToxicFrog: I have a svn checkout Foo. Foo contains .svn. Now I am in Foo and do git init, so Foo now contains .svn and .git. Now I work using git until my companys server is up and running again. I still am in Foo, add the svn repo using git-svn and fetch the branch (git_svn). Now I want to rebase all the commits I did on my master to the git_svn repo and then dcommit it to svn. What shall I do?	16:32
	← achadwick left	16:33
ToxicFrog	dts: my first suggestion would be to create a new, pristine git-svn repo (using git svn, not "upgrading" an existing git repo), then transfer your commits from the existing repo into it (using, e.g, git format-patch \| git am, or git remote add + git fetch + git cherry-pick), then dcommit the results	16:33
	← Arkaniad left	16:33
ToxicFrog	If you want to do it "in place", well, how does it fail?	16:33
	← W0rmDr1nk left	16:33
	← mikecmpbll left	16:33
	→ jhulten joined	16:34
	→ CKyle joined	16:34
	→ batrick joined	16:34
	← jottr_ left	16:34
	→ kikimeter joined	16:34
	← freestyl3r left	16:34
	→ hkon_ joined	16:34
	← cllamas left	16:35
	→ cllamas joined	16:36
	FaddeevPopov → Yahweh	16:36
	← francisfish left	16:36
dts	I tried format-patch and am. The problem is that I have changes (regarding the svn repo) at the point I created the git repo. You have to consider that I was working in the svn repo until I figured out that I cannot commit on the svn server. So my initial git commit differs from the last svn one. So I think I have to make a diff from my git_svn branch to my masters first commit and patch this on	16:37
	my git_svn. Then I could git am all the format-patch patches onto git_svn. But this does not work. Where is the problem?	16:37
	→ deanclkclk_ joined	16:37
ToxicFrog	"does not work" is noise. How doesn't it work? What have you tried? What happens when you do?	16:37
dts	ToxicFrog: your first Idea wont work because I will not be able to get a patch for the initial commit with git format-patch....	16:37
ToxicFrog	Why not	16:38
	? Do you know the revision your svn checkout was originally synced to?	16:38
dts	because the range you can select is ecluding the first one	16:38
ToxicFrog	If so, sync to that, checkout your first git commit in another dir, and diff the two	16:38
osse	dts: checkout the first commit and te	16:38
thiago	dts: it works. You've done something wrong.	16:38
osse	yes	16:38
	→ jeffreylevesque joined	16:38
thiago	dts: or you're creating a patch that depends on the changes you had made originally and don't want to contribute	16:39
	← robbyoconnor left	16:39
	← hkon_ left	16:39
	← devoldmx left	16:39
	← oojacoboo left	16:39
	→ aretecode joined	16:39
	← Guest351O2 left	16:39
	→ robbyoconnor joined	16:39
	→ devoldmx joined	16:40
	← deanclkclk left	16:40
	→ kriks joined	16:40
	← cllamas left	16:40
	→ nnyk_ joined	16:40
dts	this is exactly what I tried. But these are my first steps in git. So do I get you right that you suggest me creating a standard diff from the git_svn to the git_initial_commit, standard patch this onto git_svn, and then continue with format-patch and am? Because this is what I tried. It gives me "error: patch does not apply"	16:41
	→ aberrant joined	16:41
	Mapley[AUS][NED] → Mapley	16:41
	← tvw left	16:42
	← FortySix2 left	16:43
dts	ToxicFrog: I know the revision - the svn doesnt have any changes.	16:43
	← bnicholson left	16:43
	← CKyle left	16:43
dts	ToxicFrog: So the git_svn branch is the revision I was working on when the svn server went offline	16:43
	← jeffreylevesque left	16:43
	→ mcc_1 joined	16:44
	jrhorn424 → zz_jrhorn424	16:44
ToxicFrog	dts: after some thought: init a new git-svn repo synced to that revision. Git remote add old-git-svn <your other git repo>. Git fetch old-git-svn git_svn. git checkout git_svn. git rebase --root master.	16:45
	→ FortySix2 joined	16:45
	← mcc_ left	16:46
ToxicFrog	There may be merge conflicts (e.g. seeing the root commit as a huge add/add conflict), but I think if you just tell it to accept yours each time you'll end up with the right answer.	16:46
	→ victorhos__ joined	16:46
	→ mizu_no_oto joined	16:46
	→ fresham joined	16:46
	→ sator joined	16:47
	→ CKyle joined	16:48
	← sator left	16:48
	← Xethron left	16:48
	← Muchoz left	16:48
dts	ToxicFrog: I guess in your latest solution you rebase from the git_svn because you think I have made changes on it that I want to dcommit. This is not the case: My changes are on the master branch. My task is to rebase the work I did on the master to the git_svn branch for committing it to the svn server. Am I right about your solution?	16:49
	→ Arkaniad joined	16:49
	← lsiv568 left	16:49
ToxicFrog	dts: yes, that was my belief.	16:49
	← jnavila left	16:49
ToxicFrog	Setting aside the specific commands, my suggestion is to get yourself a pristine git-svn branch synced to the correct revision, then rebase --root the branch with your changes onto that pristine branch, resolving all conflicts in favour of the branch with your changes.	16:50
	→ mikecmpbll joined	16:51
	→ dougsland joined	16:51
	→ jnavila joined	16:51
	← jmpp left	16:51
fresham	Is there a way to rewind commits I accidentally merged into master from a feature branch? I also accidentally pushed to origin master, so I can’t just reset master and re-pull.	16:52
ToxicFrog	fresham: I believe "git revert" can be used to revert a merge commit.	16:53
	→ jay_ joined	16:53
	→ Shusshu joined	16:53
fresham	Ah, I guess that would do it.	16:53
	← welly left	16:53
ToxicFrog	You'll need the --mainline option to tell it which parent should be considered the main one.	16:53
dts	Thanks ToxicFrog, rebase --root seems promising. I give it a try.	16:54
	→ maestrojed joined	16:54
fresham	ToxicFrog: thanks!	16:54
	← kevinb left	16:54
	← Shusshu left	16:55
	← jay_ left	16:55
	→ axl_ joined	16:56
	→ Samual joined	16:56
	→ a-l-e joined	16:56
	← intellix left	16:57
	→ diegoviola joined	16:57
	← FortySix2 left	16:58
	→ Lemony joined	16:59
	← hahuang65 left	16:59
fresham	I did `git revert --hard HEAD` and that seemed to do it (since it was the last commit).	16:59
	Will that work okay?	16:59
	→ kevinb joined	16:59
	← WaReZ left	16:59
	→ awkwardusername joined	16:59
	→ dreiss joined	16:59
	← FabTG left	17:00
	← Samual left	17:00
	→ sdrfnord1 joined	17:00
dts	ToxicFrog: Im confused: I start git rebase --root master while being on the git_svn branch and end up on the master branch all the time. It says "successfully rebased and updated refs/heads/master". Its like a standard checkout. What am I missing here? Now I started the same procedure from being on the master and rebasing --root git_svn. That seem to take a long time.	17:01
	→ WaReZ joined	17:01
	→ Samual joined	17:01
	→ FabTG joined	17:02
	← victorhos__ left	17:02
	→ pcypher joined	17:03
	→ victorhos__ joined	17:03
	← cjwilburn left	17:03
	← victorhos__ left	17:03
	← pcypher left	17:03
	← p4denis left	17:03
	← Zariel_ left	17:04
fresham	Here’s where I went wrong. I needed some work on a feature branch, but I knew I didn’t want anything in the files that would cause merge conflicts, so I ran `git merge -s ours fbranch`.	17:04
ToxicFrog	dts: NO DON'T	17:05
	→ JeanCarloMachado joined	17:05
	→ pcypher joined	17:05
osse	fresham: then you didn't get any changes at all	17:05
ToxicFrog	dts: er, wait. Which one has the changes again?	17:05
	dts: what you want to do is check out the branch with your changes, and then rebase --root passing the name of the pristine branch as an argument.	17:05
fresham	What I really needed to do was `git merge fbranch` then use `git checkout --ours -- filepath` to keep what I wanted.	17:05
osse	fresham: yes. or git merge -X ours	17:06
ToxicFrog	That will end with the pristine branch checked out and all of your changes from the other branch on it.	17:06
fresham	osse: exactly	17:06
	← pcypher left	17:06
osse	fresham: has any one else fetched/cloned?	17:06
fresham	osse: Oh, so a recursive merge with the “ours” option is different from the “ours” strategy	17:06
osse	reverting merges are ugly for complicated reasons	17:06
fresham	osse: No, just me working on it. All fixed up now.	17:06
osse	ahh ok	17:07
	← axl_ left	17:07
fresham	I’m just trying to get my head around exactly how everything went down so I know how it works in the future.	17:07
	→ Zariel_ joined	17:08
	→ Zoddo joined	17:08
	← Nizumzen left	17:08
	→ jatt joined	17:08
	← jatt left	17:08
	→ jatt joined	17:08
	← kikimeter left	17:08
	→ pcypher joined	17:09
	← pnkbst left	17:09
	→ Quevin_ joined	17:09
dts	ToxicFrog. Thanks a lot. This actually is what I am doing right now (wondering if a pristine is just a clean branch [reset --hard, clean -dxf] and no bare repo). So I am on master (where my changes are in) and do a git rebase --root git_svn with git_svn being a clean git-svn repository.	17:09
	So I hope this is correct and I hope I take pristine correctly	17:10
ToxicFrog	"pristine" is just whatever you get from git svn when you init a new git-svn branch synced to the svn rev you based your changes on.	17:10
	I.e. it's a git branch containing the contents of that svn rev.	17:10
	→ pnkbst joined	17:10
ToxicFrog	(at its head)	17:10
	→ Sendoushi joined	17:11
dts	alright. perfect. thanks	17:11
	← lindenle left	17:11
	→ lindenle joined	17:11
	→ masscrx joined	17:11
masscrx	hi	17:12
	→ Hecter2 joined	17:12
	→ LeMike joined	17:12
	→ zequence_ joined	17:12
	← CheckDavid left	17:12
	← Zariel_ left	17:13
	→ cjwilburn joined	17:13
	→ akiva joined	17:14
frege	is it a bad idea to push a vbox 400mb to github?	17:14
	← zequence left	17:14
	← Quevin_ left	17:14
	← qwyeth left	17:14
	→ maveneagle joined	17:14
	→ blackmesa joined	17:14
	→ Sample joined	17:15
	→ Sample_ joined	17:15
osse	no	17:15
	ehh	17:15
	yes i mean	17:16
	→ fstd joined	17:16
	← Arkaniad left	17:16
	→ thevishy joined	17:16
	→ bnicholson joined	17:16
	→ Muchoz joined	17:16
	→ boombatower joined	17:18
	← hoschi left	17:18
	→ axl_ joined	17:18
	→ azonirunner joined	17:18
	→ martinklepsch joined	17:18
	← cjwilburn left	17:18
	← irqq left	17:18
	← axl_ left	17:20
	← wrouesnel left	17:20
	← Muchoz left	17:21
	← zequence_ left	17:22
	→ zequence joined	17:22
	→ francisfish joined	17:22
	→ cjwilburn joined	17:22
	← bnicholson left	17:23
	→ sinkensabe joined	17:24
	← azonirunner left	17:24
dts	ToxicFrog: Okay, the process has finished but not any commit has been applied. Although git told it was successfull	17:25
Eugene	frege - don't commit "large" binary files like that, no.	17:25
	← maveneagle left	17:25
frege	ok	17:26
	← FabTG left	17:26
	← cjwilburn left	17:27
	→ zequence_ joined	17:28
	→ vurma joined	17:28
	← jfran left	17:28
	→ jfran joined	17:29
	→ rjurney joined	17:29
	→ maveneagle joined	17:29
	→ lasserix joined	17:29
	← maveneagle left	17:29
	← sinkensabe left	17:29
	→ cjwilburn joined	17:30
	← dougsland left	17:30
	← m0viefreak left	17:31
	→ ferreum158 joined	17:31
	← zequence left	17:31
	→ azonirunner joined	17:32
	→ sinkensabe joined	17:33
	← whomp left	17:33
	→ Radivarig joined	17:33
	→ Muchoz joined	17:33
	→ FabTG joined	17:33
	← marscher left	17:33
	← carandraug left	17:33
	← martinklepsch left	17:34
	← zequence_ left	17:34
	→ model joined	17:34
	← Sendoushi left	17:34
	→ dougsland joined	17:35
	→ bnicholson joined	17:36
	← [EddyF]_ left	17:36
	← tharvey left	17:36
	← sinkensabe left	17:37
	→ Quevin_ joined	17:37
osse	frege: do you ever expect it to change?	17:37
	← kriks left	17:37
	← gattuso left	17:38
	→ tranzfuse1 joined	17:38
	→ zequence joined	17:38
	→ qwyeth joined	17:39
	← Lemony left	17:39
	← St_Marx left	17:39
	→ FortySix2 joined	17:39
	→ still_drupalgeek joined	17:39
	← tranzfuse left	17:39
	← choffstein left	17:40
	→ hahuang65 joined	17:40
	→ leeN joined	17:41
	← FortySix2 left	17:41
	← Diemuzi left	17:41
	← drupalgeek left	17:42
	→ jluc joined	17:42
	← basiclaser left	17:42
	→ martinklepsch joined	17:43
	→ Lemony joined	17:44
	← hebz0rl left	17:44
	← goTAN left	17:44
	← mikecmpbll left	17:44
	← Quevin_ left	17:44
	→ upene joined	17:45
	→ basiclaser joined	17:45
	← bezet left	17:45
	← cbreak left	17:45
	ferreum158 → ferreum_	17:46
Eugene	Doesn't matter; github will vomit on anything larger than 100MB	17:46
	→ goTAN joined	17:46
	→ codehotter joined	17:47
osse	oh right	17:47
	← jj995_ left	17:47
Eugene	As a general rule, only commit text. If you do commit a binary, make sure it's small and has a good reason. PNG/GIFs being used in web design are a good example - <1MB is best, and I'd seriously consider the rationale of anything larger than 10MB.	17:47
codehotter	I have a large git repository, in which I created a feature branch. I'd like to send this feature branch over to someone via email, sending him only the changes made in my feature branch and not the entire repository. But saving commit history. Is that possible?	17:47
thiago	yes	17:48
	git format-patch	17:48
Eugene	codehotter - man git-format-patch	17:48
gitinfo	codehotter: the git-format-patch manpage is available at http://jk.gs/git-format-patch.html	17:48
	← pcypher left	17:49
	→ BreakmanX joined	17:49
imachuchu	codehotter: you could also use git bundle	17:50
	→ cbreak joined	17:51
	→ n-st joined	17:51
	← goTAN left	17:51
	← hahuang65 left	17:51
	→ FortySix2 joined	17:52
	→ Macaveli joined	17:52
	→ hahuang65 joined	17:53
	← Wiz_KeeD left	17:53
	← Mocramis left	17:53
	← bnicholson left	17:53
	→ Mocramis joined	17:54
	→ ErKa joined	17:55
	← thiago left	17:55
	→ pcypher joined	17:55
	→ jluc_ joined	17:56
	← CKyle left	17:56
	← nnyk_ left	17:57
	← jhulten left	17:57
	← jluc left	17:57
	→ kriks joined	17:58
	← ArSn left	17:58
	→ axl_ joined	17:59
	→ gar_onn joined	17:59
	← treehug88 left	18:00
	← vurma left	18:01
	← ehmatthes left	18:01
	→ sinkensabe joined	18:01
	← ORiON-- left	18:01
	→ oojacoboo joined	18:01
	→ nehaljwani joined	18:01
ToxicFrog	dts: "git log" shows no change?	18:01
	← rbartos left	18:02
	→ jhulten joined	18:02
	→ jj995_ joined	18:03
	→ doubled112 joined	18:03
	→ zequence_ joined	18:04
	→ mikecmpbll joined	18:04
nehaljwani	Need a little help. I had sent a patch series to a dev list which got reviewed after a week. Now after my patch, a lot of changes have already been made, so git-am throws a lot of conflicts. Since I have to resend the patch, what is the shortest/best possible way to go about it, without manually applying it patch (copy/paste) ?	18:04
jj995_	how can you git push without first doing git pull? I get the error "Updates were rejected because the remote contains work that you do not have locally...", but I know those changes don't deal with the one file I'm trying to push a commit to, and I don't want to pull so that I don't have to rebuild	18:05
	→ Motoko joined	18:05
	→ ORiON-- joined	18:06
moritz	jj995_: you don't have to rebuild on pull	18:06
	→ Reflow joined	18:06
Reflow	is the site down?	18:06
	or is it just me?	18:06
moritz	jj995_: and yes, you have to pull first.	18:06
	← zequence left	18:06
	→ Wiz_KeeD joined	18:06
	→ welly joined	18:06
	← welly left	18:07
	→ welly joined	18:07
jj995_	+moritz: I just meant my dumb IDE will do a slow rebuild if the files are touched	18:07
	→ Reskp joined	18:07
jj995_	ok, I'll just pull first and deal with it	18:07
	→ rbartos joined	18:07
	← tranzfuse1 left	18:07
	← Reskp left	18:08
	→ barcode joined	18:11
	← Wiz_KeeD left	18:11
	← hockey567 left	18:12
	→ ehmatthes joined	18:12
	→ `Reflector` joined	18:12
	→ lsiv568 joined	18:12
	→ tranzfuse joined	18:13
	← aretecode left	18:13
	← bbloom left	18:13
	→ jerius joined	18:13
	← jerius left	18:13
	← Junior` left	18:14
	← VaticanCameos left	18:14
	← kevinold_ left	18:15
	→ akushner joined	18:15
cbreak	nehaljwani: tried to just git rebase?	18:15
nehaljwani	cbreak, I don't have a local branch with my changes which I can rebase	18:16
	→ aretecode joined	18:16
cbreak	jj995_: git will only touch files it has to change	18:16
	nehaljwani: then make one?	18:16
	← FortySix2 left	18:17
nehaljwani	cbreak, so I should soft reset some 30 patches, make my own branch, apply my patches and then rebase it?	18:17
cbreak	nehaljwani: no	18:17
	← Hecter2 left	18:17
cbreak	nehaljwani: just make a new branch (from the commit your commits were based on), with git checkout -b tmp basecommit	18:17
	then apply your commits	18:17
	→ paul424 joined	18:18
	→ a_le joined	18:18
cbreak	they will be applied without conflicts unless you fucked up big time	18:18
nehaljwani	okay, then?	18:18
cbreak	then rebase	18:18
	rebasing will not be trivial if am gives conflicts, but it might have more context to give less problems.	18:18
	→ dev_as0 joined	18:18
	← yano left	18:19
	→ dfinly joined	18:19
	← dfinly left	18:19
	← akushner left	18:20
nehaljwani	what is the shortcut to findout the hash for the HEAD-30 commit?	18:20
	→ akushner joined	18:20
tobiasvl	nehaljwani: git rev-parse HEAD~30	18:21
	(I assume you meant ~ and not -)	18:21
	→ akim__ joined	18:21
nehaljwani	tobiasvl, what is the difference?	18:21
	→ endiruna joined	18:21
tobiasvl	HEAD~30 means the 30th commit going back from HEAD	18:22
	HEAD-30 means ... nothing? unless you have a branch or tag named that or something I guess	18:22
	→ hebz0rl joined	18:23
	← rjurney left	18:23
	→ Hecter joined	18:25
	→ roymiloh joined	18:25
	← `Reflector` left	18:26
	← akim left	18:27
	← ErKa left	18:27
	→ rjurney joined	18:27
	← lindenle left	18:28
	→ `Reflector` joined	18:28
	→ lindenle joined	18:29
	← vtunka left	18:30
	← Lemony left	18:30
	← charpent left	18:31
	→ Reskp joined	18:32
	→ LuxuryMode joined	18:33
	← oojacoboo left	18:33
	→ jottr_ joined	18:35
	→ thiago joined	18:35
	→ hkon_ joined	18:35
	← Reskp left	18:36
	→ cllamas joined	18:36
	← rjurney left	18:37
	← Kamaljeet left	18:37
	→ kenneth joined	18:38
	← n-st left	18:38
	→ tgkokk joined	18:38
	→ n-st joined	18:39
	← tgkokk left	18:39
	→ Reskp joined	18:39
	→ maveneag_ joined	18:39
	→ tgkokk joined	18:39
	← tgkokk left	18:40
	← hkon_ left	18:40
	← shawndumas left	18:40
	→ Quevin_ joined	18:40
	→ tgkokk joined	18:40
	← maestrojed left	18:41
	← tgkokk left	18:41
	← dangerou_ left	18:41
	← cllamas left	18:41
	→ tgkokk joined	18:41
	← tgkokk left	18:42
	→ dangerousdave joined	18:42
	← dangerousdave left	18:42
	→ hockey567 joined	18:42
	→ tgkokk joined	18:42
	→ listochkin joined	18:43
	→ dangerousdave joined	18:43
	← dangerousdave left	18:43
	`Reflector` → VaticanCameos	18:43
	→ dangerousdave joined	18:43
	→ CKyle joined	18:44
	← dangerousdave left	18:44
	← Hecter left	18:44
	← Reskp left	18:44
	→ dangerousdave joined	18:44
	← Quevin_ left	18:44
	→ ckyle_ joined	18:44
	← dangerousdave left	18:44
	→ dangerousdave joined	18:45
	← dangerousdave left	18:45
	← dougsland left	18:45
	← zz_Iakxos left	18:45
	← mizu_no_oto left	18:46
	→ dangerousdave joined	18:46
	← dangerousdave left	18:46
	→ spasysheep joined	18:46
	← spasysheep left	18:46
	→ dangerousdave joined	18:47
	← dangerousdave left	18:47
	← a_le left	18:47
masscrx	if I have 2 branches, master and staging, and after making some changes in branche staging then from master merge with staging i have working code, but when I make changes to master do I have to merge master from staging?	18:47
	→ mjsmith2 joined	18:47
	→ finetux joined	18:47
	→ FortySix2 joined	18:47
	→ a_le joined	18:48
	→ dangerousdave joined	18:48
	→ major joined	18:48
PerlJam	masscrx: what do you think? :)	18:48
	→ spasysheep joined	18:48
	→ therealGent joined	18:49
	→ rjurney joined	18:49
masscrx	I;m not sure thats why I'm asking, but I think that I have to put changes made in master to staging	18:49
PerlJam	masscrx: or ... do you want the changes you made to master to also be available in staging? If so, then yes (at least merging is an option)	18:49
	← still_drupalgeek left	18:49
	ScottE_ → ScottE	18:50
masscrx	what do you mean that merging is an option ?	18:50
	← epifanio left	18:50
	← listochkin left	18:50
	← Macaveli left	18:51
	→ listochkin joined	18:51
PerlJam	masscrx: it's an option to getting the changes from one branch to another. You can also rebase or cherry pick or do some other things.	18:51
major	soo .. I have been trying to configure my git instance to aid in a specific workflow model and having a real pita time of pulling it off... I have a 'personal' branch which is based on 'master'. I want pulls onto this branch to always rebase .. and 'push' go to a remote branch w/ the same name as my local personal branch...	18:51
masscrx	I dont need changes from master in staging, I'm wondering if will it producer some error if in staging wont be commits from master	18:52
	→ jack joined	18:52
masscrx	I mean git errors	18:52
	← FortySix2 left	18:52
	jack → Guest15213	18:52
	→ nour joined	18:53
	→ kevinold joined	18:53
rjurney	I just added a new remote, called mlnick. Now I want to checkout a branch this new remote has called 'pyspark-inputformats'. How do I do this? git checkout pyspark-inputformats or git checkout mlnick/pyspark-inputformats don't work	18:53
	→ Hecter joined	18:54
Seveas	rjurney: git checkout -b pyspark-inputformats mlnick/pyspark-inputformats	18:54
spasysheep	I'm fairly new to git and I'm having some issues trying to fetch an old commit of a remote repository, apply some patches, then bring the patched code up-to-date. The closest I can get is it failing out due to too many renames as it seemingly tries to rename every file in the source tree, and every time I think I understand what I'm doing I find a	18:55
	new error. What's the correct way to do this?	18:55
Seveas	rjurney: though you'll need to git fetch mlnick first :)	18:55
	→ irqq joined	18:55
	→ doener joined	18:55
	← listochkin left	18:55
	← Sample_ left	18:55
rjurney	seveas https://gist.github.com/rjurney/36ba95fde77b245fc8f2	18:56
	ah, ok	18:56
	→ Reskp joined	18:56
Seveas	spasysheep: you don't "fetch a commit". Are you trying to apply old patches to new code? Or are you trying to go abck to old code, apply patches, and try to merge the result with new code?	18:56
	← Sample left	18:56
	→ morenoh151 joined	18:56
	← Reskp left	18:56
rjurney	ok, now it works. Thanks	18:56
	→ Sample joined	18:56
	← str left	18:57
	← rjurney left	18:57
	← sdrfnord1 left	18:57
	← rbartos left	18:57
	→ str joined	18:57
	→ rjurney joined	18:57
spasysheep	Seveas: fetch the code as it was immediately after an old commit, then. I'm trying to go back to old code, apply patches, and try to merge the result with new code	18:58
	→ rbartos joined	18:58
	→ sd1074 joined	18:58
	← RecoJohnson left	18:59
	→ yano joined	19:00
	← amcsi_work left	19:01
Seveas	spasysheep: ok, git checkout <tag-branch-or-sha1 of old code>	19:01
	afterward, if it's not a branch, create a branch: git checkout -b new-branch-name	19:02
	then apply patches and merge	19:02
	← maveneag_ left	19:02
	← tgkokk left	19:03
	→ maveneagle joined	19:03
masscrx	I have in git tree : * b80054a Fixed no search result	19:04
major	any ideas for this? checked out onto 'personal/master' and having 'git pull' rebase from 'master' while 'git push' pushes to a remote personal/master?	19:04
	← bartman`` left	19:04
masscrx	but last two lines are in another format : * b988d99 (production/staging, origin/staging, staging) Expanding api search for taught skills	19:04
	what does it mean ?	19:04
	→ tgkokk joined	19:05
	→ p4denis joined	19:05
	← tgkokk left	19:05
	→ St_Marx joined	19:05
	→ tgkokk joined	19:05
	→ cjwilbur_ joined	19:06
	→ epifanio joined	19:06
	← tgkokk left	19:06
	← lsiv568 left	19:06
	→ SimonNa joined	19:06
	→ tgkokk joined	19:06
	→ FortySix2 joined	19:07
	← cjwilbur_ left	19:07
	→ beastd joined	19:07
	→ cjwilbur_ joined	19:07
	→ m8 joined	19:07
	→ dougsland joined	19:07
	← jhulten left	19:07
	→ lsiv568 joined	19:08
	← maveneagle left	19:08
	→ Arkaniad joined	19:08
	→ jhulten joined	19:08
	← teran_ left	19:08
	← p4denis left	19:09
	← devoldmx left	19:09
codehotter	I want to merge current branch into master, can I do this without checking out master?	19:09
	← cjwilburn left	19:09
	← jnavila left	19:09
	← lindenle left	19:10
spasysheep	seveas: what do I merge with? the remote url for the up-to-date branch?	19:10
	← Rhonda left	19:10
	→ Rhonda joined	19:10
Rhonda	codehotter: I am not aware of that being possible, thing being with merge conflicts and stuff.	19:10
Seveas	codehotter: nope	19:11
	← sd1074 left	19:11
Seveas	spasysheep: check out the branch you want to merge with, merge the new branch	19:11
	← epifanio left	19:12
Seveas	masscrx: the things between (...) are branches pointing to that commit	19:12
	major: you can set a separate pushurl with git-config	19:13
major	Seveas, branch .. not repo	19:13
	→ listochkin joined	19:13
Seveas	major: pull/push pull from and push to repos...	19:13
	← rjurney left	19:13
	→ rjurney joined	19:14
	→ fluxdude joined	19:15
codehotter	Can I make a specific commit disappear?	19:15
	→ alvaro_o joined	19:15
codehotter	I want it to disappear from the history, and the changes removed from git, but not from my working tree	19:15
major	at the branch scope, I want my private branch to rebase master by default during pull, and push to a remote branch w/ the same name as the branch I am on	19:15
Seveas	codehotter: that's only possible if it's the last commit	19:15
codehotter	Seveas: it's not. Now what?	19:16
Seveas	codehotter: then you can make it disappear with an interactive rebase, but it disappears from the working tree too, so save it as a patch file first and apply it afterwards	19:16
	→ Gizburdt joined	19:16
	← kevinb left	19:17
	→ mxmasster joined	19:17
mxmasster	hi all	19:17
	← fluxdude left	19:17
mxmasster	i have a strange problem	19:17
	on a production app server that is doing a git pull from the remote we’ve noticed files that are not updating	19:17
jim	codehotter, is it just your local repo or does the commit exist on a remote too?	19:17
major	I suppose I am looking something akin to: branch.<name>.rebase = true branch.<name>.pull = refs/heads/master branch.<name>.push = refs/heads/personal/master	19:17
mxmasster	i’ve tried a reset, etc… on the directory which has not resolved.	19:17
	git status/log show that the revision is proper	19:18
	→ kevinb joined	19:18
mxmasster	and a fresh clone into a different directory works fine	19:18
PerlJam	mxmasster: git is not a deployment tool. Perhaps you need to use one :)	19:18
masscrx	Seveas: so why in older commits there is no (...) as information about branches to various commits ?	19:18
mxmasster	PerlJam: actually we’re using bamboo but thanks	19:18
ToxicFrog	mxmasster: so, 'git log' shows that HEAD is the commit you expect, 'git status' shows everything clean, but if you clone into another dir and then check out that same commit, the working tree contents are different?	19:18
mxmasster	ToxicFrog: correct	19:19
	→ shawndumas joined	19:19
mxmasster	i didn’t believe it either when the dev told me	19:19
ToxicFrog	.gitignore wackiness?	19:19
	osse mumbles incoherently something about git update-index --asume-unchanged	19:19
	← gar_onn left	19:20
Seveas	masscrx: because branch names point to the last commit in the branch	19:20
	maxorator: what does git status say?	19:20
	← Zoddo left	19:21
Seveas	mxmasster*	19:21
ToxicFrog	osse: shouldn't it be --no-assume-unchanged, since the goal is to find files in working tree that are modified relative to HEAD but which git doesn't recognize as modified in status?	19:21
	Or am I misunderstanding the docs?	19:21
spasysheep	Seveas: it still fails due to too many renames. The code is the Raspberry Pi linux kernel, the patches are written for 3.10 and the latest stable release is 3.12. Is there some way to make it follow the commit history through so I can see where the failures are occurring, or a better way to do this?	19:21
masscrx	Seveas: ok so this is default - 2 last commits with branches between (...) ?	19:21
	← rjurney left	19:21
Seveas	spasysheep: looks like you'll be manually adjusting patches :)	19:21
	← FabTG left	19:22
Seveas	masscrx: try !lol and you'll see it better	19:22
gitinfo	masscrx: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	19:22
osse	ToxicFrog: one is a solution to the other. but yes. I was thinking that perhaps they had run --assume-unchanged at some point, in which case --no-asssume-unchanged is the solution	19:22
masscrx	Seveas: these infos are from lol	19:22
Seveas	ok, so what's confusing you?	19:22
ToxicFrog	osse: aah	19:22
masscrx	why only last two commits are with (...) is this default ?	19:23
mxmasster	thanks	19:23
osse	mxmasster: no. git will show (...) behind any commit it is relevant to	19:23
spasysheep	seveas: try to apply them to the 3.12 branch and then modify them to apply correctly?	19:23
Seveas	spasysheep: yeah, check out 3.12 and apply the patches one by one after adjusting filenames	19:24
spasysheep	Seveas:OK, thanks	19:24
	← rbartos left	19:24
	← diegoviola left	19:25
	← davividal left	19:25
	← francisfish left	19:25
masscrx	osse: so when commits are relevant ?	19:25
osse	masscrx: when they have a reference (branch, tag, ...) pointing at them	19:26
	→ milli joined	19:26
	→ Reskp joined	19:27
	→ jonmorehouse joined	19:28
	← listochkin left	19:28
	→ Noldorin joined	19:28
	← VaticanCameos left	19:28
	→ FabTG joined	19:29
	→ ghostlines joined	19:29
	← Reskp left	19:31
Seveas	masscrx: maybe read !cs for some background info	19:33
gitinfo	masscrx: "Git for Computer Scientists" is a quick introduction to git internals for people who are not scared by phrases like Directed Acyclic Graph. http://eagain.net/articles/git-for-computer-scientists/ See also !concepts !bottomup	19:33
	→ gar_onn joined	19:33
	← jottr_ left	19:33
	← mjsmith2 left	19:33
	→ mjsmith2 joined	19:34
	→ githassle joined	19:35
	← pcypher left	19:35
	gitinfo set mode: +v	19:35
	→ EmmEight joined	19:35
	c74d3 → c74d	19:35
	→ vurma joined	19:36
githassle	hey, I am trying to use git rebase in windows bash. I have aplied, reword and fixup to the commits, but what are they keys to apply the rebasing ??	19:36
osse	githassle: save and quit the editor	19:36
grawity	just exit the editor	19:36
	→ pheaver joined	19:37
grawity	if git opens Vim, "Esc : w q Enter" is the magic incantation	19:37
	→ roentgen joined	19:37
	← finetux left	19:37
	← EmmEight left	19:38
	← mribeirodantas left	19:38
	→ finetux joined	19:38
	→ teran joined	19:38
githassle	its windows vim, but when I got ESC W Q ENTER - nothing happens :/	19:38
	← kballou left	19:38
	← ntio left	19:39
	← tgkokk left	19:39
	→ Reskp joined	19:40
	← Reskp left	19:40
	→ Reskp joined	19:40
	→ CheckDavid joined	19:40
tang^	you missed the :	19:40
osse	the default editor in Git for Windows should be notepad or something	19:41
	← lsiv568 left	19:41
	← hockey567 left	19:41
	→ _hockey567 joined	19:41
osse	but the problem is that notepad doesn't handle unix newlines very well	19:41
	← a-l-e left	19:42
	← roentgen left	19:42
	→ kballou joined	19:42
	→ roentgen joined	19:42
grawity	WordPad, then	19:42
SamB	osse: s/ very well/	19:43
osse	SamB: heh	19:43
	← finetux left	19:43
SamB	and as grawity says: WordPad, then	19:43
	← ingu_cloud_ left	19:43
osse	or they could make nano part of the bundle	19:43
grawity	nah	19:44
	← nda_ left	19:44
grawity	editing in Windows console is always a pain, regardless of editor	19:44
githassle	tang^: ok ! that was it	19:44
	thanks guys !	19:44
grawity	it's just, I dunno, console wrappers make it kinda better, but it still feels like talking to an old MS-DOS box, even if it's all native Win32	19:45
	→ koell joined	19:45
osse	githassle: you can configure Git to use your preferred editor	19:45
SamB	grawity: is that because of how slow it is to emulate vt100 on a console, then go right back and use curses (or a more specialized implementation of the same sort of thing) to drive it?	19:45
osse	might be worth the few minutes it takes	19:45
	→ bezet joined	19:46
githassle	osse: i shall look into and try and use wordpad	19:46
tang^	I've seen a number of people use notepad++ as their editor	19:46
osse	notepad++ would do the job perfectly	19:46
	not sure if it has syntax highlighting for it though	19:46
imachuchu	somepeople really like jedit	19:47
	← pheaver left	19:47
	← TimmyTones left	19:48
githassle	is there way to have a compact commit history instead of using "git log"	19:48
	→ TimmyTones joined	19:49
osse	githassle: git log --oneline	19:49
grawity	git log --oneline	19:49
githassle	:D	19:49
osse	you can make an alias	19:49
grawity	plus --decorate	19:49
	plus --graph :D	19:49
tang^	githassle: like !lol ?	19:49
gitinfo	githassle: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	19:49
osse	!rofl	19:49
	← shawndumas left	19:50
	→ nnyk_ joined	19:50
	→ hellolleh joined	19:50
	← martinklepsch left	19:50
	← bezet left	19:50
osse	A niftier view of branches, tags, and other refs, while git log --oneline --graph --decorate --all; do sleep 1; done	19:51
	Megaf_ → Megaf	19:51
tang^	I ran across somebody that was using pretty formats for their logs... seems you could have lots of fun formatting the output	19:51
	← mcc_1 left	19:52
	→ mcc_ joined	19:52
	← mcc_ left	19:52
	← Relsak left	19:52
	→ bartman`` joined	19:53
	← hellolleh left	19:53
	← TimmyTones left	19:53
	→ mcc_ joined	19:53
	→ Relsak joined	19:54
	← koell left	19:54
	← Reskp left	19:54
	→ koell joined	19:55
	→ reaverb joined	19:55
	→ finetux joined	19:55
osse	while clear; git --no-pager log --color=always --oneline --graph --decorate --all \| head -$((LINES - 1)); do sleep 1; done	19:55
	but it's better to find some suitable count yourself instead of \| head	19:57
	→ nodiscc joined	19:57
	→ lindenle joined	19:58
	→ Reskp joined	19:58
	→ nlogn joined	19:59
githassle	thanks for the help guys ! bye	20:00
	→ tgkokk joined	20:00
	← githassle left	20:00
	→ freestyl3r joined	20:00
	→ TimmyTones joined	20:01
	← Relsak left	20:01
	→ shawndumas joined	20:01
	→ Relsak joined	20:02
	← codehotter left	20:03
	← tgkokk left	20:03
	→ dmarkham joined	20:03
	→ francisfish joined	20:04
	→ lsiv568 joined	20:04
	← francisfish left	20:04
	→ tgkokk joined	20:05
	→ francisfish joined	20:05
	→ maestrojed joined	20:05
	← str left	20:05
JesseCW	In the command "git rebase feature master", which branch is "ours" and which is "thiers" if I were specifiying the merge strategy?	20:05
	→ _leb joined	20:05
	→ str joined	20:05
	← zequence_ left	20:05
JesseCW	In my mind, ours would be feature and master would be thiers, but what I'm reading seems to say it's the other way around.	20:05
osse	JesseCW: you are correct	20:06
ojacobson	JesseCW: you've almost certainly spelled that rebase command backwards	20:06
osse	yes, that too :å	20:06
	→ str_ joined	20:06
	→ pcypher joined	20:06
ojacobson	that will take master and replay everything since master diverged from 'feature' on top of 'feature'	20:06
	which is almost certainly the opposite of what you wanted :)	20:06
	→ Vile joined	20:06
	← pcypher left	20:06
	→ pcypher joined	20:07
	← MarionDaly left	20:07
	→ Zariel_ joined	20:07
	→ zequence joined	20:07
JesseCW	Ah, yes, I was going off the manpage and I guess it doesn't specify in the initial example of the command	20:07
	← pcypher left	20:07
	→ MarionDaly joined	20:07
spasysheep	Seveas: the patches are in mailbox format, the original instructions say to apply them with "git am -3". If I cut out the sections identifying the commit and try to apply it as purely a patch, will I break everything? Should I just go through and make the indicated modifications manually?	20:08
	← blackmesa left	20:08
	→ jonascj joined	20:08
	→ pcypher joined	20:08
	← MarionDaly left	20:08
JesseCW	So "git rebase master feature" would rebase feature on master and "ours" would be master and "thiers" would be feature?	20:08
	← pcypher left	20:09
	← gar_onn left	20:09
jonascj	Hi. If I have multiple branches, must I push them all to a remote repo manually (i.e. push each of them)?	20:09
	→ esc joined	20:09
	← esc left	20:09
	→ esc joined	20:09
	→ pcypher joined	20:09
	← pcypher left	20:09
ojacobson	jonascj: that's probably the least-hazardous way to do it, yes	20:09
	→ DaisyTheCow joined	20:09
Seveas	spasysheep: I'd just change the paths and still apply with git-am	20:09
jonascj	Aand is that a sane thing to do? Push your development branch (feature) to a remote repo? Will people get both branches if they just clone the repo?	20:09
	← Reskp left	20:09
	← DaisyTheCow left	20:09
	→ pcypher joined	20:10
preaction	jonascj: only if you care to share the feature branch before it's merged into master	20:10
Seveas	jonascj: depends on your git version and config. yes. yes.	20:10
	← tgkokk left	20:10
	← str left	20:10
major	okay .. I figured out a solution which appears to 'rebase' from a local branch during a pull while allowing a differently named remote branch for 'push'	20:11
	← pcypher left	20:11
	← lsiv568 left	20:11
major	at least .. I hope it works	20:11
Seveas	jonascj: to elaborate on answer one. git versions older than 2.0 by defuault would push all branches, the default in git 2.0 is 'simple' (see !man git-push for a description)	20:11
gitinfo	jonascj: [!remote_commands] The only git porcelain commands which might interact with remote repos are: fetch, pull, push, remote, ls-remote, archive, submodule (plus plumbing, remote helpers, etc)	20:11
	jonascj: the git-push manpage is available at http://jk.gs/git-push.html	20:11
spasysheep	Seveas: ok, thanks	20:11
	→ chisler joined	20:11
jonascj	So if I collaborate with someone on the feature and we share via that remote repo I guess it makes sense...	20:11
	→ dtss joined	20:11
Seveas	jonascj: yeah, and it's good to have a backup :)	20:12
	→ pcypher joined	20:12
jonascj	if one of the collaborators merge the branch into master, commits that and pushes, will the feature branch disappear form the remote repo (i.e. will github, bitbucket etc. show 1 branch again)?	20:12
	← pcypher left	20:13
	← morenoh151 left	20:13
Seveas	jonascj: no. it will point to the last commit before the merge	20:13
	← BreakmanX left	20:14
	→ pcypher joined	20:14
Seveas	remember, branches are nothing more than labels that point to commits.	20:14
	gitinfo set mode: +v	20:14
dtss	hi, Today I stated a question in which I got a lot of reply. Sadly nothing worked. Since I guess my question will help others I tried to explain it on stackoverflow. In case you want to collect some stackoverflow reputation ;-) I kindly ask you to give your best. TY http://stackoverflow.com/questions/24374498/how-to-rebase-git-commits-to-svn-after-having-initialized-the-git-repository-in	20:14
	← pcypher left	20:14
Seveas	merging branch 'dev' into 'master' creates a merge commit and makes 'master' point to it. It leaves the label 'dev' alone.	20:14
	← dsirijus left	20:15
	← nnyk_ left	20:15
	← sea-gull left	20:15
	← Quevin left	20:15
jonascj	Seveas: so the branch will stay there unless deleted (I don't know what happens if it is deleted but I've seen it as common pratice to delete branches after they are merged)	20:15
	leeve → teras	20:15
Seveas	jonascj: deleting a branch only deletes that label. The commits will all be kept.	20:16
	thevishy → yhsiveht	20:16
	→ choffstein joined	20:16
	→ m0viefreak joined	20:16
	→ nnyk_ joined	20:16
	→ sq-one joined	20:16
	→ Reskp joined	20:17
	← Zariel_ left	20:17
	← esc left	20:17
	← teran left	20:18
	← VinceZa left	20:18
	→ pcypher joined	20:18
	→ jottr_ joined	20:18
	→ esc_ joined	20:18
	← _leb left	20:19
	→ himikof joined	20:19
jonascj	Seveas: okay, I guess I will learn what happens to the branch etc. after I've gone farther and actually marged it, deleted it and commited some more. Right now I am confused :)	20:19
	← himikof left	20:20
	← ghostlines left	20:20
osse	JesseCW: correct	20:20
	→ osmosis joined	20:20
model	what is the preferred way to block people from pushing commits to certain branches?	20:21
	← osmosis left	20:22
	→ gandalfcome joined	20:22
Seveas	model: update hook.	20:22
	→ teran joined	20:23
	← jfran left	20:23
	→ hkon_ joined	20:24
	→ morenoh151 joined	20:24
	→ Diemuzi joined	20:24
	gitinfo set mode: +v	20:24
	← teran left	20:24
	← finetux left	20:25
	← dreiss left	20:27
	← DrNick left	20:27
	← str_ left	20:27
	→ veebers joined	20:27
	← TDJACR left	20:28
	← _hockey567 left	20:28
	→ himikof joined	20:28
bremner	model: or gitolite	20:28
	→ hockey567 joined	20:28
	← hkon_ left	20:28
JesseCW	In attempting this, git 1.9.0, "git rebase master --preserve-merges -s recursive -X theirs" I'm getting "fatal: Unknown option for merge-recursive: -X'thiers', what am I doing wrong?	20:28
	← m8 left	20:28
	← FortySix2 left	20:29
moritz	misspelling 'theirs'?	20:29
JesseCW	nm, spelling, ha	20:29
	→ kcj joined	20:30
	← LuxuryMode left	20:31
	← model left	20:31
	→ FortySix2 joined	20:32
	→ pbrobst joined	20:34
	→ knighthawk joined	20:34
	→ teran joined	20:35
	← yhsiveht left	20:35
	→ kyb3r_ joined	20:37
	→ rjurney joined	20:37
	→ cllamas joined	20:37
JesseCW	well, at least that seemed to be it, still giving me the same error, even when using "theirs". I tried it with and without a space.	20:38
	→ DrNick joined	20:40
	→ nfk joined	20:40
	← m0ltar left	20:40
	← jrockjiggz left	20:40
	← Tabmow left	20:40
	← Kulrak left	20:40
	← aucecil left	20:40
	→ Zoddo joined	20:41
	→ Quevin joined	20:42
	← cllamas left	20:42
	← CKyle left	20:42
	→ erickr joined	20:43
	→ CKyle joined	20:43
	← jpierre03 left	20:43
	esc_ → esc	20:43
	← Gizburdt left	20:43
	→ Gizburdt joined	20:44
	esc → esc_	20:44
	→ jpierre03 joined	20:45
	gitinfo set mode: +v	20:45
	← hyperair left	20:45
erickr	Anyone have good insights using subtrees for common shared code between 2 projects? we are using git flow as well, but would love to hear some general experiences about using subtrees if anyone like to share.	20:45
moritz	JesseCW: btw the -s recursive is redunant	20:45
	esc_ → esc	20:46
	→ _leb joined	20:46
moritz	JesseCW: do you have a non-pintable character in your command line, maybe?	20:46
ojacobson	erickr: "don't" :)	20:46
	git is not a replacement for library/dependency management	20:46
	→ cjwilburn joined	20:46
JesseCW	moritz: I noticed in the docs, just going off these stackexchange articles I'm reading. I'm going to compile the latest version and see if it makes a difference	20:46
ojacobson	bower/npm/maven/sbt/cabal/pypi/gems/whatever insane thing OS X has all exist for exactly that job	20:47
	← mattstratton left	20:47
JesseCW	moritz: no non-printables as far as I can can tell, I typed it all out rather than copy/paste.	20:47
	← roymiloh left	20:47
erickr	ojacobson: hmm, well, we want to use it to share "page templates" between 2 wordpress projects,	20:48
ojacobson	oh ow	20:48
	wordpress's dependency management stuff is pretty tragically bad, sorry to hear you're stuck working with it	20:48
	← jluc_ left	20:48
	← cjwilbur_ left	20:48
erickr	ojacobson: yeah, well, we can probably use any tool, I just thought managing it with git would be a good start	20:49
	← Gizburdt left	20:49
	→ finetux joined	20:50
	← sinkensabe left	20:50
	→ tm512_ joined	20:51
	← tm512 left	20:51
erickr	ojacobson: hmm, composer might be a good start perhaps..	20:51
	← ojacobson left	20:51
	← daedeloth left	20:53
	← boris left	20:53
	← JeanCarloMachado left	20:54
	→ Mitchbones joined	20:55
	← D-Boy left	20:55
	→ lucha joined	20:55
	→ shinnya joined	20:57
	← doubled112 left	20:57
	→ zumba_ad_ joined	20:57
	→ Gam joined	20:57
JesseCW	No dice on git 2.0.0 either with this command, "git rebase master feature --preserve-merges -s recursive -Xtheirs", still says "fatal: Unknown option for merge-recursive: -X'theirs'"	20:58
	→ thierryp joined	20:59
	← Hecter left	20:59
	→ BreakmanX joined	21:00
	← jaspertheghost left	21:00
Eugene	!repro an exact paste	21:00
gitinfo	Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will raise the odds of getting your problem fixed from about 30% to about 90%.	21:00
osse	I copied and ran it as you presented it on IRC and it works :O	21:00
	← thierryp left	21:00
	← zumba_addict left	21:00
JesseCW	osse: me?	21:00
	← Baluse left	21:01
	← cjwilburn left	21:01
	→ skylite joined	21:01
osse	you	21:01
	akim__ → akim	21:01
Eugene	Hence, a repro, please.	21:01
	Not just the error message. The real terminal transcript.	21:01
	← irqq left	21:01
	→ Baluse joined	21:01
osse	https://www.youtube.com/watch?v=kxJRnegO1cI	21:03
	ChanServ set mode: +o	21:03
	Eugene kicked osse (a bit with a large trout)	21:03
	Eugene changed the topic to: Welcome to #git, the place for git help and a rumbling stomach \| Current stable version: 2.0.0 \| Start here: http://jk.gs/git \| Getting "cannot send to channel"? /msg gitinfo .voice \| git-fetch: no training required	21:04
	→ jrockjiggz_PC joined	21:04
	→ aucecil joined	21:04
	→ Kulrak joined	21:04
	→ Tabmow joined	21:04
	wilhelm.freenode.net changed the topic to: Welcome to #git, the place for git help and skinny jeans \| Current stable version: 2.0.0 \| Start here: http://jk.gs/git \| Getting "cannot send to channel"? /msg gitinfo .voice \| Remember to keep your porcelain clean	21:04
	→ osse joined	21:04
Eugene	Oy u wot m8	21:04
	Eugene changed the topic to: Welcome to #git, the place for git help and a rumbling stomach \| Current stable version: 2.0.0 \| Start here: http://jk.gs/git \| Getting "cannot send to channel"? /msg gitinfo .voice \| git-fetch: no training required	21:04
	← Vile left	21:04
	← pbrobst left	21:04
JesseCW	I'll get that posted up, it doesn't try to run it unless you have an actual merge conflict though, so it starts the rebase and once it gets to the conflict it throws the error	21:05
osse	ah	21:05
Eugene	My running theory is that you're using the literal -X'theirs' option	21:05
	Mapley → a_sexy_gay_fox	21:05
Eugene	Rather than the quote-less string -Xtheirs	21:05
	← LeMike left	21:05
	← endiruna left	21:05
	→ Annak joined	21:05
	gitinfo set mode: +v	21:06
JesseCW	Nope. Here it is. https://gist.github.com/anonymous/58bc0d4bbef1e217c516	21:06
	→ listochkin joined	21:06
	← chisler left	21:06
Eugene	Hm.	21:06
	→ Hecter joined	21:06
	a_sexy_gay_fox → Maple__	21:06
JesseCW	I've tried with and without a space, same error either way.	21:06
Eugene	What sort of system is this on? Is your bash --version current-ish?(rebase is a shell script, IIRC)	21:07
jonascj	when cloning I only get the master branch? So if the project have multiple branches I will not see them with "git branch", but I have to do "git checkout branchname"?	21:07
	← lamont left	21:07
	→ pbrobst joined	21:07
Eugene	jonascj - only the "default" branch, typically named master, is checkout-ed locally, yes. `git branch -a` will show you the rest of them.	21:07
JesseCW	@Eugene GNU bash, version 4.1.10(4)-release, it's cygwin	21:08
Eugene	Oh, cygwin. HAH! Good luck, you'll need it.	21:08
JesseCW	and I'm compiling git from tarball	21:08
	← Diemuzi left	21:08
SamB	so, if I want to send a patch series in one email using attachments, how should I go about it?	21:08
	← choffstein left	21:08
JesseCW	never had any issues with using it on cygwin before ;<	21:08
	→ RecoJohnson joined	21:08
	→ lamont joined	21:08
Eugene	SamB - man git-bundle	21:08
gitinfo	SamB: the git-bundle manpage is available at http://jk.gs/git-bundle.html	21:08
	← pnkbst left	21:09
jonascj	Eugene: thanks	21:09
osse	SamB: attach all the files format-patch produces, maybe?	21:09
SamB	I was thinking more like what osse said	21:09
Eugene	Either works. Depends if you want one attachment, or one-per-commit	21:09
	Annak → Diemuzi	21:10
osse	I think you can git format-patch ... --stdout > huge.patch	21:10
	and git am will do The Right Thing	21:10
Eugene	Hopefully	21:10
	← yosito left	21:10
	→ D-Boy joined	21:10
	← Arkaniad left	21:11
SamB	I want to send it to the Debian BTS; I think I'll just attach each patch individually. (All two of them.)	21:11
	→ fatalhalt_ joined	21:11
	→ scri66le joined	21:11
osse	yup, it does	21:12
	← finetux left	21:12
SamB	huh, I never actually tried those examples at the end of git-format-patch(1) as written before; I'd always thought they must be typoes ...	21:12
	← scri66le left	21:13
SamB	but what do you know, just saying "git format-patch origin" does do something sensible	21:13
	← dtss left	21:13
	→ dreiss joined	21:13
	→ finetux joined	21:14
	← mxmasster left	21:14
	← RecoJohnson left	21:14
	← fatalhalt left	21:14
	← jatt left	21:15
	← Kicer86 left	21:16
	→ joebobjoe joined	21:16
SamB	hmm, how would the result then be fed to git-am though?	21:17
osse	stdin	21:17
	← jackneill left	21:17
	→ pnkbst joined	21:17
benjwadams	is there anything like git rebase --onto --interactive	21:18
	← rjurney left	21:18
SamB	benjwadams: I'm assuming you already tried the obvious way?	21:18
	→ rjurney joined	21:18
thiago	benjwadams: like?	21:18
	benjwadams: as opposed to exactly that?	21:18
polyzen	!mirror	21:18
benjwadams	sec.	21:19
osse	will it would be git rebase --onto foo --interactive	21:19
	→ VinceZa joined	21:19
	← spasysheep left	21:19
osse	s/will//	21:19
	← jpierre03 left	21:19
	← pcypher left	21:20
	← matheus23 left	21:20
benjwadams	i tried git rebase --onto climatology_multiparam master -i 'HEAD~6'	21:21
	no dice	21:21
osse	what does "no dice" mean in this case, then?	21:22
	← azonirunner left	21:22
benjwadams	probably a syntax error on my part	21:22
	← mcc_ left	21:22
	← _leb left	21:22
benjwadams	no such branch 'HEAD~6'	21:22
	← knownasilya left	21:22
osse	you probably want to leave that one out	21:22
	→ blackmesa joined	21:23
osse	now you're rebasing the commits from master to HEAD~6 onto climatology_multiparam	21:23
	← nour left	21:23
osse	what about what you currently have checked out?	21:23
benjwadams	master	21:24
	← adkins left	21:24
osse	what is HEAD~6 then?	21:24
benjwadams	nothing!	21:25
	← sq-one left	21:25
osse	if you have master checked out then I suspect you want a plain git rebase -i climatology_multiparam	21:25
benjwadams	I'm a bit confused. i removed a file from master permanently using reset --hard	21:25
	← codeurge left	21:25
benjwadams	that commit was the commit i branched off of	21:26
	my branch looks disconnected in gitk	21:26
	i'm trying to rebase against the previous commit	21:26
	← teran left	21:26
major	hmmm .. seems my config is not quite doing what I want..	21:27
	→ jstimm joined	21:27
major	really starting to think git would need patched in order to support doing this...	21:27
benjwadams	I'd like to fix that dangling reference from the branch	21:27
SamB	!picpaste	21:28
major	https://gist.github.com/major0/498f83a8606d4b1c5f54	21:28
	→ Blaster joined	21:30
	← Blaster left	21:30
	→ Blaster joined	21:30
Blaster	Hey when I type git diff it says -- More -- but pressing page down or down arrow doesn't scroll it anymore.	21:30
	→ Nicholas_Rishel joined	21:30
	← kermit left	21:31
xender	Blaster: what about enter?	21:31
	And you don't have less?	21:31
	← tranzfuse left	21:31
xender	less is more :D	21:31
	← morenoh151 left	21:31
	← Zoddo left	21:31
Blaster	xender, Yes enter works, but I want my page down or arrow keys back :'(.	21:31
xender	Blaster: Do you have less installed?	21:32
Blaster	The CSS preprocessor?	21:32
	Yes I do, but how is that related?	21:32
xender	:D	21:32
	Nope, not that less	21:32
Blaster	This worked earlier today so I don't know what happened.	21:32
xender	Less command	21:32
	echo a \| less	21:33
	← pnkbst left	21:33
Blaster	Oh right, I think I apt-get removed that package when I was trying to fix the CSS preprocessor. Didn't know about this one.	21:33
	Cool.	21:33
	← mmitchell left	21:35
	→ Guest351O2 joined	21:35
	→ mmitchell joined	21:35
	← mmitchell left	21:35
	→ pnkbst joined	21:36
xender	Ouch :P	21:36
	← barcode left	21:36
bremner	that apt-get. so naughty.	21:36
	→ pcypher joined	21:37
	← polyzen left	21:37
	← kcj left	21:37
	← joebobjoe left	21:37
	→ jpierre03 joined	21:39
	← Reskp left	21:39
	← rjurney left	21:40
	→ rjurney joined	21:41
	← JerryT left	21:41
	← dougsland left	21:43
	← shingshang left	21:43
	→ teran joined	21:44
	→ Reskp joined	21:44
	→ bezet joined	21:46
	← lucha left	21:46
	→ duderonomy joined	21:48
	→ Balliad joined	21:49
	→ kermit joined	21:49
	← GodEater left	21:49
	← VinceZa left	21:50
	← bezet left	21:50
	← hebz0rl left	21:51
	← Thra11 left	21:51
	← homework1 left	21:52
	← Hecter left	21:52
	← finetux left	21:52
	→ wondiws joined	21:53
	← mennea left	21:53
	← aberrant left	21:53
wondiws	is there a place where I can find binaries of the Git client for old versions of windows?	21:53
	→ aberrant joined	21:53
aberrant	oy.	21:54
	← nfk left	21:54
	← kriks left	21:55
	← aberrant left	21:55
	→ GodEater joined	21:55
	← GodEater left	21:55
	→ GodEater joined	21:55
	→ aberrant joined	21:55
	→ m0ltar joined	21:56
	← a_le left	21:56
	← tang^ left	21:57
	→ gattuso joined	21:57
	→ finetux joined	21:58
	← Dougie187 left	22:00
zmuser3	how can I undo a particular commit? I did git rm on two files and removed a line from a couple other files	22:00
	← dev_as0 left	22:00
	→ ShooterMG joined	22:00
	→ Hecter joined	22:01
zmuser3	(already pushed)	22:01
Seveas	!man git-revert	22:01
gitinfo	[!remote_commands] The only git porcelain commands which might interact with remote repos are: fetch, pull, push, remote, ls-remote, archive, submodule (plus plumbing, remote helpers, etc)	22:01
	the git-revert manpage is available at http://jk.gs/git-revert.html	22:01
zmuser3	ok thanks	22:01
Seveas	hmm, why is gitinfo spewing two lines?	22:01
	!man	22:01
gitinfo	[!remote_commands] The only git porcelain commands which might interact with remote repos are: fetch, pull, push, remote, ls-remote, archive, submodule (plus plumbing, remote helpers, etc)	22:01
Seveas	man git-revert	22:02
gitinfo	the git-revert manpage is available at http://jk.gs/git-revert.html	22:02
Seveas	ahh....	22:02
	← qwyeth left	22:02
	→ akushner_ joined	22:02
	→ mizu_no_oto joined	22:02
	→ JeanCarloMachado joined	22:02
zmuser3	how can I confirm I have the right commit number?	22:03
	is there a way to say... tell me what happened for this commit	22:03
Nugget	git show <hash>	22:03
zmuser3	nice. especially since I had the wrong one heh	22:04
	← FortySix2 left	22:04
	← donmichelangelo left	22:05
	← as_ left	22:06
	← akushner left	22:06
	← leeN left	22:06
	← erickr left	22:08
	← nehaljwani left	22:09
Celelibi	Does git submodule only work for a subdirectory?	22:09
	Or can I use to mix the files?	22:09
	use it*	22:09
	← milli left	22:10
	→ northfurr joined	22:10
SamB	Celelibi: you probably don't want to use it	22:10
	it's a lot more trouble than you're likely to anticipate	22:10
Celelibi	err, subdirectory, not submodule.	22:10
SamB	hmm?	22:10
Celelibi	It's subtree!	22:11
	(I forgot the name.)	22:11
	git-subtree.	22:11
	→ alanwikid joined	22:12
	→ hkon_ joined	22:12
	→ FortySix2 joined	22:12
	→ Aleks3Y joined	22:13
	← Quevin left	22:13
	→ rlazoti joined	22:13
	← sgambino left	22:13
	→ deanclkclk joined	22:16
	← Guest351O2 left	22:16
	← hkon_ left	22:16
	Maple__ → a_sexy_gay_fox	22:16
major	okay, I can confirm that this isn't working as I had hoped .. any ideas/suggestions? https://gist.github.com/major0/498f83a8606d4b1c5f54	22:17
	← pbrobst left	22:17
	→ ojacobson joined	22:18
	← upene left	22:18
	← Diemuzi left	22:18
	→ FreezingCold joined	22:18
	← mjsmith2 left	22:18
	→ hyperair joined	22:19
	← mizu_no_oto left	22:19
	← rjurney left	22:19
Eugene	What isn't working right?	22:19
	← shruggar left	22:19
	← hyperair left	22:19
ojacobson	computers	22:20
	a_sexy_gay_fox → Mapley	22:20
Eugene	YOu may need to specify a full refspec for branch.blah.merge	22:20
	Eg, refs/heads/master	22:20
major	Eugene, I want pull to come from 1 branch and push to go somewhere else	22:21
	→ rjurney joined	22:21
Eugene	Yes, I get that.	22:21
major	kk	22:21
	→ sdrfnord1 joined	22:21
Eugene	Line 15, change it to merge = refs/heads/master	22:21
	A full refspec, not a "short" one	22:21
major	understood, and changed	22:21
Eugene	I'm actually not sure on what'll happen on push	22:22
	← dobalina left	22:22
major	exactly :(	22:22
	← deanclkclk left	22:22
Eugene	This might not be possible with the current family of branch.foo. options	22:23
	Eugene reading man page now	22:23
major	I have found similar inquiries on StackOverflow, but people seemed to misunderstand the question and gave sort of odd naswers	22:23
Eugene	Yeah	22:23
major	worse is I think I can pull it off using multiple repos	22:23
	→ r0ok joined	22:23
ojacobson	the magic phrase for this on the !list archives is "triangular workflow"	22:23
gitinfo	[!official] Some official resources for git. Homepage: http://git-scm.com/ \| Source repo: https://www.kernel.org/pub/scm/git/git.git/ (Mirrrored: https://github.com/git/git/) \| IRC channel: You're in it. \| Mailing list: http://vger.kernel.org/vger-lists.html#git	22:23
	← lllshamanlll left	22:23
major	having a pqm repo that I push to that has the same names as the "tested" repo (origin)	22:24
	← fatalhalt_ left	22:24
	← paul424 left	22:24
Eugene	The trick is he's using a different branch name on the three legs	22:24
	← FortySix2 left	22:24
	→ paul424 joined	22:24
Eugene	rebasing local feature branch onto origin/master, and then pushing to personal repo's feature branch	22:24
major	yah, gitolite allows you to trigger a script based on the pushed branch name	22:24
	so we went that route as it "felt" easier	22:24
Eugene	I'm not sure what PQM stands for here, GOogle suggests Publican QUality Meats.	22:25
major	as opposed to having a "tested" repo and a "submission" repo	22:25
Eugene	While appealing culinarily, i don't think that's quite right.	22:25
major	Patch Queue Management	22:25
	the original pqm software that did something like this is back from tla/archera and bazaar	22:25
	← sdrfnord1 left	22:25
major	it operated via signed email and all, similar concept	22:25
Eugene	Hunt through the list archives per ojacob.	22:25
	→ rednaks joined	22:25
Eugene	I would implement this without the rebase/pull stuff if it were me	22:26
major	I was mostly trying to automate it from the end-user end	22:26
Eugene	(actually I would make this into a nasty wrapper for `git pull`, but I'm already doing evil things in bash)	22:26
	→ cllamas joined	22:26
major	all pulls onto a personal branch tend to be rebase from the parent	22:26
	← beastd left	22:26
major	I mostly figured it wouldn't be all that difficult .. or assumed the problem was just that trivial	22:27
	seems to mostly be a configuration issue really	22:27
	everything else about the workflow already works	22:27
Eugene	The issue is the branch names being different	22:27
	Everything else you've got good	22:27
	But there needs to be a separate option, branch.<foo>.push	22:28
	Which doesn't exist	22:28
	To the mailing list!	22:28
major	yah	22:28
	← shawndumas left	22:28
Eugene	The rebasing is irrelevant	22:28
major	I figured that was the case already .. mentioned it earlier in the channel	22:28
	oh, I know, just reduces waiting on pull to figure things out	22:29
	→ leb joined	22:29
	← fr33domlover left	22:29
major	the pqm already rejects push requests if the push isn't a child of the current master head	22:29
	← moritzs left	22:29
major	can't ff to the submission then it blows up w/out testing	22:29
	→ molqr joined	22:30
	→ JosephFerano joined	22:30
	→ tang^ joined	22:30
	→ fr33domlover joined	22:30
	→ Quevin joined	22:30
	← cllamas left	22:31
	← GT left	22:31
	← skylite left	22:31
	← Guest15213 left	22:32
	← paul424 left	22:32
	← jon_r left	22:32
	→ LuxuryMo_ joined	22:33
	→ codeurge joined	22:34
	→ jon_r joined	22:34
major	I guess the other nice thing about this approach is that branches that do not have 'pqm' in the name like this are not tested, which allows for developers to share code via the central server fairly easily	22:34
	← jon_r left	22:35
	← JeanCarloMachado left	22:36
	→ bbloom joined	22:36
	← LuxuryMo_ left	22:36
	← dmarkham left	22:37
	← crxz0193 left	22:38
	← Balliad left	22:38
	→ LuxuryMode joined	22:39
	→ lsiv568 joined	22:39
	← kermit left	22:40
	→ JeanCarloMachado joined	22:40
	← LuxuryMode left	22:41
	→ Apocalis_ joined	22:41
	← dreiss left	22:41
	← finetux left	22:42
	→ milli joined	22:42
	→ pbrobst joined	22:43
	← kevinold left	22:44
	→ dmarkham joined	22:45
	→ chreuben joined	22:45
	← Reskp left	22:46
	← WaReZ left	22:46
	→ a_le joined	22:46
	← TimmyTones left	22:47
	← viscera left	22:47
	→ finetux joined	22:47
	→ a_le_ joined	22:48
	→ oojacoboo joined	22:49
	← lsiv568 left	22:50
	→ JerryT joined	22:50
	← jottr_ left	22:50
	→ jon_r joined	22:50
	→ kermit joined	22:51
	→ styx__ joined	22:51
	→ sinkensabe joined	22:51
	← a_le left	22:52
	← styx__ left	22:52
	→ alanwikid_ joined	22:53
	← mtk left	22:54
	← alanwikid_ left	22:54
	← alanwikid left	22:55
	← sinkensabe left	22:56
	← francisfish left	22:57
	← pcypher left	22:57
	← kermit left	22:57
	← Gam left	22:57
	← elbeardmorez left	22:59
	→ madewokherd joined	22:59
	→ toothr joined	22:59
	← Mitchbones left	23:00
	← ItSANgo_ left	23:01
	→ shawndumas joined	23:02
	← leb left	23:02
	← nodiscc left	23:02
	→ Guest351O2 joined	23:02
	← ehmatthes left	23:02
	Apocalis_ → Apocalisp	23:02
	← dangerousdave left	23:03
	→ roth_philip joined	23:04
	← blackmesa left	23:04
	→ alanwikid joined	23:04
	toothr → toothrot	23:04
	← freestyl3r left	23:04
	→ pcypher joined	23:05
	← akushner_ left	23:05
	→ akushner joined	23:05
	← groolot left	23:06
	→ _leb joined	23:06
	← ckyle_ left	23:07
	← listochkin left	23:07
	→ ferreum158 joined	23:08
	← dik_dak left	23:08
	→ Breakman_ joined	23:09
	← Breakman_ left	23:10
	← cobakobodob left	23:10
	→ dreiss joined	23:10
	← _leb left	23:11
	→ Breakman_ joined	23:11
	← ojdo left	23:11
	← ferreum_ left	23:11
	→ ojdo joined	23:11
	→ wilirius joined	23:12
	← axl_ left	23:12
	→ sea-gull joined	23:13
	← BreakmanX left	23:13
	→ dsdeiz joined	23:13
	→ ojacobson_ joined	23:14
	→ TimmyTones joined	23:14
	→ kevinold joined	23:14
	← jstimm left	23:15
	← JDHawke left	23:15
	← blorbx left	23:15
	→ JDHawke joined	23:16
	← ojacobson left	23:17
	← a_le_ left	23:17
	← akim left	23:18
	→ a_le joined	23:18
major	interesting .. builtin/push.c has a bunch of triangular workflow references .. but not for a central repo .. more like .. a github workflow	23:18
	← shawndumas left	23:18
	→ shawndumas joined	23:19
	← kevinold left	23:19
	← himikof left	23:19
	← jon_r left	23:20
	← kenneth left	23:21
	← mikecmpbll left	23:22
	→ dtss joined	23:22
	→ kevinold joined	23:22
	← dts left	23:22
	← a_le left	23:22
	→ viscera joined	23:22
	→ Arkaniad joined	23:24
	→ gargola_ joined	23:24
	← txomon\|home left	23:26
	→ justinsd joined	23:26
	gitinfo set mode: +v	23:26
justinsd	Hey guys. Does anyone have any idea what would be causing something like this	23:26
	fatal: git-http-push failed	23:26
	error: Cannot access url: return code 22	23:27
	When doing a git push	23:27
	→ marscher joined	23:27
	← kevinold left	23:27
	← jcvfen_ left	23:28
	← shawndumas left	23:28
	← marscher left	23:29
	→ kenneth joined	23:29
	→ Rich_52696368_ joined	23:31
	← Breakman_ left	23:32
	→ mikecmpbll joined	23:32
	→ tpollard joined	23:33
	← pcypher left	23:34
	→ darkbasic joined	23:34
	← rednaks left	23:35
	← akushner left	23:35
	← roth_philip left	23:35
	→ jontmorehouse joined	23:36
	← stamina left	23:36
	← tang^ left	23:37
	→ cobakobodob joined	23:37
	← mikecmpbll left	23:37
darkbasic	hi, I remember I read something like a git "snapshot". if you are working on master and you need to push a quick commit, then you do a snapshot of your work (you still don't want to commit it), you push the the quick fix and then you restore to the exact state you were working before. am I dreaming or something similar to a git snapshot really exists?	23:37
	← jonmorehouse left	23:38
madewokherd	stash?	23:38
darkbasic	madewokherd: exactly, thanks	23:39
	→ colinbowern joined	23:39
	→ iamabigstone joined	23:39
	gitinfo set mode: +v	23:39
colinbowern	I was wondering if someone could shed light on what HEAD^{tree} means in a git commit-tree call (from http://stackoverflow.com/a/23486788/79842)	23:40
	← chreuben left	23:40
	← fresham left	23:40
	← Motoko left	23:41
	→ gwb3 joined	23:42
	← gwb3 left	23:42
	→ gwb3 joined	23:42
	← echo-area left	23:42
colinbowern	Bueller, Bueller, anyone? :)	23:42
ojacobson_	colinbowern: man gitrevisions	23:42
gitinfo	colinbowern: the gitrevisions manpage is available at http://jk.gs/gitrevisions.html	23:42
colinbowern	thanks!	23:43
	← wondiws left	23:43
	→ Lyqyd joined	23:43
ojacobson_	git-commit-tree, being plumbing, doesn't have the same object-coercion logic that something like 'git log' does	23:44
	→ pcypher joined	23:44
ojacobson_	it wants a tree; if you give it a thing that unambiguously points to a tree, like a commit or a tag, it's still sad	23:44
	← gandalfcome left	23:44
	← dreiss left	23:45
	← jwmann left	23:46
	→ jyg joined	23:46
	→ bezet joined	23:46
	→ Reskp joined	23:46
jyg	Hi. I'm trying to use git for productizing a Drupal project. I'm at a point where I basically have a whitebox product developed from Drupal from which I can create client-specific sites, each with different theming. So the main Drupal core will rarely change, but the theming directory will change dramaticallyfor each product	23:48
	→ ItSANgo joined	23:48
jyg	I thought of using subthemes, but I believe that's for the opposite scenario, where its not some inner directory that would change often but the outer code that would be product-specific	23:48
	← codeurge left	23:48
nlogn	o_O	23:48
	← nlogn left	23:49
	← jrockjiggz_PC left	23:49
jyg	the only thing I've been able to come up with, that I really don't like, is to have Drupal core as a repo and then ignore on a theme directory	23:49
	and load a wholly different repo for the client-specific theme	23:49
	so i basically use two repos within the same site, one that secretly resides within the other	23:50
	what don't you get nlogn?	23:50
	er, sorry, above I didnt mean "subthemes" but "submodules"	23:50
	mixing my gitese and my drupalese	23:51
	← lindenle left	23:51
	← bezet left	23:51
	← Reskp left	23:51
	→ alanwikid_ joined	23:51
	← alanwikid_ left	23:51
	← alanwikid left	23:51
	→ jrockjiggz joined	23:51
	→ alanwikid joined	23:52
	→ codeurge joined	23:52
	← St_Marx left	23:53
	← yacks left	23:53
	→ mennea joined	23:53
	← balazs left	23:54
	← mennea left	23:54
	← finetux left	23:54
	← Quevin left	23:54
	← colinbowern left	23:55
	← Hecter left	23:55
	← codeurge left	23:56
	← TimmyTones left	23:56
	→ Entomo joined	23:57
	→ dreiss joined	23:57
	→ codeurge joined	23:58
	← milli left	23:58
	← kevinb left	23:59

Logs Search ←Prev date Next date→

Channels Documentation