IRCloggy #git 2014-11-25

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-11-25
	→ govg joined	00:01
	← teamnoir left	00:02
	← pmallya left	00:02
	→ phantombeta joined	00:03
	← WaReZ left	00:03
	← beneggett left	00:04
	← phantombeta left	00:05
	→ phantombeta joined	00:05
	← millr\|wrk left	00:06
	→ shinnya joined	00:07
	→ kukks joined	00:07
	← steele left	00:08
	→ fstd joined	00:08
	→ liamkeily joined	00:10
	← akiva left	00:11
	← richardlitt left	00:12
thedudez0r	how can one quickly get a list of all the files that are being tracked	00:13
	without showing any of the untracked files, like git status does	00:13
	I can do something like "git status\|less", but I'm wondering if there is a more direct approach	00:13
	→ Gitzilla joined	00:14
thedudez0r	it's useful when the git is only keeping track of say 10 files in a folder made of 100's of files	00:14
	→ tranzfuse joined	00:14
dzho	thedudez0r: populate .gitignore?	00:14
	← phantombeta left	00:15
	← iamjarvo left	00:15
	← harish left	00:15
	← baweaver left	00:16
	→ phantombeta joined	00:16
	← h4ml3t left	00:16
	← RTG` left	00:17
	← zhxt_work left	00:17
thedudez0r	I'd rather stick to "git status\|less" then, the idea of populating a file with 100's of entries doesn't sound appealing to me atm	00:18
	← chrisshattuck left	00:18
thedudez0r	no matter how cleverly I could do it	00:18
	← tranzfuse left	00:19
ojacobson	'git status' should be empty under normal operation anyways -- lots of other operations are saner that way	00:19
	→ hexagoxel_ joined	00:19
ojacobson	eg. properly-configured ignores will stop 'git add' from mistakenly tracking files you don't want tracked	00:19
	→ nettoweb joined	00:19
	→ EminenceHC joined	00:19
	← hexagoxel_ left	00:20
	→ mvensky joined	00:20
	→ hexagoxel_ joined	00:21
	→ APerson_ joined	00:21
dzho	or perhaps rethinking the structure of your directory and its subdirectories	00:21
	← hexagoxel left	00:21
	← hexagoxel_ left	00:21
	→ hexagoxel joined	00:21
thedudez0r	dzho: it's a repo I have set on my $HOME directory, which is permanently a big mess of files and folders	00:22
dzho	ugh, yeah	00:22
	← leeN left	00:22
dzho	thedudez0r: In that sort of situation, then, I ignore everything and then use !foo to unignore foo	00:22
gitinfo	thedudez0r: bar	00:22
	← devoldmx left	00:22
dzho	d'oh	00:22
thedudez0r	ojacobson: yeh I just realised taht git status isn't even useful for what I'm looking for since the only tracked files that it displays are the ones that have been modified, or newly added	00:23
	dzho: that's more like it	00:23
	so what, you create a .gitignore file with something like "./*" in it?	00:24
dzho	just a big old * at the top	00:24
	← EminenceHC left	00:24
	← Etheco left	00:24
dzho	and then subsequent lines that each begin with a bang and perhaps have some patterns in them	00:24
	→ RTG joined	00:25
	← n-st left	00:25
dzho	I don't know this is the best approach, just that it makes it tractable for me to start sorting out some directories I have that are huge messes.	00:25
	RTG → Guest74546	00:25
kadoban	dzho: I suspect that that actually won't work well. Remember that inverse patterns don't work if the directory that contains the file you're trying to bring back in is itself ignored.	00:25
	← Consuela left	00:26
dzho	kadoban: I have run into that, yes.	00:26
kadoban	dzho: If it's really only a few files though, you can just --force add them and it won't matter that they're ignored maybe.	00:26
	← Spacew00t left	00:26
	→ devoldmx joined	00:27
	→ ropav joined	00:27
	← Sadi left	00:28
	← s8321414 left	00:28
	← a_le left	00:28
	← KONIG left	00:28
	→ a_le joined	00:29
	→ cagedwisdom joined	00:29
	← ManikM left	00:29
	→ ManikM joined	00:29
	→ zhxt joined	00:30
	→ baweaver joined	00:30
	← netj left	00:33
	← a_le left	00:33
	→ netj joined	00:33
	→ a_le joined	00:33
	→ spyroboy joined	00:34
	← tyreld left	00:35
	← fstd left	00:35
	← nettoweb left	00:36
	← Pyrogerg left	00:36
	→ in_deep_thought joined	00:36
	← nfk left	00:36
	← Bryzzle left	00:36
	← thiago left	00:38
	← hexagoxel left	00:38
	→ thiago joined	00:40
	→ ra0 joined	00:43
	→ kurstin joined	00:43
	← tmz left	00:43
	→ madewokherd joined	00:44
	→ LifeBlood joined	00:44
	← Takle left	00:45
	→ awkwardusername joined	00:47
	→ checkItOut joined	00:47
	← osfe left	00:48
	← occupant left	00:48
	→ jonatasnona joined	00:49
	← liamkeily left	00:49
	→ Lyqyd joined	00:49
	← checkItOut left	00:50
	→ checkItOut joined	00:51
	← cannonball left	00:51
	← dregad left	00:52
	← meltdown left	00:52
	← checkItOut left	00:52
	← t0th_-___ left	00:53
	→ Lyqyd_ joined	00:55
	→ bhws joined	00:56
	→ Pyrogerg joined	00:57
	← Lyqyd left	00:57
	→ AndroUser2 joined	00:58
	→ reaverb joined	00:59
	← JosephFerano left	00:59
	← Noldorin left	01:00
	← hahuang61 left	01:00
	→ nettoweb joined	01:01
	← crystal77 left	01:03
	→ sgen joined	01:03
	← baweaver left	01:04
	← dreiss left	01:05
	← moritzschaefer left	01:05
	→ crystal77 joined	01:06
	← ropav left	01:07
	← yazdmich left	01:07
	→ yazdmich joined	01:08
	← checkit left	01:08
	← teran left	01:09
	→ weiyang joined	01:09
	← Neozonz left	01:10
	← ra0 left	01:12
	→ Consuela joined	01:13
	← nettoweb left	01:13
	→ iamjarvo joined	01:14
	← iamjarvo left	01:14
	→ Bryzzle joined	01:14
	→ iamjarvo joined	01:14
	← a_le left	01:17
	→ baweaver joined	01:17
	← iamjarvo left	01:17
	← Streward left	01:17
	→ dreiss joined	01:17
	← jonatasnona left	01:19
	← bhws left	01:19
	→ smccarthy joined	01:20
	→ msmith joined	01:21
	← robustus left	01:21
	← ajustrun left	01:21
	← LucasTT_ left	01:21
	→ ajustrun joined	01:22
oojacoboo	how can I git reset --hard to a previous commit without there being issues with the head?	01:22
	→ robustus joined	01:23
oojacoboo	it seems when I go to push these changes, it's telling me that local head isn't at the tip with remote	01:23
	→ otter768 joined	01:23
	← zapb_ left	01:23
	← msmith left	01:23
	→ iamjarvo joined	01:23
	→ EminenceHC joined	01:23
	← iamjarvo left	01:23
oojacoboo	do I want to do a rebase? I'm not quite sure what's the best approach to handle the situation	01:24
	→ iamjarvo joined	01:24
	← iamjarvo left	01:24
	← listochkin left	01:25
	→ iamjarvo joined	01:25
oojacoboo	kurstin please do not PM me your spam	01:25
	→ rchavik joined	01:26
	→ ra0 joined	01:26
	→ aynik joined	01:26
	← otter768 left	01:28
	← EminenceHC left	01:28
	→ hgl joined	01:28
	→ zapb_ joined	01:28
	← AndroUser2 left	01:30
	→ ascarter joined	01:30
	→ AndroUser2 joined	01:30
	← shinnya left	01:30
	← madewokherd left	01:30
	← acharlieh left	01:31
	← ascarter left	01:32
	→ jonatasnona joined	01:32
	← dreiss left	01:34
	← iamjarvo left	01:35
	← AndroUser2 left	01:36
	← danemacmillan left	01:36
	← Guest74546 left	01:37
	→ danemacmillan joined	01:37
	→ a_le joined	01:37
	← in_deep_thought left	01:38
	→ metateck joined	01:38
	→ jason237 joined	01:38
	← Zupoman left	01:39
	← devoldmx33 left	01:39
	→ jb55_ joined	01:40
	← Pyrogerg left	01:41
	← MattMaker left	01:43
	← jb55 left	01:43
	→ MattMaker joined	01:43
	← jb55_ left	01:44
	→ john_doe_jr1 joined	01:45
	→ Takle joined	01:46
	→ bhws joined	01:47
	← danemacmillan left	01:48
	→ devoldmx33 joined	01:49
	← john_doe_jr1 left	01:50
	← Takle left	01:50
	← Sasazuka left	01:51
	← booboy left	01:52
	→ Rastus_Vernon joined	01:54
	→ msmith joined	01:55
	→ wabash joined	01:55
	→ tmcmahon joined	01:56
	→ Lyqyd joined	01:56
	→ Noldorin joined	01:57
	→ Motoko joined	01:57
	→ wjiang joined	01:57
	← Lyqyd_ left	01:58
	← chrisgeo left	01:59
	← arnaud___ left	02:00
	← MadLamb left	02:00
	→ daito joined	02:01
	← weiyang left	02:02
	→ tranzfuse joined	02:03
	→ bob14 joined	02:04
	← pekster left	02:05
	→ bq joined	02:05
	← tmcmahon left	02:06
bq	anyone help this issue? http://paste.ubuntu.com/9224327/	02:07
	← Noldorin left	02:07
	→ skorgon joined	02:07
	← skorgon left	02:07
	→ skorgon joined	02:07
	→ fstd joined	02:07
Motoko	Looks like there's a directory with a : in the name.	02:08
	← tranzfuse left	02:08
	← AaronMT left	02:08
	← wabash left	02:08
Motoko	Not sure of a good way to solve that.	02:08
	← msmith left	02:08
	← knownasilya left	02:09
	bob14 → joey77	02:09
	← kballou left	02:09
	→ teran joined	02:09
bq	hm really? why the hell put a : in the path?	02:10
	← zumba_addict left	02:11
Motoko	No idea, and I could be reading that wrong.	02:11
	→ zumba_addict joined	02:11
bq	any workaround?	02:11
	← s00pcan left	02:12
	→ dreiss joined	02:12
Motoko	I'm not aware of any, but one of the more experienced people may know when they see this.	02:12
	→ danemacmillan joined	02:13
bq	there is indeed a : in the path from the github source	02:13
	← mvensky left	02:14
	← kpreid left	02:14
joey77	Can someone help me out? I want to fix a bug in a project on Github. I forked the project a few months ago and made a bunch of changes that the project owner didn't want so they weren't merged into the original repo. Now I want to fix a bug in that project I originally forked from, how can I do this? I don't think I can fork the repo because my project is already forked form there. Do I need to create a new repo and then move my fork to the	02:15
	repo, and then fork the original again so I can fix the bug and then do a pull request?	02:15
	← teran left	02:15
	→ Vampire0 joined	02:15
	← whomp left	02:16
	← zumba_addict left	02:16
	→ atran joined	02:16
	→ Noldorin joined	02:16
Motoko	You'll probably need to reset HEAD to the status of the upstream, then make your changes on a new branch cut from that point.	02:16
	→ zumba_addict joined	02:16
Motoko	If you're planning to use pull requests, make all changes in a branch you can submit as a PR.	02:16
	← CheckDavid left	02:17
	← pheaver left	02:17
joey77	Motoko: Ok, will that mess up the fork I have now? I need to keep my fork in tact	02:17
Motoko	Make a new branch from your head.	02:18
	Switch to that and delete the old branch name.	02:18
	← dreiss left	02:18
Motoko	Checkout the last clean rev from your fork.	02:18
	It'll complain about detached head.	02:18
roo	(testing)	02:18
Motoko	Make a new branch from that checkout with the same name you deleted.	02:18
	← Vampire0_ left	02:18
Motoko	That'll fix the structure.	02:19
	You'll need to force-push to put up your changes.	02:19
	Also, do this on a copy of the clone.	02:19
	Don't want to break things.	02:19
	← kurstin left	02:20
joey77	Motoko: ok im going to type up the steps and verify them with u before I do it lol	02:20
Motoko	Sure.	02:21
	→ jb55 joined	02:21
Motoko	But do make sure to do the work on a copy. You're manipulating history, and it's messy and risky.	02:21
	← zumba_addict left	02:22
	← St_Marx left	02:22
	→ zumba_addict joined	02:22
	→ msmith joined	02:23
	← jonatasnona left	02:26
	→ EminenceHC joined	02:27
	← zumba_addict left	02:27
	→ whomp joined	02:27
	→ zumba_addict joined	02:28
	← ManikM left	02:29
	→ ManikM joined	02:29
joey77	motoko: Can you check out the steps here? I dont think I have it right… https://gist.github.com/theDazzler/f0b0da3b2b72bf1a3efb	02:29
	← EminenceHC left	02:31
Motoko	One second	02:32
	← APerson_ left	02:33
Motoko	Not quite.	02:33
	Find the hash for the last change before you started your work.	02:33
	← baweaver left	02:34
joey77	I havent started to fix the bug yet in the original repo	02:34
	unless you mean from 3 motnsh ago	02:34
	months*	02:34
	← aynik left	02:35
Motoko	Yes, that.	02:35
	Stevie-O → Guest56598	02:35
joey77	a good analogy might be this: I forked linux 3 months ago, created knoppix with my fork, linux rejected my pull request, now i want to make a bug fix in linux repo, but i still have knoppix fork	02:35
bq	Motoko: how to i revert that checkout?	02:36
	→ JosephFerano joined	02:36
	→ baweaver joined	02:37
Motoko	http://paste.animeneko.net/view/f5aa2f90	02:37
	That should be it.	02:37
	→ Goplat joined	02:37
Motoko	You do a "git checkout HASH"	02:37
	The output will complain about "detached head". That's fine.	02:37
	← LifeBlood left	02:37
joey77	Motoko: ok taht makes sense, ill try it	02:37
	thanks	02:38
Motoko	From memory, but I have done that before.	02:38
	← zumba_addict left	02:38
Motoko	Once you're back to that, you can pull the upstream back into your copy and then branch off and make your bugfix on that branch.	02:38
joey77	ok	02:39
	→ zumba_addict joined	02:39
Motoko	See https://help.github.com/articles/fork-a-repo/#keep-your-fork-synced	02:39
	→ APerson_ joined	02:39
	→ St_Marx joined	02:40
	← devoldmx left	02:41
	← d10n-work left	02:41
bq	how do i delete a directory on remote master?	02:42
	← bhws left	02:42
	← eric___ left	02:43
	← ajustrun left	02:44
	← crystal77 left	02:44
	→ bb010g joined	02:45
	→ pekster joined	02:47
	→ LifeBlood joined	02:48
	← whomp left	02:49
	← daito left	02:49
	→ ome joined	02:51
	← adamben left	02:52
	← a_le left	02:54
	← webguy left	02:54
	→ bhws joined	02:55
	→ tchan joined	02:56
	← kukks left	02:56
	→ kerrick joined	02:56
	← hypera1r left	02:57
	→ blip joined	02:58
	blip → Guest51182	02:58
	→ hyperair joined	02:59
	← Guest51182 left	03:00
	← Bryzzle left	03:00
	← baweaver left	03:00
	← reaverb left	03:02
	→ Guest68364 joined	03:02
	→ tranzfuse joined	03:04
	← darkbasic left	03:04
	lewellyn → ihateyou	03:04
	ihateyou → lewellyn	03:05
	→ Patch joined	03:05
	→ darkbasic joined	03:05
	← Guest68364 left	03:07
	→ weiyang joined	03:07
	← tranzfuse left	03:09
	→ Droolio joined	03:09
	→ echo-area joined	03:10
	→ watabou joined	03:11
	→ tranzfuse joined	03:11
	← NoNMaDDeN left	03:11
	→ pullphinger joined	03:12
	← sgen left	03:14
	← zumba_addict left	03:14
	→ zumba_addict joined	03:15
	→ dreiss joined	03:16
	→ Takle joined	03:17
	→ daito joined	03:17
	← ra0 left	03:20
	← joey77 left	03:20
	← wjiang left	03:20
	→ wjiang joined	03:20
	→ andrew__ joined	03:20
	→ Literphor joined	03:21
	→ snuffeluffegus joined	03:21
	← Takle left	03:21
	← dsantiago left	03:22
	← jb55 left	03:24
	→ Life-Blood joined	03:24
	→ otter768 joined	03:24
	← LifeBlood left	03:24
	→ jb55 joined	03:24
	→ dsantiago joined	03:25
	← paulweb5151 left	03:26
	→ tristanp joined	03:27
	← awkwardusername left	03:27
	→ dtrott joined	03:29
	← otter768 left	03:29
	→ ropav joined	03:30
	→ EminenceHC joined	03:31
	← Mitchbones left	03:32
	← diegoviola left	03:32
	→ diegoviola joined	03:33
	← danemacmillan left	03:35
	← JosephFerano left	03:35
	← EminenceHC left	03:36
	→ arnaud___ joined	03:38
	→ iamjarvo joined	03:39
	← iamjarvo left	03:39
	→ iamjarvo joined	03:39
	← iamjarvo left	03:40
	→ iamjarvo joined	03:40
	→ teran joined	03:41
	→ devoldmx joined	03:41
	→ crystal77 joined	03:43
	← iamjarvo left	03:45
	→ whomp joined	03:45
	← teran left	03:45
	→ sgen_ joined	03:46
	← eternnoir left	03:46
	← Patch left	03:46
	← zapb_ left	03:48
	→ enitiz joined	03:48
	→ zapb_ joined	03:48
	→ ianbrandt joined	03:52
	← whomp left	03:52
	← devoldmx33 left	03:53
	→ awkwardusername joined	03:53
	→ iamjarvo joined	03:53
	← weiyang left	03:53
	→ DolpheenDream joined	03:54
	← Milkweed left	03:55
	→ felipedvorak joined	03:55
	→ Pyrogerg joined	03:56
	← enitiz left	03:57
	→ kcj joined	03:57
	→ ajustrun joined	03:58
	→ johnny2600 joined	03:59
	← thiago left	04:01
	← devoldmx left	04:02
	← johnny2600 left	04:03
	← sgen_ left	04:03
	← msmith left	04:04
	← dreiss left	04:05
	← tranzfuse left	04:06
	→ eternnoir joined	04:06
	→ weiyang joined	04:07
	← maestrojed left	04:07
	← metateck left	04:07
	← SumDude left	04:09
	← dsantiago left	04:09
zumba_addict	This is the correct process right? I want to update my two-calendar-fix branch with the changes that develop received. so 1) git checkout two-calendar-fix 2) git fetch 3) git merge origin/develop	04:09
	← weiyang left	04:12
	→ dsantiago joined	04:13
	← awkwardusername left	04:13
	→ tekkbuzz joined	04:14
	→ jgardella joined	04:14
	← ajustrun left	04:15
	→ knobo joined	04:15
	← zumba_addict left	04:17
	→ zumba_addict joined	04:18
	→ sgen_ joined	04:18
	→ Bryzzle joined	04:19
	← jb55 left	04:19
	← davis left	04:20
	→ jb55 joined	04:20
	← daito left	04:22
	→ sinequanon joined	04:22
	→ EminenceHC joined	04:22
	← smccarthy left	04:23
	→ dreiss joined	04:24
	← jb55 left	04:24
	← zumba_addict left	04:26
	→ zumba_addict joined	04:26
	← sinequanon left	04:27
	← EminenceHC left	04:27
	→ davis joined	04:28
	← Literphor left	04:28
	davis → Guest66248	04:29
	→ NoNMaDDeN joined	04:29
	→ zanchoPansa joined	04:29
	← ManikM left	04:29
	→ ManikM joined	04:29
	→ subhojit777 joined	04:29
	→ sinkensabe joined	04:30
	← zanchoPa1sa left	04:30
	→ jacksparrow007 joined	04:30
	← andrew__ left	04:31
	→ kyb3r_ joined	04:31
	→ andrew__ joined	04:31
	→ bhuvanaurora joined	04:31
	← APerson_ left	04:32
	← m0viefreak left	04:33
	→ EminenceHC joined	04:33
	→ APerson_ joined	04:34
	← sinkensabe left	04:34
	→ Mitchbones joined	04:35
	→ JohnBat26 joined	04:35
	← JohnBat26 left	04:35
	→ JohnBat26 joined	04:36
	← bhuvanaurora left	04:36
	← EminenceHC left	04:38
	→ Literphor joined	04:38
	← Consuela left	04:42
	→ thiago joined	04:43
	→ PerlJam joined	04:43
	→ harish_ joined	04:43
	← harish_ left	04:44
	← ianbrandt left	04:45
	← bhws left	04:45
	→ whomp joined	04:49
	→ Kulrak joined	04:49
	← Kulrak left	04:49
	→ Kulrak joined	04:49
	← sohail left	04:49
	← dtrott left	04:50
	← Bryzzle left	04:51
thedudez0r	what happens if you're keeping track of a file in some subdirectory, and then you move that file, either upwards or downwards the directory tree	04:51
	← tristanp left	04:51
thedudez0r	does git keep track of the changed location? or do I need to re-add it once it's in the new location?	04:51
	← sgen_ left	04:52
	→ ajustrun joined	04:52
	→ tristanp joined	04:52
thedudez0r	I'm guessing the latter	04:52
	← jacksparrow007 left	04:53
	← whomp left	04:54
offby1	thedudez0r: it tracks the whole rename thing	04:54
	→ sgen_ joined	04:55
offby1	duderino: you do have to re-add it	04:55
	oh, sorry, misspelled your nick	04:55
	← Noldorin left	04:55
	← tristanp left	04:56
	← ajustrun left	04:57
	→ dtrott joined	04:58
	← pekster left	04:58
	→ AmR\|EiSa_ joined	04:58
AmR\|EiSa_	How I can edit Qt src with git patch file ?	04:59
	→ maestrojed joined	04:59
Seveas	thedudez0r: if you 'git mv', git will keep tracking it. If you move manually, you'll need to git rm / git add afterward.	04:59
	AmR\|EiSa_: git apply your_patch_file.patch	04:59
	← Pyrogerg left	05:00
AmR\|EiSa_	Seveas: It will look at the path atuo ?	05:00
Seveas	atuo?	05:01
AmR\|EiSa_	Seveas: automatic*	05:02
	→ z8z joined	05:02
	→ DeathIncarnate joined	05:02
	AmR\|EiSa_ → AmR\|EiSa	05:03
	← z8z left	05:03
Seveas	well, that still doesn't make sense :) What do you mean?	05:03
	→ z8z joined	05:03
AmR\|EiSa	the patch file for /src/c.txt it will look at src/ and find c.txt ?	05:05
	→ bhuvanaurora joined	05:05
	→ daito joined	05:06
	← z8z left	05:06
	→ chrisshattuck joined	05:06
	→ z8z joined	05:07
Seveas	if it's an actual git-generated patch, the path will be for a/src/c.txt and b/src/c.txt and git will pretend that you said -p1 when applying	05:07
	← jaeckel left	05:07
Seveas	if it's not a git-generated patch, you may need to specify another value for -p	05:07
AmR\|EiSa	lol git is very cool	05:08
	Seveas: Thanks :)	05:08
	→ sinequanon joined	05:08
	→ ianbrandt joined	05:08
	→ pekster joined	05:08
AmR\|EiSa	Last 2 Q.	05:09
	← thedudez0r left	05:09
	← z8z left	05:09
AmR\|EiSa	I convert my project to git, By git svn clone	05:09
	I want not full master to git without svn.	05:10
	or this bad ?	05:10
	→ wrouesnel3 joined	05:10
	→ King_Hual joined	05:10
	← Dewi left	05:11
	← kermit left	05:11
kadoban	AmR\|EiSa: I don't understand what you mean, sorry.	05:11
	AmR\|EiSa: Can you reword it?	05:11
	→ kermit joined	05:11
	← Life-Blood left	05:11
	→ teran joined	05:11
	→ Dewi joined	05:12
	→ King_Hual` joined	05:12
	→ richardlitt joined	05:12
AmR\|EiSa	I work before with svn and git easy way to make it work with git by clone it from svn. So I want full convert it now to git.	05:12
	That what I want to do.	05:12
	→ msmith joined	05:15
	← King_Hual left	05:15
	→ pdxrmjack joined	05:16
	→ chrissha_ joined	05:16
	← teran left	05:16
	← jrdavid_ left	05:17
	→ devoldmx joined	05:17
	← chrisshattuck left	05:17
	→ jaeckel joined	05:17
	← andrew__ left	05:18
	→ darnir joined	05:18
	← King_Hual` left	05:19
	← msmith left	05:19
	→ royho joined	05:19
	← royho left	05:20
	→ kopparam joined	05:22
	→ tmz joined	05:24
	→ z8z joined	05:24
	← devoldmx left	05:24
	→ mennea joined	05:24
	→ otter768 joined	05:25
	→ listochkin joined	05:25
	→ Niharika joined	05:27
	← snuffeluffegus left	05:27
	← Niharika left	05:29
	→ pheaver joined	05:29
	← otter768 left	05:30
	→ gH05t joined	05:30
	← listochkin left	05:30
gH05t	is there a way to send all branches to remote with one command.	05:30
	→ sinkensabe joined	05:31
	→ BlaXpirit joined	05:32
thiago	gH05t: in one push, but two commands	05:32
	gH05t: wait, no, you can do it one one command	05:32
	← wrouesnel3 left	05:32
thiago	gH05t: git push remote refs/heads/:refs/heads/	05:32
AmR\|EiSa	thiago: lol	05:33
gH05t	thiago: let me try that.	05:33
thiago	note that this pushes to all like-named branches. It doesn't push to the tracking upstream branch	05:33
	→ weiyang joined	05:34
	← pheaver left	05:34
	← jgardella left	05:35
gH05t	thiago: it works. thanks.	05:35
	← sinkensabe left	05:35
	→ LifeBlood joined	05:36
gH05t	also, can we make a branch from a previous commit using "git branch <name> <sha1>"	05:36
	→ xcesariox joined	05:37
	→ jeffmjack joined	05:37
	→ beautifulmind joined	05:37
	→ EminenceHC joined	05:37
	← beautifulmind left	05:38
thiago	gH05t: was that a question?	05:38
	→ Consuela joined	05:39
gH05t	thiago: yes, will this work.	05:39
	← lindenle left	05:39
thiago	gH05t: !tias	05:39
gitinfo	gH05t: Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://gitolite.com/tias.html may help with git-specific TIAS.	05:39
	← Literphor left	05:40
	← richardlitt left	05:40
	→ mennea_ joined	05:41
	← pdxrmjack left	05:41
gH05t	thiago: will this make any issues when merging with original branch.	05:42
	← mennea left	05:42
	← EminenceHC left	05:42
	→ beautifulmind joined	05:42
	→ Literphor joined	05:43
	→ richardlitt joined	05:43
thiago	gH05t: no	05:43
gH05t	thiago: so, what kind of merge will that be? can it be fast-forward.	05:44
	← beautifulmind left	05:45
	← ianbrandt left	05:45
	← neunon left	05:46
	← Guest66248 left	05:46
	→ davis joined	05:46
	→ ianbrandt joined	05:46
	→ upene joined	05:46
	davis → Guest12371	05:46
	← NoNMaDDeN left	05:47
	→ jceb joined	05:47
bq	how do i checkout a repo all but a specific directory?	05:48
	← kopparam left	05:48
	→ kopparam joined	05:48
	→ msankhala joined	05:48
	← dreiss left	05:48
	→ jb55 joined	05:48
	→ St1gma joined	05:49
mattcen	bq: you don't. You get the whole repo	05:49
	→ beautifulmind joined	05:49
mattcen	Why do you want to do that?	05:49
	← upene left	05:51
bq	mattcen: there is a ":" in one path name that cannot be checkouted	05:51
mattcen	How are you trying to check it out?	05:52
	What command are you running	05:52
bq	mattcen: the clone part is done, but the checkout is half done with the error.	05:52
	git clone <repo>	05:52
mattcen	what happens if you 'cd' into the repo dir and do 'git checkout .'	05:53
	→ Takle_ joined	05:53
	→ neunon joined	05:53
	← zumba_addict left	05:53
gH05t	can we have different copies of same file in local and remote.	05:53
	→ zumba_addict joined	05:54
	← ropav left	05:54
	← kcj left	05:54
bq	mattcen: error: pathspec '.' did not match any file(s) known to git.	05:54
	→ upene joined	05:54
	→ ropav joined	05:54
mattcen	bq: I just created a repo with a dir containing a colon, and it works fine for me.	05:55
	← DeathIncarnate left	05:55
mattcen	bq: I don't know what's going on with your system, but it's not normal, and without seeing pastebins of the output of your terminal session or replicating the issue myself, I can't help you	05:55
	← oldtopman left	05:56
bq	mattcen: http://paste.ubuntu.com/9224327/	05:56
	→ tranzfuse joined	05:56
	← kirin` left	05:56
mattcen	bq: is that the same error you see when you do the 'clone'?	05:57
bq	mattcen: yes exactly	05:57
	→ kirin` joined	05:57
mattcen	What sort of system are you on? Linux?	05:57
bq	win7	05:58
	← RustyShackleford left	05:58
mattcen	bq: There you go. Windows doesn't support colons in its filenames.	05:58
	I don't know if you can make this work.	05:58
	→ punchagan joined	05:58
bq	maybe i need to switch to linux	05:58
mattcen	"Most problems can be solved by installing Debian"	05:58
	← iamjarvo left	05:58
	← upene left	05:59
bq	let me try	05:59
AmR\|EiSa	Is bettercodes.org good ?	06:00
	→ ropav_ joined	06:00
	mattcen shrugs	06:00
	← tranzfuse left	06:01
	→ lindenle joined	06:01
	→ The_Phoenix joined	06:01
	← gH05t left	06:01
	← The_Phoenix left	06:02
	→ gH05t joined	06:03
gH05t	!tias	06:03
gitinfo	Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://gitolite.com/tias.html may help with git-specific TIAS.	06:03
	← richardlitt left	06:03
gH05t	!backup	06:03
gitinfo	Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups	06:03
	→ The_Phoenix joined	06:04
	← UmbraMalison left	06:04
	← ropav left	06:04
	← gH05t left	06:04
	← Tuna-Fish left	06:05
	→ UmbraMalison joined	06:05
	→ jrdavid joined	06:05
	← APerson_ left	06:06
	← ropav_ left	06:07
	→ ropav joined	06:08
	→ NoNMaDDeN joined	06:08
	→ diegoaguilar joined	06:08
	→ Takle joined	06:09
	← kyb3r_ left	06:09
	← Takle_ left	06:10
	← mennea_ left	06:10
	→ Life-Blood joined	06:11
	← LifeBlood left	06:11
	→ mennea joined	06:11
	→ mihaicris joined	06:11
	→ dsdeiz_ joined	06:11
	→ kriks joined	06:11
	← bhuvanaurora left	06:12
	→ gH05t joined	06:12
	→ dreiss joined	06:13
	← dsdeiz left	06:13
	← mihaicris left	06:13
	→ arup_r joined	06:14
	→ AmR\|EiSa_ joined	06:14
	→ bhuvanaurora joined	06:15
	← AmR\|EiSa left	06:17
	→ twb joined	06:20
twb	If I have two "git stash" and I want to apply the second one,- never mind, I guess it's "git stash apply 1" or so	06:20
	Since it's a stack, I was looking for "git stash rotate"	06:21
	← gH05t left	06:21
	← desposo left	06:21
twb	"git stash apply stash@{1}" works	06:21
	← ome left	06:21
	→ jiangenj joined	06:21
jiangenj	hi	06:21
	gitinfo set mode: +v	06:22
jiangenj	hi	06:22
	Question: if i want to only clone a project without tree and blob objects (means I only need tags/commit object), what should i do?	06:22
	← crystal77 left	06:23
	→ joo-_ joined	06:23
darnir	jiangenj: You mean a bare repository?	06:23
	→ KONIG joined	06:23
	← lindenle left	06:23
phy1729	bare just means no working copy	06:23
	jiangenj: that seems like an xy question; what are you trying to do?	06:24
	→ gH05t joined	06:25
jiangenj	A bare project also clones blob and tree	06:25
	← gH05t left	06:25
jiangenj	For most of projects, I only concern about the commit relationship and commit message	06:26
	→ gH05t joined	06:26
jiangenj	so if we can clone a project fast with these two objects, that's awesome	06:26
	← gH05t left	06:26
kadoban	jiangenj: What you want isn't possible...and I doubt it'd actually be useful	06:26
jiangenj	Its pretty useful for us, as we need to get commits between two tags very frequently	06:27
	Or do you know gitweb has similar function?	06:27
	you can also see that in a git project, verify-pack *.idx gives commit/tree/blob objects info; so I think technically it's possible	06:28
	← watabou left	06:28
	AmR\|EiSa_ → AmR\|EiSa	06:29
	← ManikM left	06:29
kadoban	jiangenj: Even if git could be tricked into that, all you'd have would be the sha-ids and the commit messages. How would that help you?	06:29
	→ ManikM joined	06:29
	→ nnyk_ joined	06:29
	← nnyk_ left	06:29
	→ nnyk_ joined	06:29
	← Dougie187 left	06:30
jiangenj	I don't care about the file content in most of the time; but if we clone hundreds projects it takes too much time even delta fetch	06:31
	← kopparam left	06:31
	← tpollard left	06:31
	→ kopparam joined	06:32
Motoko	You'll need the content to see the changes.	06:32
	← MattMaker left	06:33
	→ DeathIncarnate joined	06:33
	← NoNMaDDeN left	06:34
	← Kulrak left	06:34
jiangenj	I don't:)	06:34
	we just want a dashboard	06:35
	→ Sonderblade joined	06:35
phy1729	you can do a shallow clone iirc	06:35
	→ pantsman- joined	06:35
	← diegoviola left	06:36
	← joo-_ left	06:37
	→ whomp joined	06:38
	← Literphor left	06:38
	← bhuvanaurora left	06:39
	← sinequanon left	06:39
	→ bhuvanaurora joined	06:39
	→ devoldmx joined	06:39
	← bhuvanaurora left	06:39
	← mennea left	06:40
bq	mattcen: the same error goes on linux	06:41
	→ mennea joined	06:41
	→ hahuang61 joined	06:41
	← samsquanch left	06:41
	→ EminenceHC joined	06:41
	→ MattMaker joined	06:42
	→ aswen joined	06:42
	← DeathIncarnate left	06:42
	← whomp left	06:42
	→ HACKING-FACEBOOK joined	06:43
	→ alexwhitman joined	06:43
	← mikecmpbll left	06:44
	← KONIG left	06:45
	← EminenceHC left	06:46
	→ ehmatthes joined	06:47
	→ Myk267 joined	06:47
	→ Silmarilion joined	06:47
	← eletuchy left	06:47
	→ sinequanon joined	06:47
	← sinequanon left	06:48
	→ Kulrak joined	06:48
	← Kulrak left	06:48
	→ Kulrak joined	06:48
	→ sinequanon joined	06:48
	← Kulrak left	06:49
	→ Kulrak joined	06:49
	← ropav left	06:49
	← Lyqyd left	06:49
	← Kulrak left	06:49
	→ Kulrak joined	06:49
	→ sinequan_ joined	06:50
	→ ropav joined	06:50
	→ Nechradile joined	06:50
	b4rbz → Dopagod	06:51
	→ akiva joined	06:51
	← sinequan_ left	06:51
	→ sinkensabe joined	06:51
	→ a_le joined	06:52
	← Dopagod left	06:52
	← Gamecubic left	06:53
	← sinequanon left	06:53
	← HACKING-FACEBOOK left	06:53
	→ HACKING-FACEBOOK joined	06:53
	← HACKING-FACEBOOK left	06:53
	← ianbrandt left	06:53
	→ HACKING-FACEBOOK joined	06:54
	← HACKING-FACEBOOK left	06:54
	→ HACKING-FACEBOOK joined	06:54
	← HACKING-FACEBOOK left	06:54
	→ sinequanon joined	06:54
	→ HACKING-FACEBOOK joined	06:54
	← HACKING-FACEBOOK left	06:54
	→ Dopagod joined	06:55
	→ HACKING-FACEBOOK joined	06:55
	← HACKING-FACEBOOK left	06:55
	← pantsman- left	06:55
	→ HACKING-FACEBOOK joined	06:55
	← HACKING-FACEBOOK left	06:55
	← strictlyb left	06:55
	→ ropav_ joined	06:55
	→ HACKING-FACEBOOK joined	06:56
	← HACKING-FACEBOOK left	06:56
	→ k_sze[work] joined	06:56
	→ HACKING-FACEBOOK joined	06:57
	← HACKING-FACEBOOK left	06:57
	→ EminenceHC joined	06:57
	→ HACKING-FACEBOOK joined	06:57
	← HACKING-FACEBOOK left	06:57
	→ HACKING-FACEBOOK joined	06:58
	← HACKING-FACEBOOK left	06:58
	← Samual_ left	06:58
	→ HACKING-FACEBOOK joined	06:58
	← HACKING-FACEBOOK left	06:58
	→ HACKING-FACEBOOK joined	06:58
	← HACKING-FACEBOOK left	06:58
	→ HACKING-FACEBOOK joined	06:59
	← HACKING-FACEBOOK left	06:59
	← ropav left	06:59
	← aswen left	06:59
	→ HACKING-FACEBOOK joined	06:59
	← HACKING-FACEBOOK left	06:59
	→ HACKING-FACEBOOK joined	06:59
	← HACKING-FACEBOOK left	06:59
ojacobson	So, that's gonna be interesting.	06:59
	← jceb left	07:00
	→ HACKING-FACEBOOK joined	07:00
	← HACKING-FACEBOOK left	07:00
	→ strictlyb joined	07:00
	→ SumDude joined	07:00
	→ HACKING-FACEBOOK joined	07:00
	← HACKING-FACEBOOK left	07:00
	→ teran joined	07:00
	→ HACKING-FACEBOOK joined	07:01
	← HACKING-FACEBOOK left	07:01
	→ ropav joined	07:01
	→ HACKING-FACEBOOK joined	07:01
	← HACKING-FACEBOOK left	07:01
	→ Tuna-Fish joined	07:01
	→ kopparam_ joined	07:01
	→ HACKING-FACEBOOK joined	07:01
	← EminenceHC left	07:01
	← Guest12371 left	07:02
	← lidaaa left	07:03
	← devoldmx left	07:03
	← Nechradile left	07:03
	← kopparam left	07:03
	← ropav_ left	07:04
	→ berise joined	07:04
	→ willvarfar joined	07:04
	→ faylite joined	07:05
	→ ropav_ joined	07:05
	← kopparam_ left	07:06
	← teran left	07:06
	→ kopparam joined	07:06
	← ropav left	07:06
	← Goplat left	07:06
willvarfar	I use git but I'm no power user and never got along with submodule. Anyway, I've started on an old codebase that is curiously structured: it uses cvs and is organised so each folder at the top level is its own concept of 'module'. You do not usually install all modules. There is a special python script for downloading these modules, updating them, creating dependencies and managing compile order, and actually kicking off its speci	07:08
	→ arup_r_ joined	07:08
willvarfar	so my question is: how to best migrate this to git? How do you have a system for versioning where the top-level is made from selectable modules and two users may have different modules?	07:08
	← mennea left	07:08
	→ saurabh joined	07:09
	saurabh → Guest63882	07:09
	← strictlyb left	07:09
Seveas	willvarfar: I would get rid of the top level project and just have the separate modules. The special script can then be its own module too, and it could clone repos as and when needed, even without using submodules	07:10
	← Kulrak left	07:10
	→ TomyLobo joined	07:10
	→ devoldmx joined	07:11
	→ Samual joined	07:11
	← arup_r left	07:11
	← ropav_ left	07:12
	← Orbitrix left	07:12
	← knobo left	07:12
	→ ropav joined	07:12
	→ Orbitrix joined	07:12
	← MLM left	07:13
	← chrissha_ left	07:13
	→ at0mat joined	07:13
willvarfar	Seveas: thx yes I can't think of another way	07:14
	→ Kicer86 joined	07:14
	→ marthinal joined	07:15
	← devoldmx left	07:15
	→ davis joined	07:15
	davis → Guest86680	07:16
	← nnyk_ left	07:16
	→ clauswitt joined	07:16
	← msankhala left	07:17
	← alanwill left	07:17
	→ ropav_ joined	07:17
	→ Errorical joined	07:19
	← ropav_ left	07:20
	→ shpoont joined	07:20
	→ roelmonnens joined	07:20
	← HACKING-FACEBOOK left	07:20
	→ ropav_ joined	07:20
	← ropav left	07:21
	← ehmatthes left	07:21
	← dreiss left	07:21
	→ ianbrandt joined	07:22
	← CEnnis91 left	07:22
cbreak	this winter will probably suck again... way too warm :( I hope it'll snow at least once	07:22
	→ angelsl joined	07:23
	→ Kulrak joined	07:24
	← Kulrak left	07:24
	→ Kulrak joined	07:24
Seveas	cbreak: git snow --fluffy	07:24
	→ freimatz joined	07:24
	← kerrick left	07:24
	← wookienz left	07:25
	← willvarfar left	07:25
	→ otter768 joined	07:26
	← ruukasu left	07:26
	→ HACKING-FACEBOOK joined	07:27
	← HACKING-FACEBOOK left	07:27
	→ Gizburdt joined	07:27
	→ HACKING-FACEBOOK joined	07:27
	← HACKING-FACEBOOK left	07:27
	→ HACKING-FACEBOOK joined	07:27
	← HACKING-FACEBOOK left	07:27
	→ HACKING-FACEBOOK joined	07:28
	← HACKING-FACEBOOK left	07:28
	→ acolson joined	07:28
	→ HACKING-FACEBOOK joined	07:28
	← HACKING-FACEBOOK left	07:28
	→ HACKING-FACEBOOK joined	07:28
	← HACKING-FACEBOOK left	07:28
	→ HACKING-FACEBOOK joined	07:29
	← HACKING-FACEBOOK left	07:29
	← ojacobson left	07:29
	→ HACKING-FACEBOOK joined	07:29
	← HACKING-FACEBOOK left	07:29
	→ HACKING-FACEBOOK joined	07:29
	← HACKING-FACEBOOK left	07:29
	→ ropav joined	07:30
	→ HACKING-FACEBOOK joined	07:30
	← HACKING-FACEBOOK left	07:30
	→ HACKING-FACEBOOK joined	07:30
	← HACKING-FACEBOOK left	07:30
	← Guest86680 left	07:30
	→ HACKING-FACEBOOK joined	07:30
	← HACKING-FACEBOOK left	07:30
Seveas	cbreak: also https://www.youtube.com/watch?v=mIQr_TrFTUk#t=232	07:30
	← otter768 left	07:30
	→ ruukasu joined	07:30
	→ HACKING-FACEBOOK joined	07:31
	← HACKING-FACEBOOK left	07:31
	→ HACKING-FACEBOOK joined	07:31
	← HACKING-FACEBOOK left	07:31
	→ HACKING-FACEBOOK joined	07:31
	← HACKING-FACEBOOK left	07:31
	→ jagob joined	07:31
cbreak	I am not in that part of disney...	07:32
	→ HACKING-FACEBOOK joined	07:32
	← HACKING-FACEBOOK left	07:32
	→ davis_ joined	07:32
	→ vurma joined	07:32
	→ HACKING-FACEBOOK joined	07:32
	← HACKING-FACEBOOK left	07:32
	→ HACKING-FACEBOOK joined	07:32
	← HACKING-FACEBOOK left	07:32
	→ HACKING-FACEBOOK joined	07:33
	← HACKING-FACEBOOK left	07:33
	→ bhuvanaurora joined	07:33
	→ HACKING-FACEBOOK joined	07:33
	← HACKING-FACEBOOK left	07:33
	← ropav_ left	07:33
	→ HACKING-FACEBOOK joined	07:33
	← HACKING-FACEBOOK left	07:33
	→ HACKING-FACEBOOK joined	07:34
	← HACKING-FACEBOOK left	07:34
	→ HACKING-FACEBOOK joined	07:34
	→ Raging_Hog joined	07:36
	← St_Marx left	07:36
	→ St_Marx_ joined	07:36
	→ eletuchy joined	07:36
	→ jceb joined	07:37
	← TomyLobo left	07:37
	→ teran joined	07:37
	← ianbrandt left	07:38
	← pikaren left	07:38
	→ pikaren joined	07:38
	← sinequanon left	07:38
	→ darnir_ joined	07:39
	← pikaren left	07:40
	→ Macaveli joined	07:40
	← Motoko left	07:40
	→ WormDr1nk joined	07:40
	→ delight joined	07:40
	→ Motoko joined	07:40
	→ pikaren joined	07:40
	← darkbasic left	07:40
	→ darkbasic_ joined	07:40
	← darnir left	07:42
	← Dopagod left	07:42
	→ Dopagod joined	07:43
	← kadoban left	07:43
	← CustosL1men left	07:43
	← Motoko left	07:44
	→ tranzfuse joined	07:45
	→ awkwardusername joined	07:45
	← beautifulmind left	07:46
	→ EminenceHC joined	07:47
	→ jargon joined	07:47
	← jargon left	07:48
	→ joo-_ joined	07:49
	→ AmR\|EiSa_ joined	07:49
	→ jnavila joined	07:50
	← tranzfuse left	07:50
	← AmR\|EiSa left	07:51
	← EminenceHC left	07:52
	← shpoont left	07:52
	→ nrsk joined	07:52
	← The_Phoenix left	07:53
	→ shpoont joined	07:53
	← twb left	07:53
	→ The_Phoenix joined	07:53
	→ NoNMaDDeN joined	07:53
	→ LeMike joined	07:55
	→ gH05t joined	07:55
	→ rzeka joined	07:55
	← gH05t left	07:56
	← The_Phoenix left	07:56
	→ wookienz joined	07:57
	← shpoont left	07:57
rzeka	Hello. I am about to start to work with 2 repos. How can I handle different configurations in file per repo? Should I commit it and then just add file to .gitignore?	07:57
	← jnavila left	07:58
	→ jnavila joined	07:58
cbreak	rzeka: no	07:58
	rzeka: don't commit configuration files	07:58
	← Errorical left	07:58
	→ The_Phoenix joined	07:58
cbreak	commit default config files, maybe including optional local config files	07:59
	rzeka: see also !config	07:59
gitinfo	rzeka: [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas	07:59
	→ harish_ joined	07:59
	← bhuvanaurora left	07:59
	→ Brain joined	08:00
	← tekkbuzz left	08:00
rzeka	ah ok, thanks cbreak	08:00
	→ palcu joined	08:00
	← skorgon left	08:01
	→ hebz0rl joined	08:01
	→ PCatinean joined	08:01
	→ kimchi joined	08:02
	→ J1G\|Anon126 joined	08:03
	← DolpheenDream left	08:03
	← govg left	08:03
	→ cbr_ joined	08:04
	← dtrott left	08:05
	← palcu left	08:05
	← a_le left	08:06
	← Nijikokun left	08:06
	← joo-_ left	08:06
	← LeMike left	08:07
	→ joo-_ joined	08:07
	← Rastus_Vernon left	08:07
	→ msankhala joined	08:08
	← Brain left	08:08
	← Xiti left	08:09
	← Life-Blood left	08:09
	← nardev_ left	08:09
	→ Brain joined	08:10
	→ mennea joined	08:11
	← dorkmafia left	08:11
	← Solid1_afk left	08:12
	← sgen_ left	08:12
	→ LeMike joined	08:13
	← pasokk left	08:13
	→ pasokk joined	08:13
	→ kcj joined	08:14
	← Steve_Jobs left	08:14
	→ GGflags_ joined	08:15
	← joo-_ left	08:15
	→ joo-_ joined	08:15
	← msankhala left	08:16
	→ msankhala joined	08:16
	→ rob_w joined	08:17
	← LeMike left	08:17
	→ Etheco joined	08:18
	→ Duikb00t joined	08:18
	→ n-st joined	08:18
	→ knobo joined	08:19
	→ jargon joined	08:19
	→ nnyk_ joined	08:19
	← phantombeta left	08:20
	→ TomyWork joined	08:21
	← AmR\|EiSa_ left	08:21
	← Takle left	08:22
	→ devoldmx joined	08:22
	→ Guest74546 joined	08:22
	← awkwardusername left	08:22
	← carlosr left	08:23
	→ awkwardusername joined	08:23
	← jb55 left	08:24
	→ shpoont joined	08:25
	→ whomp joined	08:27
	← HACKING-FACEBOOK left	08:28
	→ blackmesa joined	08:28
	← ManikM left	08:29
	→ ManikM joined	08:29
	→ Errorical joined	08:29
	→ NoNMaDDe_ joined	08:30
	← J1G\|Anon126 left	08:30
	→ dtrott joined	08:31
	→ dreiss joined	08:31
	← whomp left	08:31
	← vurma left	08:32
	← kimchi left	08:32
	→ bhuvanaurora joined	08:32
	← NoNMaDDeN left	08:32
	→ nilg joined	08:34
	→ psoo joined	08:34
	← psoo left	08:34
	→ psoo joined	08:35
	← joki left	08:35
	→ kopparam_ joined	08:36
	→ Marcus___ joined	08:36
	← kopparam left	08:36
	→ ferri joined	08:36
	→ WORMSS joined	08:36
	← Duikb00t left	08:37
	→ aswen joined	08:37
	→ osfe joined	08:38
	→ h4ml3t joined	08:39
	← arup_r_ left	08:39
	→ joki joined	08:40
	→ Novitsh_ joined	08:41
	← h4ml3t left	08:42
	→ HACKING-FACEBOOK joined	08:42
	→ skylite joined	08:43
	← dtrott left	08:43
	→ wrouesnel joined	08:43
	← joo-_ left	08:44
	→ philipandersen joined	08:45
	→ shodan` joined	08:45
	← WormDr1nk left	08:45
shodan`	hey, I was wondering why my gitignore is not working http://i.imgur.com/9zhfHwO.png	08:45
	← blackmesa left	08:45
shodan`	I also tried */config/database.php	08:45
	← The_Phoenix left	08:46
	← kriks left	08:46
	→ lb1a joined	08:46
	→ gfixler joined	08:47
	→ Takle joined	08:47
	← kopparam_ left	08:47
	→ The_Phoenix joined	08:47
tobiasvl	shodan`: hmm, what's not working?	08:47
	oh, hang on, you're in application	08:47
	→ joo-_ joined	08:47
shodan`	Git is not ignoring application/config/database.php	08:47
	ye my cwd is application	08:48
tobiasvl	yeah, sorry, I missed your path (a screenshot with text info seems clunky…)	08:48
shodan`	I could plop it in a paste if you want	08:48
tobiasvl	nah	08:48
	shodan`: well, it says "modified" in front of the file. it's already tracked?	08:48
	you can't ignore a tracked file, you need to !untrack it	08:48
gitinfo	To remove a file from git's tracking, without deleting it from your working tree, `git rm --cached <file>`. Note that any repo which pulls this change will delete their local copy of that file. You can "bring it back" using `git checkout HEAD@{1} file` immediately after pulling / merging	08:48
shodan`	hmm thanks	08:49
	I'll try that	08:49
	→ Solid1 joined	08:49
	→ kopparam joined	08:49
shodan`	deleted: application/config/database.php	08:49
	→ kriks joined	08:49
shodan`	I just re-add it after that commit?	08:50
	ah nvm I didn't fully read that bot text	08:50
	← mennea left	08:50
tobiasvl	huh? why would you want to add it? I thought you wanted it ignored	08:50
shodan`	added as in regain the file back and have it untracked by git	08:50
	→ EminenceHC joined	08:51
	→ mennea joined	08:51
	→ virtualsue joined	08:51
tobiasvl	I don't follow	08:51
	if you did git rm --cached then you shouldn't have to regain it, it should still be there, but untracked	08:51
shodan`	ah I see	08:52
	→ flowinho joined	08:52
cbreak	shodan`: it's just a php file, if the program needs it for configuration, it'll regenerate it, right?	08:52
shodan`	ye, It's generated by our CI	08:52
	It seems to work, thanks!	08:53
	→ francisfish joined	08:53
shodan`	thanks guys	08:53
	← shodan` left	08:54
	→ mennea_ joined	08:55
	← bhuvanaurora left	08:55
	← EminenceHC left	08:55
	→ dtrott joined	08:56
	→ bhuvanaurora joined	08:57
	← mennea left	08:58
	→ NoNMaDDeN joined	08:58
	← thiago left	08:58
	← boombatower left	08:58
	→ leeN joined	08:59
WORMSS	Does anyone know how you are meant to detect if --no-ff (or any variation) was used from the git-merge-octopus.sh file? Need to correct an incorrect output. It always states it is Fast Forwarding the first merge, even when --no-ff is specified (and according to the log itself, it has not done an ff).	09:00
	← n-st left	09:00
	← berise left	09:01
	← NoNMaDDe_ left	09:01
	→ durre joined	09:02
	← delight left	09:03
	→ blackmesa joined	09:04
	← The_Phoenix left	09:04
	→ The_Phoenix joined	09:05
	→ ropav_ joined	09:06
	→ CheckDavid joined	09:06
	→ mighub joined	09:08
	← akiva left	09:08
	← ropav left	09:08
	→ martinklepsch joined	09:08
hyperboreean	how can I push a branch upstream, but without the commits that have been added to it since creation ? I just want to differentiate between the moment when the branch was created and the moment when the first commits have been added	09:09
	→ gutoyr joined	09:09
	→ vurma joined	09:09
	← jeffmjack left	09:09
mighub	I am having a hard time figuring out if it is better to set the config user.name and user.email, or to use the environment variables GIT_AUTHOR_* and GIT_COMMITTER_*. Can anybody explain to me the difference?	09:10
	← wjiang left	09:10
	→ wjiang joined	09:10
	← gutoyr left	09:10
	→ akiva joined	09:11
	← kcj left	09:11
	← Gizburdt left	09:11
canton7	mighub, set the config	09:12
	mighub, the env vars are normally only used if you want to override the config for whatever reason - normally doing some particularly sneaky history editing	09:12
	→ WormDr1nk joined	09:12
canton7	hyperboreean, git push remotename commityouwanttopush:branchyouwanttopushitto	09:14
	← mennea_ left	09:14
	← joo-_ left	09:14
	← HACKING-FACEBOOK left	09:14
	→ joo-_ joined	09:14
mighub	canton, thank you. I am currently using the env vars, but when wanting to have a different user for one project, I realised I can change the local config, but the env vars still override the git config. So I started to doubt.	09:14
	→ jcalonso joined	09:15
	→ jheg joined	09:15
	← The_Phoenix left	09:15
	→ HACKING-FACEBOOK joined	09:16
	→ vtunka joined	09:16
mighub	canton7, is there a distinction between author and committer in the config as well?	09:16
	→ mennea joined	09:16
	← darnir_ left	09:16
	→ Gizburdt joined	09:17
	→ netcarver joined	09:17
	→ darnir joined	09:18
	← Macaveli left	09:18
	→ kyb3r_ joined	09:18
	← philipandersen left	09:18
	← virtualsue left	09:18
	→ cvanball joined	09:19
hyperboreean	canton7: ha, yes, I remember now ... I forgot I can do that, thanks!	09:19
	→ virtualsue joined	09:19
	→ petersr joined	09:20
	→ arup_r joined	09:20
	→ Juzzika joined	09:21
	→ okanck joined	09:21
	→ zoso joined	09:22
	← petersr left	09:23
	← darnir left	09:23
	← devoldmx left	09:23
	→ lindenle joined	09:24
	→ marcogmonteiro joined	09:24
	→ petersr joined	09:25
	→ otter768 joined	09:27
	← bhuvanaurora left	09:27
cbreak	hyperboreean: a branch is ust a pointer to history, it has no history itself	09:27
	(apart from the reflog, which is just a safety measure)	09:28
	← weiyang left	09:28
	← lindenle left	09:28
	→ Macaveli joined	09:29
	← durre left	09:30
	→ hexagoxel joined	09:31
	← otter768 left	09:31
	← blackmesa left	09:31
canton7	mighub, yeah. the author is always the person who wrote the change. the committer is the person who committed it to the repo. if you're working in a local repo, they'll be the same. if you accept a patch (by email, etc) from someone else, they're the author and you're the committer. if you rebase someone else's commit, they're still the author but you're now the committer	09:32
mighub	canton7, OK I see. Thank you for the explanation.	09:33
	← mighub left	09:34
	→ tranzfuse joined	09:34
	← ruukasu left	09:34
	← veebers left	09:34
	→ ruukasu joined	09:34
	← HACKING-FACEBOOK left	09:35
	→ veebers joined	09:36
	→ veebers_ joined	09:37
bremner	I wish "org-mobile-push" was async	09:38
	← veebers_ left	09:38
	← tranzfuse left	09:39
	→ darkbasic joined	09:39
	→ hauron joined	09:39
	→ liamkeily joined	09:39
	← darkbasic_ left	09:40
bremner	oops. wrong channel to whine about that. My org files are stored in git? /me wanders off, mumbling.	09:40
	← MattMaker left	09:40
	← Caius left	09:41
	← veebers left	09:41
	← dreiss left	09:42
	← hexagoxel left	09:45
	→ veebers joined	09:46
	→ Caius joined	09:47
	← joo-_ left	09:47
	← wrouesnel left	09:47
	→ s8321414 joined	09:48
	← kopparam left	09:48
	→ joo-_ joined	09:48
	→ m0nkmaster joined	09:50
	← bq left	09:50
	← m0nkmaster left	09:50
	→ FilipNortic joined	09:50
	← kyb3r_ left	09:50
	→ kopparam joined	09:51
	← kopparam left	09:52
	→ darkbasic_ joined	09:52
	← hgl left	09:52
	→ kopparam joined	09:53
	→ EminenceHC joined	09:53
	← darkbasic left	09:54
	→ kerrick joined	09:54
	→ ctg joined	09:55
ctg	Good morning	09:55
osse	ctg: https://www.youtube.com/watch?v=M5r5J5Ar8Pw	09:56
	→ kopparam_ joined	09:56
	← daito left	09:56
	→ creep joined	09:57
	→ marchdown joined	09:57
	→ jatt joined	09:57
	← EminenceHC left	09:58
ctg	i'm part of an IT consultancy company and we're actively recruting for Luxembourg an Application architect / Git Expert. Please feel free to contact me should you have any questions.	09:58
	→ arup_r_ joined	09:59
Seveas	osse: https://www.youtube.com/watch?v=c4aE7E8bzd0	09:59
	← kopparam left	09:59
Seveas	ctg: that's an odd jobtitle. Why combine high level thinking with low level plumbing in one job?	10:01
	← ruukasu left	10:01
	→ delight joined	10:02
	← arup_r left	10:02
	→ stamina joined	10:03
	← kerrick left	10:03
	michael_imac → michael_mbp	10:03
TomyWork	https://gist.github.com/TomyLobo/045ab1848572eada6c78 how do i regenerate my git-svn revmap?	10:04
	← veebers left	10:04
	← NoNMaDDeN left	10:05
	→ bhuvanaurora joined	10:05
ctg	anybody from luxembourg here ?	10:06
TomyWork	ctg this channel is for discussing git, not job offers	10:07
	→ GODDOG joined	10:07
	→ beautifulmind joined	10:08
jast	we do allow off-topic stuff	10:08
Renter	'git expert'	10:08
	What does 'git expert' mean?	10:08
	as a job description	10:09
jast	'git expert' refers to me	10:09
hdon	Renter, someone who can clean up a mess another dev team member makes for themselves	10:09
TomyWork	many people here join this channel from their workplace. so you're basically trying to recruit them at their workplace. use some judgment	10:09
hdon	"you're in the wrong branch. let's rebase your changes"	10:09
	← Guest74546 left	10:09
	← albel727 left	10:09
Renter	TomyWork: Well, to be fair, the best time to find a new job is when you already have a job	10:10
TomyWork	yeah, in your free time	10:10
	← xcesariox left	10:10
	→ bnw joined	10:10
	← kesroesweyth left	10:11
	→ RTG` joined	10:11
	← SumDude left	10:11
dtrott	In the US as least most people are salaried so any time is as good as another ....	10:11
tobiasvl	what does it mean to be "salaried"	10:12
	→ kopparam joined	10:13
TomyWork	i think it means you're free to behave like wally	10:13
dtrott	Fixed salary regardless of number of hours worked per week.	10:13
TomyWork	that is a bad idea	10:13
dtrott	I didn’t say it was good or bad, just that it is...	10:13
	→ NoNMaDDeN joined	10:13
TomyWork	someone said "sure it's 12 hours of hard work, but when it's over, the rest of the day is mine"	10:14
	that was some decades ago	10:14
	← GODDOG left	10:15
	→ nnyk joined	10:15
	→ whomp joined	10:15
	← nikita left	10:16
	← kopparam_ left	10:16
	→ abcdefghijabcdef joined	10:16
	← nnyk_ left	10:16
	← abcdefghijabcdef left	10:17
	→ nikita joined	10:19
	→ hexagoxel joined	10:20
	→ nfk joined	10:20
	← whomp left	10:21
	→ albel727 joined	10:21
	→ adamben joined	10:22
	← _5kg left	10:22
	← msankhala left	10:23
	→ endiruna joined	10:24
	← echo-area left	10:24
	← bnw left	10:25
	← ropav_ left	10:25
	← shpoont left	10:26
	→ darnir joined	10:27
	← Takle left	10:27
osse	I get a fixed salary regardless of the numbers of hours, but everyone assumes that number to be 40	10:27
	and it is	10:27
	so yaay	10:27
	→ shpoont joined	10:28
	← shpoont left	10:28
	→ Takle joined	10:28
	→ rath joined	10:28
	→ alorence joined	10:29
	← ManikM left	10:29
	→ ManikM joined	10:29
	→ GGflags__ joined	10:29
	← Kulrak left	10:30
Renter	fixed salaD?	10:30
WORMSS	osse: downside is usually what is tagged into the contract is 'you will occasionally be asked to add extra hours if necessary' and a somewhere else is 'no paid overtime'	10:30
jast	saladry?	10:31
osse	WORMSS: I think mine says '50%' :p	10:31
WORMSS	Though, the upside is paid holiday and paid sickness	10:31
	← petersr left	10:31
osse	WORMSS: But the upside is that usually when there is no paid overtime the salary is a bit higher than if you had overtime	10:31
	← GGflags_ left	10:31
	→ hgl joined	10:32
WORMSS	Though... a Fixed Salad right now sounds nice.. still another 1½ hours til lunch tho	10:32
	→ gccostabr joined	10:33
	← wjiang left	10:34
moritz	sounds like WORMSS is in CET land	10:34
	→ ecky--ptang-zoob joined	10:35
WORMSS	+1 points for moritz :D UK to be precise	10:36
	→ Elythrow joined	10:36
	→ jslirola joined	10:37
moritz	I thought the UK had GMT, which is CET-1	10:37
	or is that only different during DST?	10:37
someplace	UK has GMT during non-dst	10:37
WORMSS	Ahh, my bad, we were in CET when we were in DST	10:37
dtrott	GMT is only in the winter	10:37
someplace	and CET during DST time	10:37
	yeah	10:37
WORMSS	I forgot CET would change when we change. lOL	10:38
moritz	dtrott: yes, but it's winter enough not to be DST :)	10:38
	(we're using quite some TLAs in here :-)	10:38
	← stamina left	10:38
WORMSS	Yeah, It's getting to the point I can't wear shorts anymore.. :( (I think I can get a few more days out of it though, its only -1°C)	10:38
Elythrow	hi	10:39
gitinfo	Elythrow: 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.	10:39
	→ gavit joined	10:39
	→ kqr joined	10:40
	← maestrojed left	10:40
	← NoNMaDDeN left	10:40
kqr	can I temporarily revert the working tree to a previous commit, without rewriting history or somesuch? (pointing HEAD to a different commit, maybe?)	10:40
	→ xcesariox joined	10:41
kqr	I just want to check out how the code worked a few commits ago, to see if I accidentally broke something that was previously there	10:41
dtrott	kqr: git checkout <sha>	10:41
kqr	oh that easy huh, thanks	10:41
WORMSS	kqr: make sure you have a clean working tree.	10:42
kqr	I do. will it not warn me otherwise?	10:42
WORMSS	Still doesn't hurt to warn before the warning :D	10:42
kqr	fair enough :)	10:43
dtrott	You will also get a warning about being on a detached HEAD.	10:43
kqr	yeah I read that	10:43
	→ Kulrak joined	10:44
	← Kulrak left	10:44
	→ Kulrak joined	10:44
dtrott	Doesn’t hurt to warn about the warning either …. ;-)	10:44
kqr	and I think I understand why	10:44
dtrott	In short you haven’t created a branch hence if you move off it the changes become eligable for garbage collection.	10:44
kqr	(though now that I think of it, detached head sounds morbid)	10:44
	yup, gotcha	10:45
	← bhuvanaurora left	10:45
	→ ruukasu joined	10:45
jast	morbid? no, not at all. !zombie	10:45
gitinfo	Brainzz! More brainzzzz! For information about detached heads, see !detached	10:45
WORMSS	Garbage collection.. Death in the digital world.	10:45
mgaunard_	git does garbage collection	10:49
WORMSS	is that a statement or a question?	10:49
mgaunard_	it's a statement.	10:49
	Solid1 → Solid1_afk	10:49
WORMSS	Then you are correct	10:49
mgaunard_	a question would like like this: "does git do garbage collection?"	10:49
	Solid1_afk → Solid1	10:49
mgaunard_	my point is that garbage collection can't be this bad if git does it	10:50
WORMSS	can still have the question as "git does garbage collection?" grammatically it may not be correct, but people still ask questions that way	10:50
dtrott	Yea but it is customary to end a question like that with a ?	10:51
bremner	/join #englishpedantry	10:52
	→ philipandersen joined	10:52
WORMSS	It's not bad. it just means it is the death of those commits/objects. There has been a few times were someone has deleted a remote branch before pulling and the person who made the original commit was not in the office.. So we had to go into the remote's garbage to create a new branch to the commit.	10:52
	← Elythrow left	10:52
	← darkbasic_ left	10:53
WORMSS	So thankfully the garage collection hadn't triggered so it was still safe..	10:53
	→ darkbasic joined	10:54
dtrott	I believe the default is somewhere around two weeks before garbage is collected.	10:54
	→ Aristata joined	10:54
WORMSS	Yeah, Github doesn't state when they do garage collection. So I take that as anywhere from immediately to a month.. So it scares the hell out of me every time it happens	10:54
Aristata	If a have a branch with new work on it, and I merge it into branch 'A', then revert it because I didn't want to merge it into branch 'A' but instead branch 'B', why would I lose all of that work when merging branch 'A' into branch 'B'?	10:55
	← xcesariox left	10:55
Aristata	And also, how can I avoid that?	10:56
	→ Trudko joined	10:56
WORMSS	the new merge of 'work' into B would have a timestamp after the merge and revert of branch 'A' so, I would GUESS no it would NOT wipe out the code.	10:57
	Let me test that now though.	10:57
	← teran left	10:57
Aristata	I feel like this has happened to me a number of times now, though I haven't noticed until much later.	10:58
	→ normalra joined	10:58
Aristata	WORMSS: Thank you	10:58
	→ kesroesweyth joined	10:58
dtrott	Aristata: Merges don’t loose any history, everything you ever did will still be in the repository	10:58
	→ bq joined	10:58
WORMSS	I think he means will it be in the working tree after the merge B into A	10:58
	sorry, A into B	10:59
Aristata	dtrott: I realize that, but when the merge takes out many files it's a pain to go back and grab them all.	10:59
	→ EminenceHC joined	10:59
dtrott	My point is that its zero effort find the point before the merge and branch from that SHA	10:59
Aristata	dtrott: I would like to find out what I am doing wrong to prevent this in the future.	10:59
	→ t0th_-___ joined	11:00
Aristata	WORMSS: Correct, it seems the changes are lost.	11:00
spaceone	hi	11:00
	i have a very large hunk which i cannot apply anymore. Is it possible to split the hunk into multiple hunks?	11:01
	← hush left	11:01
	→ palcu joined	11:01
normalra	Hello! I'm on 2.1.3 and was wondering if Git, for cloning large repos (~1GB), resumes interrupted downloads from the temporary data or from the beginning?	11:02
dtrott	spaceone: git add has a -p switch which may be what your looking for.	11:02
	← darnir left	11:02
	← EminenceHC left	11:03
spaceone	dtrott: well no, this works only for single hunks. my problem is that i have a hunk (in a .patch file) which i need to split into multiple small hunks so that at least some can apply	11:04
WORMSS	Aristata: Yep, seems I was wrong.. A would infact Destroy the work..	11:04
	← Gizburdt left	11:04
WORMSS	Aristata: ahh, you already found that out..	11:04
spaceone	and that i can remove some context there if nessesary	11:04
	← zhxt left	11:05
	→ mkaesz joined	11:05
	← clauswitt left	11:05
	← palcu left	11:05
	← Takle left	11:05
	→ _5kg joined	11:06
	← CheckDavid left	11:07
	← kopparam left	11:07
	→ dpio joined	11:07
Aristata	WORMSS: So what would be the proper way to handle that?	11:07
WORMSS	I have just been trying to work that out..	11:08
	→ zhxt joined	11:08
cbreak	normalra: git doesn't resume.	11:09
WORMSS	Aristata: Ok, I just did something quiet scary. But it actually worked for me, but obviously I have a VERY VERY limited test case here..	11:09
	→ yamatoxxx joined	11:10
Aristata	WORMSS: I am all ears	11:10
WORMSS	What I did was merge A into B but only to the working tree, (--no-commit) and then reverted the commit in A that reverted the inclusion of the work branch, (again to the working tree)	11:10
	→ kopparam joined	11:10
	← raatiniemi left	11:11
WORMSS	and then finalized the commit	11:11
Aristata	WORMSS: Yikes, the issue with that is that I have other developers that have reverted the merge, and I might not always know this. I need a better solution than revert to undo a merge. Perhaps the best way might have been to reset branch 'A' to right before the merge rather than revert the merge?	11:12
normalra	cbreak: Ah, that's good to know, thank you.	11:13
	← creep left	11:13
	→ NoNMaDDeN joined	11:13
WORMSS	Aristata: as I said, quiet scary.	11:13
	← zhxt left	11:13
	→ petersr joined	11:14
	→ Takle joined	11:15
	← kopparam left	11:15
	→ paul424 joined	11:15
	→ kopparam joined	11:15
	→ devoldmx joined	11:16
Aristata	WORMSS: Would my reset to before the merge rather than reverting the merge accomplish not losing that work?	11:16
WORMSS	Aristata: I do not know what this would do on a much bigger test base. (Since I do not have a more complicated tree to do that with instantly). But I can clearly see the finalized merge does indeed have the work left in branch B, since the removal of the work in A was on a single 'revert' commit. So it was easy to undo the undo. (My head hurts)	11:16
	← petersr left	11:17
WORMSS	Aristata: I was presuming Branch A had alot more work on it, with other people having commits 'after' the revert commit had happened	11:17
	If you have the option then yes, reset before the accidental merge, (and possibly rebase everything else back on top), and then merge into B would be the best.	11:18
	← philipandersen left	11:19
	→ philipandersen joined	11:19
	← Macaveli left	11:19
WORMSS	You say this accidental merge happens alot? Is this with a GUI? or command line?	11:20
	← flowinho left	11:20
	← nilg left	11:21
kqr	is there somewhere I can read about branches and garbage collection and such? I've never really felt like I understand how branches work... well, at all. I mean I can create them and push and pull to/from them but that's where my knowledge stops. can you delete branches? can you create branches without commits? and so on	11:21
WORMSS	It doesn't effect anything, just curious	11:21
	← ruukasu left	11:22
	→ nettoweb joined	11:22
	← devoldmx left	11:23
	→ tranzfuse joined	11:23
WORMSS	kqr: Branches point to a commit id.. (Full stop). When you make a new commit, it adds what ever that branch is pointing to, as the commits parent, and the changes the branch to point at the new commit ID. (Full stop)	11:23
	I think that is pretty much the end of it.	11:24
	→ paulweb515 joined	11:24
WORMSS	Everything else becomes the capabilities of the commits themselves.	11:24
tobiasvl	that seems to cover it, yes	11:24
	of course, you also have !remote_tracking branches	11:25
gitinfo	[!remote_tracking_branch] Remote-tracking branches (branches which start with e.g. 'origin/', listed by 'git branch -r') are read-only mirrors of the corresponding branches in another repository. They're updated by 'git fetch'. You can't edit them directly (trying to check them out results in a !detached HEAD), but you can create a new local branch based on a remote-tracking branch using e.g. 'git checkout -b <branch> <remote	11:25
tobiasvl	which are special	11:25
	→ Gizburdt joined	11:25
	← mennea left	11:25
	→ zhxt joined	11:25
	→ darnir joined	11:25
	← darnir left	11:26
	→ dougsland joined	11:26
	→ darnir joined	11:26
kqr	hm okay	11:26
	so branches are like read-write references to local commits while remote-tracking branches are read-only references to local commits and additional information on where to get new commits?	11:27
WORMSS	I don't really class 'remote tracking branches' anything more than a simple branch either. All they do again is point to a commit ID. It is the Log that does the hardwork of working out that a branch is x commits ahead/behind	11:27
	→ mennea joined	11:27
	← tranzfuse left	11:27
	→ BSaboia joined	11:27
	→ otter768 joined	11:27
	→ Macaveli joined	11:28
kqr	git is definitely not structured the way I expect it to	11:28
	though that's not a bad thing	11:28
	it seems way simpler than I want it to be	11:28
	← paulweb515 left	11:28
	→ philipd joined	11:29
	← philipandersen left	11:29
WORMSS	I think that might be deceptive.	11:29
	It is simple, but then things get built apon its simplicity :D	11:30
kqr	haha yeah I guess	11:30
	← punchagan left	11:30
	→ punchagan joined	11:31
	→ King_Hual joined	11:31
	← mkaesz left	11:31
	← kopparam left	11:31
	← zhxt left	11:31
WORMSS	I came from SourceSafe to SVN, and SVN was a god send... I then went from SVN to Git, and Git was a nightmare.. Until the lightbulb went on 1 day and the fog cleared... Now Git is Double the God send that SVN to SourceSafe was	11:32
	← vtunka left	11:32
osse	WORMSS: CET doesn't change. But its users switch to CEST	11:32
	← otter768 left	11:32
osse	wel... some ofthem	11:32
WORMSS	osse: you been researching that all this time?	11:33
	lol	11:33
	← raven-au left	11:33
osse	WORMSS: no, I was at lunch :P	11:33
WORMSS	Yeah, I stopped trying to work out the rest of EU's time zones.. Some of them make no sense. It hurts just trying to work out the UK some times.	11:34
osse	it does?	11:35
	→ iamjarvo joined	11:36
	→ dangerousdave joined	11:36
	→ tvw joined	11:36
	← ManikM left	11:36
	→ aynik joined	11:37
	→ Takle_ joined	11:37
	→ durre joined	11:37
	→ vtunka joined	11:37
WORMSS	If you look at Portugal for example.. It is the same longitude as the UK, Its actually even more west than ALL of England and Wales.. Yet, it has the same time zone as Germany.	11:38
	→ mkaesz joined	11:38
	← iamjarvo left	11:39
	← Takle left	11:39
	← mennea left	11:39
WORMSS	I am a firm believer in just having everyone on UTC..	11:39
	← nettoweb left	11:40
	← jslirola left	11:40
	← vital left	11:40
WORMSS	no BST or DST or what ever people want to call it.	11:40
osse	it doesn't have the same timezone as germany	11:40
	→ mennea joined	11:41
	← marchdown left	11:41
WORMSS	I was told it does?	11:41
	Let me look	11:41
	→ ManikM joined	11:41
	→ mskaesz joined	11:41
	→ vital joined	11:41
WORMSS	Ok, even worse, portugal has 2 time zones :(	11:42
	→ niro joined	11:42
	← niro left	11:42
	→ niro joined	11:42
WORMSS	I give up now.	11:42
	→ paulweb515 joined	11:42
	← mennea left	11:42
	← mkaesz left	11:42
WORMSS	World needs a reset!	11:42
	← k_sze[work] left	11:44
	→ mennea joined	11:44
	← polyzen left	11:44
osse	nah	11:44
	portugal has two because of the azores. same reason the US has 4 or 5 and Russia has 11 or whatever	11:45
deepy	I'm still surprised we don't have a location-independant timezone	11:46
jast	we do, it's called UTC	11:47
osse	huh? all timezones are independent of location	11:47
jast	except they only apply to specific locations :)	11:47
someplace	most of them only for half the year	11:48
osse	if you mean people usually use them only in specific lcoations then I agree	11:48
	→ nettoweb joined	11:48
	→ bhuvanaurora joined	11:48
	→ zhxt joined	11:48
osse	but it's not like you get "undefined behaviour" if you use CET in China	11:48
tobiasvl	timezones are locations, but times in the timezones are universal. the time now is 11:48 UTC no matter what your location is :P	11:49
	or 12:48 CET, regardless of location	11:49
	etc	11:49
someplace	it's 11:49 for me	11:49
jast	it's actually 11:46	11:49
	← ecky--ptang-zoob left	11:49
osse	tobiasvl: yes, so why are timezones locations then?	11:49
deepy	But if you say 14:00 UTC when in China people will look at you like you're silly	11:49
WORMSS	nope, 11:49	11:49
someplace	see, we don't need timezones to have an argument over time!	11:49
tobiasvl	hehe	11:49
WORMSS	LOL	11:49
tobiasvl	it was 11:48 while I typed, but my message was timestamped 11:49 here too, so we agree on that time	11:50
	→ zheng joined	11:50
tobiasvl	jast's 11:46 is a problem though	11:50
	he's in the past	11:50
jast	someone screwed up NTP on this system then	11:50
	→ skylite_ joined	11:50
someplace	it's 11:50 though	11:51
	and now it's 11:51	11:51
WORMSS	Or maybe, your internet connection is traveling faster than the speed of light?	11:51
jast	agreed, now	11:51
	I have three different ideas on what the current time is on my screen	11:51
	→ raven-au joined	11:51
	← atran left	11:52
jast	one via SSH (wrong), one in the host system (wrong), one in the virtual machine (correct)	11:52
deepy	Jokes on you, time is an illusion	11:52
	NEITHER ARE CORRECT	11:52
jast	let's bring the theory of relativity into this	11:52
osse	one time that is always correct is 'now'	11:52
WORMSS	I was about to say My watch agrees with my phone.. but since my watch is maintained by my phone, I kinda facepalmed myself	11:52
	← zheng left	11:52
	← nettoweb left	11:53
	→ wrouesnel joined	11:53
osse	my watch doesn't even handle months with fewer than 31 days in them	11:53
someplace	"now" isn't future proof	11:53
osse	someplace: it wasn't, but it is now	11:53
WORMSS	Is that true if you take quantom theory into account? since it could be both NOW and Not NOW at the same time?	11:53
someplace	"then" will only be wrong once, "now" will only be right once	11:54
	→ palcu joined	11:54
WORMSS	Oh dear, I think we just invented "Schrodinger's Watch"	11:54
	← zoso left	11:56
deepy	If you start reading 'now' is it still 'now' when you finish?	11:56
osse	no he used a Tag heuer	11:56
	← dtrott left	11:56
	→ xcesariox joined	11:56
osse	deepy: yes	11:56
deepy	And if so, was it now when you started?	11:56
	← GGflags__ left	11:57
osse	also yes	11:57
someplace	interesting..	11:57
osse	'now' continually changes meaning to mean... well... now	11:57
	→ wxg4irc joined	11:57
	← dsdeiz_ left	11:57
deepy	Then now can't be now	11:57
tobiasvl	TIME IS RELATIVE	11:57
	READ UP ON EINSTEIN, SHEEPLE	11:57
WORMSS	Does this mean Time is able to rebase?	11:57
osse	deepy: correct	11:58
deepy	I don't think time exists at all	11:58
	And each monday proves this to me	11:58
	← leeN left	11:59
WORMSS	Are we still Monday? God Damit.	11:59
	← palcu left	11:59
osse	some are	11:59
	I think there are some timezones that are UTC - 12:30 or something	11:59
	← bhuvanaurora left	11:59
osse	in which case there is a half hour of monday left	12:00
WORMSS	Though, I did hear 'It's always Monday somewhere in the world' once.. I can't remember where, but again, Facepalm	12:00
osse	but it's late so they're probably watching TV or in bed	12:00
tobiasvl	WORMSS: actually it's always monday in indonesia. little known fact	12:00
	→ MattMaker joined	12:01
WORMSS	Maybe someone should finally take down that paper calendar page?	12:01
osse	let's talk first days of the week!	12:02
	the correct answer is: Monday!	12:02
deepy	tuesday	12:02
tobiasvl	monday obviously	12:02
deepy	Productively speaking it can't be a Monday	12:02
	no work gets done on Monday	12:02
osse	tobiasvl: what's your LANG set to?	12:02
tobiasvl	osse: nb_NO.UTF-8	12:02
deepy	nb?	12:03
osse	tobiasvl: run this: 'LANG=en_US.UTF-8 cal'	12:03
tobiasvl	ugh	12:03
osse	BEHOLD the first column!	12:03
WORMSS	Monday, otherwise the term 'weekend' would be crazy if half of it was on the first of the week'	12:03
tobiasvl	osse: what a nightmare	12:03
	deepy: http://en.wikipedia.org/wiki/Bokm%C3%A5l	12:04
	→ whomp joined	12:04
tobiasvl	osse: are you in the US? how does the first day being sunday affect the CULTURE?!	12:04
	→ EminenceHC joined	12:05
tobiasvl	"ah, now it's a fresh new week here, let's kick back one more day"	12:05
	→ teran joined	12:05
	← martinklepsch left	12:05
osse	tobiasvl: i am not in the US	12:05
	but I would presume it doesn't affect culture at all	12:05
	→ teran_ joined	12:06
osse	it would explain why all the good shows air on sundays though	12:06
	because starting a new week sucks	12:06
	← mgaunard_ left	12:07
	→ doev joined	12:08
	→ moritzs joined	12:08
osse	tobiasvl: 'LANG=en_GB.UTF-8 cal'	12:08
	← arnaud___ left	12:08
	← EminenceHC left	12:09
tobiasvl	phew	12:09
	← whomp left	12:09
	← teran left	12:10
	← Walex left	12:11
	→ tier joined	12:11
	→ Walex joined	12:11
	← normalra left	12:12
osse	how about this: , or . for decimal separation?	12:12
	pi = 3,14 versus pi = 3.14	12:13
tobiasvl	we use , in my country but I have no strong feelings about it. I assume . is the ISO standard?	12:13
	never actually looked into that	12:13
osse	"how big is a billion?" and on and on it goes	12:13
	← dangerousdave left	12:13
tobiasvl	yeah jeez	12:14
	ok ok ok	12:14
	imperial vs metric	12:14
	GO!!!	12:14
	← xcesariox left	12:14
WORMSS	I hate that Google doesn't realise you cannot do 15.5 st	12:14
osse	http://en.wikipedia.org/wiki/Decimal_mark#mediaviewer/File:DecimalSeparator.svg	12:14
WORMSS	Because that is 15st 6lbs	12:15
	osse: that annoys me with currency.. Some countries to 12.345.678,90	12:15
	→ marchdown joined	12:16
WORMSS	sorry, didn't make that very clear, 1.23.456,78	12:16
	→ dangerousdave joined	12:16
WORMSS	Double and then triple divides	12:16
jast	but why?	12:16
osse	WORMSS: who does that? :O	12:17
tobiasvl	osse: ah, that's interesting. , is way more prevalent than I thought	12:17
WORMSS	Oh god, please dont ask me that.. ermm... Let me find it again.	12:17
osse	WORMSS: J'accuse!!! I was just reminded that I had a UK math book where the multiplication mark was identical to a full stop	12:19
WORMSS	India uses thousands/lakh/crore separators	12:19
osse	it would say 5 . 3 = 15	12:20
	uuuuuugh	12:20
WORMSS	?? Really? we usually use x as children or * as adults	12:20
	← tier left	12:20
osse	an asterisk? I don't meany in your crappy documents written in Word or whatever. I mean in properly set academic text	12:20
WORMSS	well, I say Adults..	12:21
osse	(or hand written)	12:21
WORMSS	Ahh, academic, I think I may have seen that before. But not a 'usual' way of doing things.	12:21
	← pullphinger left	12:21
	→ EminenceHC joined	12:22
	→ ksk joined	12:22
WORMSS	I could always drop the major argument bomb.... US Date format..	12:23
jast	if you don't use a middle dot I'm not gonna take you seriously :}	12:23
	osse prefers a middle dot	12:23
osse	except when I can get away with writing nothing	12:23
moritz	middle.dot	12:23
	WORMSS ducks and covers	12:23
	jast disintegrates moritz	12:23
	← Takle_ left	12:23
	moritz becomes a corrosive cloud, heads for jast's hardware	12:23
jast	which isn't to say I'm differentiating you or anything	12:23
	→ msankhala joined	12:23
jast	(gotta love unfunny math puns)	12:24
WORMSS	is middle dot the equilent of calling underscore lodash?	12:24
jast	no, middle dot is the official name	12:24
	http://www.fileformat.info/info/unicode/char/00b7/index.htm	12:25
	→ samsquanch joined	12:25
	← JohnBat26 left	12:25
WORMSS	Hahar.. I found it 0183.. ·	12:25
	← bq left	12:25
jast	okay, the official name of underscore is not underscore	12:25
	it's LOW LINE \o/	12:26
	← endiruna left	12:26
WORMSS	really? wow, I feel cheapened by the English Language now..	12:26
jast	well, official according to the unicode consortium, I suppose	12:26
Seveas	jast: $cow_orker keeps calling it underbar. Annoys me to no end :)	12:27
	← EminenceHC left	12:27
jast	wikipedia calls it underscore	12:27
	"(also called understrike, underbar, low line, underdash, underline, downspace, or low dash)"	12:27
WORMSS	underbar :D I like that one :D	12:27
jast	I'm gonna call it downspace from now on to confuse everyone	12:27
osse	underbar is wunderbar	12:27
Seveas	underbar is where I am at the end of a good night :)	12:27
WORMSS	osse: exactly	12:28
jast	gcc -Wunderbar	12:28
	this has potential	12:28
	→ clauswitt joined	12:28
Seveas	osse: damn you. Said $cow_orker is german, I shall be calling this thing the (w)underbar from now on.	12:28
	jast: what would it do? Warn if you use them? :)	12:28
	← ManikM left	12:29
	→ devoldmx joined	12:29
	← vtunka left	12:29
	→ ManikM joined	12:29
	→ Takle joined	12:29
jast	Seveas: no idea. it's gcc, it could be doing pretty much anything...	12:29
	WORMSS feels left out of the nix joke :(*	12:30
Seveas	gcc -Worms -Wunderbar -Wall	12:30
	→ ThomasLocke joined	12:30
osse	gcc -White-supremacy	12:30
WORMSS	should I be backing away slowly?	12:31
Renter	you should always back up	12:31
jast	gcc -Drop -Dwarf -Down -Drain	12:31
	← arup_r_ left	12:32
	→ kopparam joined	12:32
	← Gitzilla left	12:32
	→ barduck joined	12:32
	← skylite_ left	12:33
	← sinkensabe left	12:33
osse	tobiasvl: i'd vote for metric, but I think the meter is a little too long	12:34
	it should be about 80 cm in today's terms	12:34
	it's always longer than you think	12:34
jast	(reference to westley.c in 11th IOCCC)	12:34
	← ctg left	12:34
	← durre left	12:35
WORMSS	Just mix it all up like we do. :D 200mm by 4 inches	12:35
	annoys the hell outta people.	12:35
	→ arup_r joined	12:35
osse	it's fun when you confuse yourself, re: miles to the gallon	12:35
WORMSS	I still cannot understand the Meter or KM though..	12:36
jast	what's there to understand? it's a unit of length.	12:36
osse	WORMSS: there's nothing to understand: a meter is a defined length. a KM is a thousand of them	12:36
WORMSS	osse: what is worse, is our fuel pumps work in Liters (UK, not US), but all our car performance benchmarks in Miles to Gallon	12:36
osse	WORMSS: which gallon though? :P	12:36
jast	and which mile?	12:37
Renter	osse: one gallon, duh	12:37
	→ durre joined	12:37
WORMSS	That is a great question.. The one that is not water down	12:37
	Solid1 → Solid1_afk	12:37
	← netj left	12:37
	→ netj joined	12:37
	← kopparam left	12:37
Renter	WORMSS: the right answer is probably 'whatever works for the marketing people since they never have to explain anyway'	12:37
jast	how about attoparsec to pint	12:37
osse	WORMSS: watered down? so the smaller one?	12:37
	→ JohnBat26 joined	12:37
jast	no, watered down means more water per volume	12:38
	moritz finds the non-metric heat conductivity especially funny: Btu/(hr F ft)	12:38
	Solid1_afk → Solid1	12:38
jast	i.e. probably nautical mile	12:38
WORMSS	I think its the smaller one.. yeah.. Because I think there is 1 gallon (uk) of fuel, in the 1 gallon (us).. but there is also something to water it down.. So you are actually paying for 1UK gallon of fuel + some extra stuff that does nothing for the engine.. but then you buy by the US gallon	12:39
	← marchdown left	12:40
osse	but the UK one is the bigger one	12:40
	→ sinkensabe joined	12:40
WORMSS	If that is the case, then I have no idea what is going on..	12:40
osse	hence a UK pint is more manly than a US pint.	12:41
	But I don't think "pint" is "a thing" in the US	12:41
WORMSS	no no, 1 US gallon = 0.832 UK gallon	12:41
osse	exactly. the UK one is larger	12:41
WORMSS	so when you by 1 US gallon of petrol at the station.. You are getting 0.8326 amount of petrol, + 0.1674 of FILLER liquid	12:42
	← MattMaker left	12:42
osse	!?!?!	12:42
WORMSS	Well, you need a bigger container for the US gallon, so I would say that is bigger	12:42
osse	?!?!?! again	12:42
moritz	speaking of which, the energy companies ripp you. They send you the current through the wire, and then THEY GET IT BACK through the null wire	12:42
	and then they can sell the same current again!!! :-)	12:43
osse	WORMSS: what makes you think a US gallon takes up more space when less than one UK gallon is equal to it?	12:43
WORMSS	1 UK Gallon is 1.20095 US Gallon.. (EG, bigger)	12:44
	← okanck left	12:44
osse	yes	12:44
	→ nettoweb joined	12:44
	→ palcu joined	12:44
	← netcarver left	12:44
	← JohnBat26 left	12:44
WORMSS	Ahh, yeah.. penny dropped..	12:45
osse	which penny?	12:45
WORMSS	Aussie penny	12:45
osse	a penny-penny or a cent-penny?	12:45
	oooh	12:45
WORMSS	actually.. Canadian Penny... Since.. Have they not taken that out of circulation now?	12:46
	→ Steve_Jobs joined	12:46
osse	yeah the Aussies are über metric. They list their car POWER in kilowatts. That's pretty badass	12:46
	→ palcu_ joined	12:47
	← virtualsue left	12:47
	→ JohnBat26 joined	12:47
	← arup_r left	12:47
	→ dbolser joined	12:47
osse	moritz: but then 1/50 of a second later they send it back the other way :O	12:48
WORMSS	That will make a lot more cents (coughcough) when the primary car becomes eletric rather than petrol again	12:48
dbolser	hello, I'm stuck... I have two repos configured, and want to compare a branch on one with a tag on the other, where the branch and the tag have the same name	12:48
WORMSS	since back in the day, there were more eletric cars in the world rather than petrol	12:48
	← knobo left	12:48
WORMSS	dbolser: could you set up the second repo as a Remote on the first?	12:49
	← palcu left	12:49
WORMSS	Do they share any commits at all?	12:49
dbolser	I have both remotes 'configured' in my repo	12:49
	WORMSS: yes	12:49
WORMSS	command line?	12:49
dbolser	they are a) 'central ro' and b) local rw + a patch	12:49
	yes	12:49
osse	WORMSS: yes because HORSEpower makes sense for petrol in the first place :P	12:50
WORMSS	osse: you got me on that one..	12:50
	← wrouesnel left	12:50
osse	also watt has nothing to do with electricity :p	12:50
dbolser	git show ..drupal/7.x-3.1 # fatal: ambiguous argument '..drupal/7.x-3.1': unknown revision or path not in the working tree.	12:50
osse	(in principle)	12:50
WORMSS	dbolser: just trying to remember the commands for that	12:50
	WATT???	12:50
osse	dbolser: remove the ..	12:50
dbolser	fatal: ambiguous argument 'drupal/7.x-3.1': unknown revision or path not in the working tree.	12:51
osse	dbolser: is 7.x-3.1 a branch or a tag?	12:51
	both?	12:51
dbolser	7.x-3.1 is the tag in the remote called drupal	12:51
	tag in drupal, branch in origin	12:51
	→ sburgess joined	12:51
	WORMSS 's head hurts	12:51
osse	dbolser: git diff refs/remotes/origin/7.x-3.1 refs/tags/7.x-3.1	12:52
	dbolser: unlike branches, tags don't belong to a specific repo. they are in a shared namespace	12:52
dbolser	osse: ah ha...	12:52
	ic	12:52
	osse: that was my next question!	12:52
WORMSS	That I didn't know	12:52
osse	I am clairvoyant	12:52
dbolser	claire voyant?	12:53
	she was my highschool teacher	12:53
WORMSS	Chair Bouyant?	12:53
dbolser	WAT?	12:53
	→ DolpheenDream joined	12:53
WORMSS	your teacher was called Claire Voyant?	12:53
dbolser	WATT?	12:53
	→ arup_r joined	12:53
dbolser	no not really	12:53
	← Jonuz left	12:54
osse	dbolser: https://www.youtube.com/watch?v=D-3ra8Jsmjk	12:54
WORMSS	damn it.. I had a line of jokes forming in my head	12:54
dbolser	WORMSS: just pretend I said yes	12:54
WORMSS	lol	12:54
	too late, moment has passed	12:54
	→ CKyle joined	12:54
osse	JOULES PER SECOND???	12:54
	← teran_ left	12:54
dbolser	my jim teacher was called simon kickk	12:54
WORMSS	Gems per hour?	12:54
dbolser	we called him si-cick	12:54
	osse: "This video is unavailable with Safety Mode enabled. To view this video, you will need to disable Safety Mode"	12:55
	← arup_r left	12:55
WORMSS	I had a 'Hench Hunter' as a P.E teacher..	12:55
	→ okanck joined	12:55
osse	dbolser: spotify:track:24AujSHrDjhVIn3qc1COAV	12:55
dbolser	osse: got it	12:56
	→ knobo joined	12:56
dbolser	now to rebase my branch on that tag...	12:56
	ams__ → ams_	12:56
	WORMSS has not done any work in ....... what Time zone are we in?	12:56
osse	WORMSS: doesn't matter :p	12:57
dbolser	thanks for help	12:57
	osse: it does if he's traveling...	12:57
	→ teran joined	12:58
WORMSS	We are all traveling..	12:58
	just depends relative to what	12:58
	→ teran_ joined	12:58
	← u1106 left	12:58
	→ martinklepsch joined	12:58
	← CKyle left	12:59
WORMSS	Oh, god, that reminds me when I was returning from Finland from holiday..	12:59
osse	WORMSS: you can probably get off murder charges that way. "Not my fault he traveled very fast in the direction of my stationary, levitating bullet!"	12:59
	→ u1106 joined	13:00
	→ fstd_ joined	13:00
WORMSS	when my plane taken off, UK was in BST, by the time I landed, UK was NOT in BST... Trying to organise when to be picked up was a nightmare	13:00
cbreak	osse: careful	13:01
	osse: I heard the british police kills first, and asks questions later	13:01
	← Ionic left	13:01
cbreak	if you're black and trying to catch a train at least	13:01
WORMSS	cbreak: lol, UK police have no guns..	13:01
osse	:O	13:01
WORMSS	(well, some do, but only specialist)	13:01
cbreak	specialists in ... shooting people?	13:01
jast	there are big friendly green buttons in the tube stations in London	13:02
	← roelmonnens left	13:02
jast	still haven't figured out what they do, but my hypothesis is they activate sentry guns	13:02
WORMSS	yeah.. My friend is currently taking the exams to be what you would consider SWAT	13:02
	← teran left	13:02
	→ roelmonnens joined	13:02
WORMSS	jast: you would wish they were sentry guns.. atleast you would know what fate is instore for you if you did it	13:03
	Sometimes the mystery is worse than the punishment	13:03
cbreak	http://en.wikipedia.org/wiki/Death_of_Jean_Charles_de_Menezes	13:03
TomyWork	<WORMSS> Though, the upside is paid holiday and paid sickness	13:03
	← subhojit777 left	13:03
TomyWork	that is required by law over here	13:03
jast	IIRC the signs say "if you feel uncomfortable press the green button"	13:03
	← fstd left	13:04
	fstd_ → fstd	13:04
osse	cbreak: oh snap	13:04
jast	sentry guns definitely take care of feeling uncomfortable	13:04
WORMSS	they let you have a nice lay down	13:04
	→ CKyle joined	13:04
WORMSS	with your hands behind your head	13:04
	← rchavik left	13:04
WORMSS	though, face down is not that great	13:04
	But they give you 5 seconds to comply	13:04
	4 seconds to comply	13:04
jast	a brief sharp increase in uncomfortableness, then... total lack of lack of comfort	13:04
WORMSS	3... you get the idea	13:04
	← acolson left	13:05
	→ arup_r joined	13:05
cbreak	WORMSS: reminds me of Robocop	13:05
TomyWork	anyway, I've rebased and filter-branched my git-svn clone around a bit, now I can't do "git svn rebase" anymore, not even find-rev would work	13:05
	← jcalonso left	13:05
cbreak	WORMSS: ... or judge dread	13:05
TomyWork	git svn fetch does, though	13:06
WORMSS	git svn..... the dark art	13:06
cbreak	TomyWork: reset --hard to the svn head, discarding local history an option?	13:06
	← arup_r left	13:06
WORMSS	they should just change it to git magic	13:06
TomyWork	cbreak that would undo my rebasings though	13:06
	thigns like changing names and such	13:06
	(didnt touch the git-svn-ids)	13:07
	i did mess with the rest of the commit messages though. they were horribly ungitty	13:07
	← beautifulmind left	13:07
cbreak	TomyWork: yes, throw them away	13:07
	TomyWork: if you want to commit back to svn you can't rewrite history	13:07
esc	regarding the recent conversion I had about rebase vs. cherry-pick in this channel	13:08
	https://bugs.eclipse.org/bugs/show_bug.cgi?id=447115	13:08
	...	13:08
TomyWork	cbreak huh, why not?	13:08
cbreak	TomyWork: because svn doesn't support history rewriting	13:08
	← jatt left	13:08
TomyWork	yes, but all i'd need would be a regenerated rev_map	13:08
cbreak	esc: doesn't look like a git problem	13:08
esc	cbreak: no it isn't	13:09
	just someone decided to implement cherry-pick using rebase	13:09
	for whatever reasons...	13:09
TomyWork	oh, turns out deleting it and doing find-rev works just fine	13:09
cbreak	esc: should be the other way around	13:09
	→ snonez joined	13:10
	→ k_sze[work] joined	13:10
	← snonez left	13:10
	→ snonez joined	13:10
	→ LucasTT joined	13:11
	→ tranzfuse joined	13:11
	→ arup_r joined	13:11
	← fr33domlover left	13:12
	→ endiruna joined	13:12
	→ vtunka joined	13:12
	→ cannonball joined	13:12
	← arup_r left	13:13
	← snonez left	13:13
	→ snonez joined	13:13
	→ fr33domlover joined	13:13
	→ EminenceHC joined	13:13
	→ Milkweed joined	13:13
	→ jatt joined	13:14
	← k_sze[work] left	13:14
	← jatt left	13:16
	← tranzfuse left	13:16
	← snonez left	13:17
	→ polyzen joined	13:17
	→ acolson joined	13:18
	→ sebhoss joined	13:18
	← EminenceHC left	13:18
	→ arnaud___ joined	13:18
	← nezZario left	13:19
	← devhost left	13:21
	→ devhost joined	13:21
	← e66 left	13:22
	→ e66 joined	13:22
WORMSS	osse: anyone have any idea why a 'common commit' is needed for a octopus merge?	13:23
	← CKyle left	13:24
WORMSS	I have 3 non conflicting orphan commits, trying to merge them using octopus..	13:24
jast	assuming you mean a merge base... there needs to be some reference to figure out which changes on each branch should be applied as part of the merge, and which are already part of the target branch	13:24
	t0th_-___ → t0th_-_	13:25
jast	with recursive merge, orphan merges work, though you don't get conflict markers inside files; the whole file will conflict	13:25
	maybe this is not implemented for octopus...	13:25
	← eletuchy left	13:25
	→ CEnnis91 joined	13:26
WORMSS	how about "all of it"	13:26
	ahh, sorry, my client didn't scroll down	13:26
jast	naughty client	13:27
	→ tristanp joined	13:27
	→ tmcmahon joined	13:27
WORMSS	well, need to get a proper client, I'm using freenode's webchat	13:27
	→ crose joined	13:28
	← arnaud___ left	13:28
	→ otter768 joined	13:28
	← Gizburdt left	13:29
jast	I don't actually have any idea what octopus does... and AFAIK virtually nobody uses it	13:29
WORMSS	Just a shame. Noone is giving the love to the octopus merge.	13:29
osse	it's used in linux all the time	13:29
WORMSS	I would, but I just not *nix enough to understand how.. :(	13:29
	← knobo left	13:30
deepy	octopus?	13:30
	→ encod3 joined	13:30
jast	deepy: 'git merge' with more than one argument	13:30
WORMSS	jast: It's the orgy of parenting.. Why have 2 parents when you can have multiple :D	13:31
	← Raging_Hog left	13:31
WORMSS	We have several tools all made in different repos.. We decided to have 1 repo for the lot of them.. The last commit on all repos was to put all files within their own folders. And then I set all tools repos to be remotes.. and said.. NOW.. MERGE THE LOT OF THEM... (FAILED)..	13:33
	→ Akagi201 joined	13:33
osse	linux's master branch currently has 876 octopus merges	13:33
jast	and OTOH I don't understand recursive merge well enough to know whether octopus could be implemented similarly	13:33
	← otter768 left	13:33
WORMSS	So now I need to merge 1 by 1... :( No need.. :(	13:33
	→ Gizburdt joined	13:33
jast	the individual branches already have the tools in their own subdir each?	13:33
osse	WORMSS: there's no common ancestor then. probably best to use commit-tree	13:33
	← msankhala left	13:33
	→ alexKuleshov joined	13:34
jast	if so you can make merge commit manually	13:34
	← crose left	13:34
jast	*the	13:34
WORMSS	never used that?	13:34
jast	it's basically what happens at a lower level	13:34
	← tvw left	13:34
	→ danemacmillan joined	13:35
WORMSS	jast: merge them all to the working tree and then finalise?	13:35
jast	summary: git read-tree with the proper prefix args and such to read all of the tools branches (or, rather, the files on them) into the index, git write-tree to create a tree object from the combination, git commit-tree (passing the tree ID, the parent IDs and the commit message)	13:35
	instead of using read-tree I suppose you can 'git merge --no-commit' the branches individually	13:36
	← ap0c left	13:36
	→ iamjarvo joined	13:37
	← cagedwisdom left	13:37
	→ blackmesa joined	13:37
WORMSS	jast: just tried the --no-commit now.. can only do 1.. soon as I tried the second, it said I have not concluded your merge	13:38
	→ ap0c joined	13:38
	← ap0c left	13:38
	→ ap0c joined	13:38
osse	WORMSS: do all the commits one by one. then you can use commit-tree to make it all easier	13:38
	because then the index and whatever is already good to go	13:38
jast	hmm	13:39
WORMSS	Give me a minute to read up on read-tree and commit-tree	13:39
jast	how about --squash --no-commit	13:39
	oh, --squash implies --no-commit, according to the manpage	13:39
	← Guest63882 left	13:40
	← Consuela left	13:40
WORMSS	does that remove the history of the tools?	13:40
	→ MarkyC joined	13:41
osse	no	13:41
jast	generally, yes, but we're only using it for prep work	13:41
	← liamkeily left	13:42
	→ kadoban joined	13:43
	→ dsdeiz joined	13:44
WORMSS	what is a tree-ish#	13:44
	→ tvw joined	13:44
osse	WORMSS: a tree or something that contains a tree	13:44
	such as a commit or tag	13:44
WORMSS	I presume this is not the Sha id?	13:45
	of the last commit?	13:45
osse	it is a SHA ID yes	13:45
jast	it's anything that can resolve to a tree ID/object	13:46
osse	WORMSS: git rev-parse master will give you the commit ID. git rev-parse master^{tree} will give you the tree id	13:46
	→ ruukasu joined	13:47
	← nikita left	13:47
	→ wrouesnel joined	13:48
WORMSS	this has quickly gone beyond my usual level of git.. lol	13:48
	→ knobo joined	13:49
	→ mikemonteith joined	13:50
	← tristanp left	13:50
jast	welcome to the dark side	13:50
	→ nikita joined	13:50
WORMSS	Do you have cookies>?	13:50
jast	we have refspecs	13:51
WORMSS	You know, the moment I get this working.. I will jump for joy.. and instantly forget everything	13:51
	← wxg4irc left	13:51
	← durre left	13:52
osse	you know, you could merge each branch seperately and get on with it	13:53
	felipedvorak → shiva	13:53
jast	don't spoil all the fun now :(	13:53
WORMSS	yes, but now I am determined to try and understand this dark art	13:54
	shiva → felipedvorak	13:54
	← ap0c left	13:54
jast	give into your anger. your anger makes you strong.	13:54
	→ hollusion joined	13:57
	→ ColdKeyboard joined	13:57
WORMSS	meh.. i am not understanding this :(	13:57
	give me a second.. actual work..	13:57
osse	then ask questions	13:57
	← gavit left	13:57
	← vtunka left	13:58
	→ tristanp joined	13:58
hollusion	hey guys, git diff --name-status HEAD HEAD^ shows me the edited files compared to last commit. is there a way to filter these only for files that got toughed by user X?	13:58
	← barduck left	13:58
hollusion	*touched	13:58
osse	hollusion: only one user touched all of those files, and that user is the author of the comimt	13:58
	→ astrofog joined	13:58
	→ barduck joined	13:59
	→ n-st joined	13:59
	← mikemonteith left	13:59
hollusion	osse: yes but what happens if i replace HEAD^ with an older commit	13:59
	← n-st left	13:59
	→ jerius joined	13:59
osse	hollusion: git log --author=X HEAD~5..HEAD	14:00
	→ n-st joined	14:00
	← n-st left	14:00
WORMSS	is there anythign I need to do to make sure git read-tree is reset?	14:00
	→ liamkeily joined	14:00
	→ tier joined	14:01
	→ delboy1978uk joined	14:01
delboy1978uk	http://pastie.org/9742508#21 what does this mean? updates were rejected?	14:02
hollusion	osse id like to get a list of all touched (edit, added) files from HEAD to SHA	14:02
jast	delboy1978uk: faq non-ff	14:02
gitinfo	delboy1978uk: Your push would lose changes on the remote; more details available at https://git.wiki.kernel.org/index.php/GitFaq#non-ff	14:02
hollusion	osse: and deleted	14:03
	smth like git diff --name-status does	14:03
jast	delboy1978uk: you were pushing two branches at the same time. your update on dev-master went through, the one on master did not.	14:03
	→ arup_r joined	14:03
	→ sohail joined	14:03
osse	hollusion: git log --author=X --pretty=' %s' --name-status HEAD~50..HEAD \| sed '/^$\\|^ /d' \| sort -u	14:03
	← Milkweed left	14:04
jast	delboy1978uk: if you always want to, by default, push the current branch only, use the command with 'simple' in the long message up top, which will also make the message disappear in the future :)	14:04
osse	WORMSS: what do you mean?	14:04
	← arup_r left	14:04
hollusion	osse: HEAD~50 is 50 commints before current?	14:04
osse	hollusion: yes	14:05
	hollusion: replace with whatever SHA you want	14:05
hollusion	i see	14:05
	and keep ..HEAD at the end?	14:05
jast	yes	14:05
hollusion	like: 981bdf6cef9e57ae0904ecbad926f9784c59c726..HEAD	14:05
osse	that's up to you. You said from SHA to HEAD, so in that case the answer is ye	14:06
	ss	14:06
	→ agileadam joined	14:06
hollusion	alright, thank you both	14:06
	→ denete joined	14:06
	→ vtunka joined	14:06
hollusion	btw is HEAD^ == HEAD~1 ?	14:07
	← s8321414 left	14:07
	→ Niharika joined	14:08
	→ listochkin joined	14:08
osse	yes	14:08
	← Gizburdt left	14:10
	← joo-_ left	14:10
hollusion	git log --author="Martin Krug" --pretty=' %s' --name-status 981bdf6cef9e57ae0904ecbad926f9784c59c726..HEAD \| sed '/^$\\|^ /d' \| sort -u	14:10
	does not contain all files i have touched	14:10
	981bdf6cef9e57ae0904ecbad926f9784c59c726 is from Juli 15.	14:11
	and the return of the command above looks like my last commit	14:11
	did i do anything wrong here?	14:11
osse	not that I can see	14:12
	git log -- one/of/the/files/that/are/missing	14:12
	are any commits by you?	14:12
	→ AL13N_work joined	14:12
hollusion	of course some of those files were edited by others but that doesnt bother me	14:12
	→ joo-_ joined	14:12
AL13N_work	how can i do a git pull if i'm not inside the git directory?	14:12
hollusion	osse: there are lots of commits bewteen the SHA and HEAD by me	14:12
osse	AL13N_work: git -C path/to/directory pull	14:12
	hollusion: that was not my question	14:13
AL13N_work	aah, thx	14:13
	osse: does this also work on --bare ones?	14:13
osse	AL13N_work: no	14:13
	← dialeth_ left	14:14
AL13N_work	hmm, didn't seem to work	14:14
	← sarri left	14:14
AL13N_work	git doesn't know -C	14:14
osse	AL13N_work: git --git-dir=path/to/repo/.git --work-tree=path/to/repo pull	14:14
hollusion	osse: i get it now, my name somehow changed	14:15
	← dsdeiz left	14:15
	→ enitiz joined	14:15
	→ EminenceHC joined	14:15
hollusion	how can i supply --author with multiple names?	14:15
	--author=('a'\|'b') ?	14:15
osse	hollusion: --author=X --author=Y	14:15
hollusion	sweet, thank you so much	14:15
	is it possible to change the author of old commits?	14:16
BtbN	not without rewriting the entire history starting from that commit.	14:16
osse	hollusion: no, but you can create a file that maps new to old names so that the git log is consistent	14:16
	→ sarri joined	14:16
	→ atran joined	14:16
	→ bhuvanaurora joined	14:17
	← tystr left	14:17
	← jerius left	14:17
	→ mikecmpbll joined	14:17
AL13N_work	osse: why doesn't this work with --bare gits?	14:18
	→ kopparam joined	14:18
	→ tystr joined	14:19
	→ Pyrogerg joined	14:19
osse	AL13N_work: pull does a merge, merge needs files	14:19
	→ tier_ joined	14:19
WORMSS	AL13N_work: you could do a fetch	14:19
	← bhuvanaurora left	14:19
	← EminenceHC left	14:20
	→ crose joined	14:21
	← MissionCritical left	14:21
	→ mikemont_ joined	14:22
AL13N_work	hmm, then i don't know if i'm doing this right... there's a git repository somewhere, and i need a git repository that receives the push's of our internal people, but regularly fetch from the upstream git too	14:22
	← tier left	14:22
AL13N_work	normally our people work in new branches	14:22
	that don't exist in the upstream	14:22
	→ Jkerzz joined	14:23
	← kopparam left	14:23
	← alexKuleshov left	14:23
	← e66 left	14:23
	← Guest56598 left	14:24
jast	git --git-dir=... fetch; git --git-dir=... push . refs/remotes/origin/:refs/heads/	14:24
	→ arnaud___ joined	14:24
BtbN	Why not just cd there instead?	14:24
jast	sure, just remember to unset GIT_DIR if you're doing it in a hook	14:25
	→ e66 joined	14:25
jast	btw this will throw up if a fast-forward update doesn't succeed	14:25
	or use 'push -f' to simply throw away all changes that are in the way	14:25
	← tmcmahon left	14:26
	→ LeMike joined	14:26
	← philipd left	14:27
	→ Mission-Critical joined	14:27
AL13N_work	jast: why the push after the fetch?	14:28
	i was thinking of doing a crontab every minute to git fetch --all the bare repository	14:28
jast	fetch gets the updates from the remote. the push is used to 'push' locally, copying the remote-tracking branches from origin into the normal branches	14:29
	← ManikM left	14:29
	← arnaud___ left	14:29
	→ ManikM joined	14:29
	→ Pyrogerg_ joined	14:29
	← Pyrogerg left	14:29
AL13N_work	oic, even if this is a --bare one?	14:29
	→ SumDude joined	14:29
jast	'git push .' = "push" to the local repository	14:29
	yeah, push doesn't need a working tree	14:29
osse	jast: in that case you could change the refspec fetch uses, I think	14:30
	→ Neozonz joined	14:30
	→ philipd joined	14:31
jast	I'd rather not because that'd violate expectations	14:31
osse	whose?	14:32
	→ osheridan joined	14:33
jast	anyone else's who might ever need to work with the repo on the server	14:33
	← MarkyC left	14:34
Jkerzz	Some$one here is & unity 3d programmer$ ?	14:35
jast	you ask that in a channel about git? that's fairly random...	14:35
	→ guy joined	14:36
guy	How to undo last commit message ? I have accidentally typed "commit -a -m "stupid message.""	14:36
	It was the last thing I did	14:36
BtbN	He asks that in litteraly all channels.	14:36
	← Pyrogerg_ left	14:36
	← Jkerzz left	14:36
osse	guy: git commit --amend -m 'new message'	14:37
guy	osse: awesome	14:37
	thank you	14:37
	was using wrong keywords for the search	14:37
AL13N_work	jast: fatal: '.' does not appear to be a git repository	14:37
jast	AL13N_work: oh, right, that'd only work if you're inside the repo. use the path to the repo instead.	14:38
	← Vile left	14:38
	← Mission-Critical left	14:38
AL13N_work	even though the git-dir was already passed?	14:38
jast	yes	14:38
	--git-dir is the source for the push, this is the destination	14:38
	→ Lewix joined	14:39
	← King_Hual left	14:39
	→ chrisgeo joined	14:40
	→ subhojit777 joined	14:40
	← Juzzika left	14:41
osheridan	Hello everyone :)	14:42
	← Takle left	14:43
AL13N_work	so, if i get this right... git has normally 3 levels... and with --bare, it doesn't have the last level== working dir ?	14:43
	← osheridan left	14:43
	→ normalra joined	14:43
	→ Takle joined	14:43
	→ Simplified joined	14:44
Simplified	?	14:44
	→ Gamecubic joined	14:45
	← iamjarvo left	14:45
	← tvw left	14:45
	→ buffal0 joined	14:45
guy	osse: I just realised I lied. I need to actually get the last commit out of the history without affecting the current file system state. (because wrong files are under the message)	14:45
normalra	Hello! During the 'unpacking objects' phase, how much bandwidth is actually needed? Is it merely a consistency check or something else entirely?	14:45
guy	Is it git reset HEAD~ then?	14:45
	← Simplified left	14:46
osse	guy: yes	14:46
guy	Cool. Thanks	14:46
	← Niharika left	14:46
	→ Takle_ joined	14:47
	→ Gizburdt joined	14:48
	→ Pyrogerg joined	14:49
	← crose left	14:50
	← Takle left	14:50
	→ normalra_ joined	14:51
WORMSS	osse: commit-tree did not seem to make a commit, but given me a git object reference.. what do I do with that?	14:51
osse	WORMSS: then it created a commit	14:51
	WORMSS: git branch foo <that reference>	14:52
	now look at the log of that branch	14:52
WORMSS	ahh..	14:52
	→ AaronMT joined	14:52
	← rob_w left	14:54
	← enitiz left	14:54
	← endiruna left	14:54
WORMSS	in that case, it worked..... On my test repo..	14:54
	← normalra left	14:55
	← guy left	14:55
	→ Gues480631 joined	14:55
	→ Malsasa joined	14:56
	→ crystal77 joined	14:56
	← listochkin left	14:56
WORMSS	Is there a way to make that slightly easier?? If I was to manually set up my index, can I just make a commit but specify what parents I want? So rather than doing a merge it does a kind of "stratagy ours" but for my index, but then say parent 1 parent 2 parent 3 parent 4?	14:57
	← wrouesnel left	14:57
	← blackmesa left	14:57
jast	not really	14:57
	but write-tree + commit-tree isn't that much more complicated, is it? :)	14:57
	← scriptThis left	14:57
	→ msmith joined	14:58
	← msmith left	14:58
	→ msmith joined	14:58
	→ herdingcat joined	14:58
osse	WORMSS: i stand by my original suggestion. merge each branch the usual way first. then the tree/index stuff is already taken care of	14:58
WORMSS	It taken me a while to get the correct read-tree commands, because of all the options were never quite correct, I ended up manually changing my index	14:59
osse	the only thing you'd have to do than is take the current commit and rewrite its list of paremts	14:59
	← LeMike left	14:59
	→ DeathIncarnate joined	15:00
	← knobo left	15:00
	→ tranzfuse joined	15:00
osse	s:than:then:	15:01
	→ devoldmx33 joined	15:02
	→ Takle joined	15:03
WORMSS	How do you do that?	15:03
	→ listochkin joined	15:03
osse	WORMSS: still involves commit-tree	15:03
	but the treeish you need is just HEAD^{tree}	15:04
WORMSS	Yes, this sounds a much better way :D	15:04
	and remembering to set a branch to that new commit :D	15:05
	→ gain joined	15:05
	← tranzfuse left	15:05
	← palcu_ left	15:05
gain	hi all	15:05
	← Errorical left	15:05
gain	I need to recover a file from an old commit... can I do that without cloning all in a temporary dir, checking out and coping from there?	15:06
	→ Prawnzy joined	15:06
	← Takle_ left	15:06
osse	gain: git checkout oldcommit -- file	15:07
	→ wrouesnel joined	15:07
	← z8z left	15:07
	← vladgh left	15:08
	→ strictlyb joined	15:08
	← clauswitt left	15:09
	← dangerousdave left	15:09
	← DolpheenDream left	15:09
WORMSS	ok, so, 1) master > new branch 'super merge', 2n), merge all the branches, 3) git commit-tree -p master -p a -p b -p c -p d -m "Super Merge" HEAD^{tree} 4) git branch master << what ever the sha is	15:09
	→ lindenle joined	15:09
	→ vladgh joined	15:10
	→ Pessimist joined	15:10
gain	osse: double dash? thanks a lot :D	15:10
	← rath left	15:10
Pessimist	Given a commit id, how can I check in which tag it was first included or maybe a list of tags with that patch?	15:10
	→ skorgon joined	15:10
	← skorgon left	15:10
	→ skorgon joined	15:10
osse	Pessimist: git tag --contains=id	15:11
kadoban	Pessimist: 'git describe' would be a possibility too.	15:12
	← vtunka left	15:12
	← Gues480631 left	15:12
Pessimist	Ok, thanks	15:12
	Solid1 → Solid1_afk	15:12
	→ nettoweb_ joined	15:13
	→ richardlitt joined	15:13
	← mennea left	15:13
	← lindenle left	15:14
	← rivarun left	15:15
	→ LeMike joined	15:15
	→ HACKING-FACEBOOK joined	15:15
	← chiemseesurfer_ left	15:15
	→ rivarun joined	15:16
	→ pheaver joined	15:16
	← nettoweb left	15:16
	→ tranzfuse joined	15:16
	→ EminenceHC joined	15:17
	← ruukasu left	15:17
	→ ruukasu joined	15:18
	→ dangerousdave joined	15:20
	→ mellernoia joined	15:20
	→ palcu joined	15:20
	← subhojit777 left	15:22
	→ phantombeta joined	15:22
	← EminenceHC left	15:22
	← palcu left	15:22
	→ subhojit777 joined	15:22
	← Pyrogerg left	15:23
	← HACKING-FACEBOOK left	15:23
	← ocharles_ left	15:23
	→ pmallya_ joined	15:24
	← Takle left	15:24
	→ knownasilya joined	15:24
	→ guzzlefry joined	15:24
	→ davidreis joined	15:24
	→ HACKING-FACEBOOK joined	15:24
	→ Nimos joined	15:24
	← roelmonnens left	15:25
	← LeMike left	15:25
	→ roelmonnens joined	15:25
	→ ecky--ptang-zoob joined	15:25
	→ iamjarvo joined	15:26
Nimos	so I have kind of a basic question:	15:26
	I have two branches, one is the general branch that's just the basic software, the other has design customizations and user specific things	15:27
	usually I do new features on the main branch and merge into the custom branch	15:27
	← iamjarvo left	15:27
Nimos	however, I accidentally developed a new feature on the other branch, how do I merge only that last commit into the main branch without getting all the other things?	15:28
	→ raatiniemi joined	15:28
	→ MissionCritical joined	15:28
jast	git cherry-pick	15:28
	→ msankhala joined	15:28
	→ MLM joined	15:28
jast	not technically a merge, but essentially copies the changes over	15:29
	← msankhala left	15:29
	→ ajmichels joined	15:29
Nimos	thanks, that looks like what I need	15:29
	→ Takle joined	15:29
	→ otter768 joined	15:29
	→ fabiand joined	15:30
fabiand	hey	15:30
	can someone help me ..	15:30
	if a repo has no commits	15:30
	how is it called in that case?	15:30
	it's not "unitialized" because it has all the metatdata	15:31
Remram	"empty"?	15:31
fabiand	Remram, thanks	15:31
	That's what I'd call it ..	15:31
Remram	That's what "git clone" calls it	15:31
	"warning: You appear to have cloned an empty repository."	15:31
	;)	15:32
fabiand	:D	15:32
	← tranzfuse left	15:32
	→ tranzfuse joined	15:33
	→ kukks joined	15:33
	← pheaver left	15:34
	→ tvw joined	15:34
	← moritzs left	15:34
	← otter768 left	15:34
	← cvanball left	15:34
	← Trudko left	15:35
	→ dadada joined	15:35
dadada	hey	15:35
gitinfo	dadada: 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.	15:35
	← tchan left	15:35
	← chiromante left	15:36
	← richardlitt left	15:36
dadada	what's the easiest way to switch back and forth between my local changes and the latest previous commit?	15:36
	← SumDude left	15:36
dadada	without commiting it yet	15:36
	just wanna test if my changes made the code faster or not	15:36
	→ maestrojed joined	15:36
	← joo-_ left	15:36
	→ palcu joined	15:37
	← sinkensabe left	15:37
AL13N_work	jast: one more question	15:38
kadoban	dadada: 'git stash'	15:38
	→ Gues480631 joined	15:39
	← palcu left	15:40
	← ferri left	15:40
	← Lewix left	15:40
	→ iamjarvo joined	15:40
fabiand	Remram, thanks once again ...	15:41
AL13N_work	i have a bare repos /git_public/foo.git and a 2nde bare /git_private/foo.git ; the private one has as remote the public one and the public one has as remote an upstream one. i added a branch (from a tag) in /git_public/foo.git and pushed the branch, i did the fetch and push thing on the private one and then a git pull on a working_tree for the private one, but i can't see the branch i created	15:41
	← fabiand left	15:41
	← HACKING-FACEBOOK left	15:41
AL13N_work	jast: so, in essense, i pushed a branch on /public/foo.git and did fetch+push on the /private/foo.git (from the public) and the branch isn't visible on the private one	15:42
	← iamjarvo left	15:42
jast	what's the push command you used?	15:42
	← Takle left	15:43
	→ a_le joined	15:43
kadoban	AL13N_work: In most circumstances, you need to manually create branches that track upstream ones if you want them. They're not created by default except one default branch when you clone.	15:43
	→ palcu_ joined	15:43
	← nnyk left	15:43
	← LucasTT left	15:44
kadoban	AL13N_work: So, 'git checkout -b whatever --track upstream/whatever' in the private one, or some shortcut of that. 'git checkout whatever' works if you just want it to be the same name and a branch with that name doesn't already exist.	15:44
	← jave left	15:44
	→ Pyrogerg joined	15:45
	→ joeyDB joined	15:45
	← t0th_-_ left	15:45
AL13N_work	well git branch -a didn't show it	15:46
	it should show the remote ones, don't it?	15:46
	jast: i used your script above	15:46
	→ SumDude joined	15:46
kadoban	AL13N_work: Try 'git fetch' first.	15:46
	← jagob left	15:47
	→ deryni joined	15:47
	→ t0th_-_ joined	15:47
AL13N_work	hold on, i'm gonna make a sequence of commands used	15:47
	← cyphase left	15:47
dadada	kadoban: ty	15:49
	← psoo left	15:49
	→ psoo joined	15:49
	← wrouesnel left	15:50
	mattl_ → mattl	15:50
	→ Takle joined	15:50
	← normalra_ left	15:51
	→ dreiss joined	15:51
	mattl → Guest96641	15:51
WORMSS	osse: I agree, doing all the merging before hand and doing git commit-tree after the fact, cutting out read-tree write-tree is FAR FAR easier.. :D Thank you for great leadership in this.. 1 question I have.. why do you need branchName^{tree} and not just branch name?	15:51
	← t0th_-_ left	15:51
	→ ianbrandt joined	15:51
	Guest96641 → mattl_	15:51
	→ CheckDavid joined	15:51
	→ whomp joined	15:52
	→ FutureTense joined	15:52
	← vurma left	15:52
osse	WORMSS: because commit-tree accepts only a tree, not a treeish	15:52
FutureTense	I'm coming from hg, and was wondering if there was a command line like "rosetta stone" that will show me the equivilant git command	15:53
	→ fanno joined	15:53
FutureTense	tired of having to go tot he webite eachtime	15:53
	→ roelmonn_ joined	15:54
osse	WORMSS: maybe it'll work without ^{tree} too. dunno	15:54
	→ joo-_ joined	15:54
qsuscs	FutureTense: http://mercurial.selenic.com/wiki/GitConcepts	15:54
	← roelmonnens left	15:54
AL13N_work	jast & kadoban: http://pastebin.com/hZnf5THE	15:54
osse	it's not documented accordingly at least	15:54
	Solid1_afk → Solid1	15:54
AL13N_work	the git-private one has the git/foo.git as remote	15:54
	the last command lists the normal stuff, but not the new remote branch in the list	15:54
	the git pull says "everything up to date"	15:55
	→ Neozonz\|Disc joined	15:55
	← Neozonz\|Disc left	15:55
	→ Neozonz\|Disc joined	15:55
	→ wrouesnel3 joined	15:55
AL13N_work	what am i doing wrong?	15:55
	← Neozonz left	15:55
	→ jagob joined	15:56
AL13N_work	refs/remotes/origin/:refs/heads/ <--- is enough to include the branches, right?	15:56
	→ hanzswolfgang joined	15:57
	← DeathIncarnate left	15:58
hanzswolfgang	Hi	15:58
gitinfo	hanzswolfgang: 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.	15:58
hanzswolfgang	I am looking for help with 'git svn clone'	15:59
	more specifically, cloning of non-standard tags.	15:59
	← doev left	15:59
	→ segfalt joined	16:00
hanzswolfgang	I currently have tags/1.1/RC* in SVN and want to convert this to 1.1-RC* in git	16:00
	Can git svn clone do this?	16:00
	→ tchan joined	16:00
	← roelmonn_ left	16:01
	← devoldmx left	16:01
	→ roelmonnens joined	16:01
	← FilipNortic left	16:02
	← acolson left	16:02
	→ nastri joined	16:02
	→ endiruna joined	16:02
KevinMGranger	!tias	16:02
gitinfo	Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://gitolite.com/tias.html may help with git-specific TIAS.	16:02
	← Silmarilion left	16:02
KevinMGranger	I can't see why not, just be careful with quoting when referencing it	16:03
	→ t0th_-_ joined	16:03
	→ netcarver joined	16:03
	→ Malsasa_ joined	16:04
	← Malsasa left	16:05
jast	AL13N_work: doesn't really look like the fetch did anything. this is probably because you didn't create a remote when cloning initially. you can do it now: git remote add origin <path or URL>	16:05
	→ pheaver joined	16:05
osse	heheheeheheheheh I thought I had discovered an interesting but in git-rebase -i where it would fail if the upstream was a merge commit or something like that. turns out I had a one-line post-checkout hook: 'false'	16:05
	s/but/bug/	16:06
	← roelmonnens left	16:06
jast	such a nice hook	16:06
	← skorgon left	16:06
jast	very inefficient, though... 'exec false' is much better	16:06
KevinMGranger	sure is a simple hook	16:06
osse	i should stop using my serious repos for senseless testing	16:06
KevinMGranger	jast: false should be a builtin if it's bash	16:07
osse	I also had a local log.usemailmap = false which I thought was a bug	16:07
	→ s00pcan joined	16:07
	→ kopparam joined	16:07
jast	bash shouldn't be used in production environments, so that doesn't matter ;)	16:07
kadoban	Heh	16:07
KevinMGranger	Oh c'mon, just because of shellshock?	16:07
	Haters	16:07
	→ DeathIncarnate joined	16:08
jast	yep	16:08
KevinMGranger	It's been fixed. It's fine	16:08
s00pcan	that's got to be a joke	16:08
	← DrDaemonEye left	16:08
jast	I hear it even got fixed multiple times	16:08
KevinMGranger	That is an interesting attack vector though, a ref name that is a shellshock payload that gets run in a hook...	16:09
	→ baegle joined	16:10
	→ jave joined	16:10
	→ chrisshattuck joined	16:10
	→ ksjeong joined	16:11
osse	if "production environment" means "web server with CGI that runs shell scripts" then I agree	16:11
	← kopparam left	16:11
	← causasui left	16:11
	← ksjeong left	16:12
	← wrouesnel3 left	16:12
	→ steele joined	16:12
	← Brain left	16:13
	← Gizburdt left	16:13
	→ Milkweed joined	16:13
	← Nimos left	16:13
	→ arnaud___ joined	16:13
	← ruukasu left	16:13
	→ EminenceHC joined	16:14
	← sebhoss left	16:15
	→ ruukasu joined	16:16
	→ lindenle joined	16:16
	→ thiago_ joined	16:16
	← psoo left	16:16
	→ crose joined	16:17
hanzswolfgang	I have tried 'tags = Project/tags//:refs/remote/tags/*' but this just gives me RC1,RC2,RC3,etc.	16:18
osse	KevinMGranger: a ref cannot contain the characters needed to create a shellshock env var	16:18
AL13N_work	jast: yes, i had remote in the private one: remote.origin.url=ssh://git@127.0.0.1/git/foo.git	16:18
	← arnaud___ left	16:19
AL13N_work	maybe ssh isn't the best way for a remote branch when it's on the same machine...	16:19
	can i just use remote.origin.url=/git/foo.git ?	16:19
KevinMGranger	osse: good point	16:20
AL13N_work	jast: well, the private one is --bare cloned from the public one... so i'm pretty sure that worked	16:20
	i can see the other branches	16:20
	← lindenle left	16:20
	← mskaesz left	16:21
	← ThomasLocke left	16:21
	→ iamjarvo joined	16:21
	← Neozonz\|Disc left	16:21
	← iamjarvo left	16:22
	← DeathIncarnate left	16:22
	→ Guest26361 joined	16:22
AL13N_work	jast: maybe the "fetch --all" isn't good	16:23
	→ vtunka joined	16:23
	→ LucasTT joined	16:23
	← subhojit777 left	16:24
	→ devoldmx joined	16:24
	← Guest26361 left	16:24
	→ Neozonz joined	16:24
	← Neozonz left	16:24
	→ Neozonz joined	16:24
Remram	SSH on the local machine might actually make sense	16:24
	if you're using different users	16:24
	← listochkin left	16:24
	← netj left	16:24
Remram	and a special shell like gitolite	16:25
	← sohail left	16:25
	→ netj joined	16:25
Remram	(although maybe gitolite does everything with hooks, I'm not sure)	16:25
	← Neozonz left	16:25
	→ Neozonz joined	16:25
	← Neozonz left	16:25
	→ Neozonz joined	16:25
	← delboy1978uk left	16:26
	→ blackmesa joined	16:26
	→ subhojit777 joined	16:27
	← ManikM left	16:29
	→ ManikM joined	16:29
	→ mgolawala joined	16:29
	← dangerousdave left	16:30
	← pheaver left	16:30
jast	AL13N_work: git clone --bare skips creating the remote config, AFAIK... simply adding the remote.origin.url option isn't enough, you'll need remote.origin.fetch, too	16:30
AL13N_work	is this better: "git --git-dir /git-private/foo.git fetch /git-private/foo.git refs/remotes/origin/:refs/heads/" ?	16:31
jast	'git remote add' does both of those for you	16:31
	hm, yeah, that should work	16:31
AL13N_work	jast aaah	16:31
jast	saves you the push, too	16:31
	oh	16:31
	actually, not quite	16:31
	→ Noldorin joined	16:32
AL13N_work	beause i'm using fetch, i should need a different setting for the remote config, rather than pull?	16:32
jast	git --git-dir /git-private/foo.git fetch /git-public/foo.git refs/heads/:refs/heads/	16:32
	that does all of it at once	16:32
	and you won't need remote config	16:32
	← tvw left	16:33
AL13N_work	ah, i need to put in the public one here	16:33
	ic	16:33
	maybe that's easyier	16:33
	i'll try	16:33
	→ JosephFerano joined	16:33
	← jceb left	16:33
	→ listochkin joined	16:34
	→ shinnya joined	16:34
	← Macaveli left	16:34
	→ Spacew00t joined	16:34
	← eeeeeta left	16:34
AL13N_work	hmm, that didn't work	16:34
	→ eeeeeta joined	16:35
	← hgl left	16:35
	→ hgl joined	16:35
jast	what happened?	16:35
	→ Imdsm joined	16:36
	← ianbrandt left	16:36
	← Aristata left	16:37
	→ King_Hual joined	16:38
Imdsm	I want a repo with let's say three remotes, origin and a and b	16:39
	how can I share those remotes?	16:39
	is there a way that this is done, or is it simply a design constraint?	16:39
AL13N_work	aha, i found it	16:39
	i had the remotes and heads reversed in fetch	16:39
	jast ^^	16:39
	← xulef left	16:39
osse	Imdsm: what do you mean?	16:39
	Solid1 → Solid1_afk	16:39
	→ richardlitt joined	16:40
Imdsm	let me try and explain better, if a repository has two remotes, say origin and then heroku	16:40
	I want my CI server to clone that repo from origin and push to heroku	16:40
	→ StarManta joined	16:40
Imdsm	but if heroku is configured on my development machine, it's never pushed to origin	16:40
	so the CI server would never be able to see the remote 'heroku', correct?	16:40
	if so, what viable ways are there around this?	16:41
	← alorence left	16:41
	← adamben left	16:41
	← fanno left	16:41
grawity	how are you configuring the CI server to know the password or SSH key for pushing?	16:41
Imdsm	for now, it simply has an SSH key	16:42
	→ Aristata joined	16:42
Imdsm	read/write	16:42
ajmichels	We have run into a weird issue where we have a tag that was made recently and the commit that it is pointed at doesn't seem to exist anymore. Almost like it got orphaned at some point and then GC'd. Anyone have any ideas?	16:42
	← idoru left	16:42
	← lb1a left	16:43
grawity	so if you could put a SSH key on it, and the post-build hooks for pushing, surely you can do a `git remote add` on that sever	16:43
	server*	16:43
	ajmichels: where do you see the tag if it's not attached to any commit?	16:43
	→ idoru joined	16:43
	← kukks left	16:43
Imdsm	I could do git remote add, yes, though I was hoping that I wouldn't need to duplicate that setup, as then there will not only be the dev machine with the git remotes, but also the need to have a script that has the git remote add command sin it	16:44
grawity	ajmichels: do you know who pushed the tag? do other people have that commit in their own repos?	16:44
Imdsm	s/command sin/commands in	16:44
	→ mihaicris joined	16:44
AL13N_work	jast: so the real problem was just that the fetch was not set in the config for all gits	16:44
grawity	Imdsm: just make it run `git push [email@hidden.address] master` instead of `git push heroku master`, really	16:44
AL13N_work	once i got the fetch set up correctly i saw updates from upstream and my new branch :-)	16:44
	→ kpease joined	16:44
Imdsm	grawity: the problem is I only used heroku as an example, in fact it will be a deis cluster, with multiple applications	16:45
	I suppose this is no different than other config options. I think I know how to approach this	16:45
	Thanks for being a sounding board!	16:45
	→ arnaud___ joined	16:46
	→ IrishPrime joined	16:46
ajmichels	The same person who made the commit also created the tag	16:47
	We found the commit by running git show-ref --tags -s -d	16:47
	← joo-_ left	16:47
ajmichels	I don't really understand the whole dereferencing stuff.	16:47
	← WormDr1nk left	16:47
	← cbr_ left	16:49
	→ martinvonz joined	16:49
	→ wolog joined	16:49
grawity	wait, wait, why exactly were you saying the commit doesn't exist?	16:49
	← t0th_-_ left	16:50
	→ tyreld joined	16:50
ajmichels	We can't check it out and it doesn't show up in the log or reflog	16:50
	→ moritzs joined	16:50
	← Noldorin left	16:51
grawity	and neither `git show <tagname>` nor `git show <commit-id>` works?	16:51
	← ruukasu left	16:51
	→ thedodd joined	16:52
	→ ruukasu joined	16:52
ajmichels	Both of those commands return a different commit.	16:54
	→ ianbrandt joined	16:54
ajmichels	It happens to be the commit that the head is currently pointed at.	16:54
	← agileadam left	16:54
	→ lindenle joined	16:54
ajmichels	but it is not the commit that the tag is assigned to	16:55
	← marthinal left	16:55
	→ knobo joined	16:56
	← knobo left	16:56
grawity	that sounds... odd.	16:56
	do `git rev-parse <tagname>`, `git rev-parse refs/tags/<tagname>`, `git show-ref`, etc. agree with each other?	16:56
	and with `grep <tagname> .git/packed-refs`?	16:57
	→ marthinal_ joined	16:57
	→ Noldorin joined	16:58
	← hgl left	16:58
	→ hgl joined	16:58
	→ nnyk joined	16:59
	← jargon left	16:59
ajmichels	The first three commads show the same sha associated with the tag, but it is not the saw that we end up on when we check out the tag.	16:59
	The grep returned nothing.	17:00
	→ bhuvanaurora joined	17:00
grawity	not packed then – kept in .git/refs/tags/<tagname>	17:00
	← richardlitt left	17:00
	← jnavila left	17:01
ajmichels	yes. that file exists	17:01
grawity	okay, and if you try to check out <tagname>, how do you determine what commit you end up on?	17:01
	← StarManta left	17:02
	→ geekbri joined	17:02
Remram	ajmichels: wait, "git checkout <tagname>" doesn't work? What does it say?	17:03
	← Marcus___ left	17:03
	← hauron left	17:03
	← moritzs left	17:03
ajmichels	When we run checkout the last thing git tells use is that the "HEAD is no on ... <commit-id>" and that commit-id doesn't match what we are seeing in rev-parse or show-ref	17:03
	← faylite left	17:03
ajmichels	* now on	17:03
Remram	If you're just concerned that the SHA1 returned by "git rev-parse <tagname>" is not a commit, it's perfectly normal	17:04
	→ doev joined	17:04
Remram	the tag has a SHA1 of its own, and it's not a commit	17:04
ajmichels	Ok. So the tag will be ok.	17:04
Remram	"git rev-parse <tagname>^{commit}" should give you the rev	17:04
	← hgl left	17:04
	grawity facepalms	17:04
grawity	how in the hell did I forget that.	17:04
	← WORMSS left	17:05
grawity	too used to lightweight tags I guess	17:05
	→ hgl joined	17:05
Remram	grawity: do you use lightweight tags?	17:05
ajmichels	This all came up because we have a process which attempts to retrieve a list of tags that are currently associated with the HEAD.	17:05
grawity	sometimes	17:05
	← ecky--ptang-zoob left	17:05
Remram	I only use annotated tags (most often, signed)	17:05
	but I don't know if there's a good reason to do that (or not)	17:05
	→ ecky--ptang-zoob joined	17:06
	→ Sasazuka joined	17:06
	→ ropav joined	17:06
Remram	ajmichels: git tag --points-at ?	17:06
	← joelm_ left	17:06
ajmichels	that process greps over the `git show-ref --tags` looking for the HEAD commit sha	17:07
	→ joelm joined	17:07
	← Novitsh_ left	17:07
	→ ojacobson joined	17:07
Remram	yeah that command will give you tag objects	17:08
	← arnaud___ left	17:08
	→ dorkmafia joined	17:08
	→ corni joined	17:09
	← corni left	17:09
	→ corni joined	17:09
ajmichels	haha. ok. yeah didn't even know about --points-at	17:09
Remram	haha github gets it: https://github.com/ViDA-NYU/reprozip/commit/f39f654d^{commit}	17:09
ajmichels	thanks guys	17:09
	← hgl left	17:09
Remram	mystery solved!	17:09
	← gain left	17:10
	→ richardlitt joined	17:11
ajmichels	sorry for burying the lead	17:11
	← spyroboy left	17:12
	← vtunka left	17:12
	← blackmesa left	17:12
	→ MarkyC joined	17:12
	→ profil joined	17:12
	→ KONIG joined	17:13
	← TomyWork left	17:13
	← herdingcat left	17:13
profil	Hi guys. I am wondering if there is a way to create a branch with a different root directory than master? say I have an untracked folder build/ which I want to track as the root in another branch, is it possible?	17:13
kadoban	profil: A branch doesn't have a root directory. There are various ways to nest git repos with various semantics, like git submodule, git subtree, etc.	17:15
	← ropav left	17:15
	→ ropav joined	17:15
kadoban	profil: Or you can just have another branch that only has the stuff in build, if you really want.	17:16
profil	kadoban: yes I thought about using subtree, but I dont want to track that directory in the master branch.. Can I use a submodule as a branch only?	17:16
thiago_	profil: do you mean "create a branch with no parent"?	17:16
	profil: or do you mean "create a branch with no files in it"?	17:16
	profil: or both?	17:16
profil	thiago_: I want to create an orphan branch, which will have the files in build/ as in the root directory of that branch	17:17
kadoban	profil: That's not possible, the root directory part. Why would it matter though?	17:17
thiago_	profil: git checkout --orphan newbranch; git rm -r everything-except-build; git mv build/* .	17:17
	← gfixler left	17:17
thiago_	if you're in zsh with extendedglob, the everything-except-build is *~build	17:18
	→ popl joined	17:18
	← martinvonz left	17:18
profil	yeah, thats what I thought..	17:18
	→ GT4066 joined	17:19
profil	its kinda ugly though	17:19
thiago_	profil: here's an uglier way:	17:19
	← jheg left	17:19
thiago_	profil: git checkout --orphan newbranch; mv .git build; cd build; git commit -m "build as root"; mv .git ..; git reset --hard	17:20
	← a_le left	17:20
	→ Ankaan joined	17:20
thiago_	with some git add -a that I forgot	17:20
profil	wow, is that valid? :D	17:20
	← dfas left	17:21
thiago_	moving the .git dir? sure	17:21
	← endiruna left	17:21
profil	thiago_: but that wont work when build/ is regenerated by some scripts..	17:21
thiago_	it's ugly as hell, but works	17:21
	→ EvilPenguin joined	17:21
thiago_	are the scripts going to regenerate build during the process?	17:21
	← kpease left	17:22
profil	the build/ folder will contain deployable files, which will be deployed by pushing the publish branch to a remote	17:22
	and master will contain the source files	17:22
	← EvilPenguin left	17:22
	→ kpease joined	17:22
thiago_	profil: I don't see how that is relevant. As long as nothing is trying to recreate the build dir relative to the repository root (which has just moved) during the commands I posted, it should work to do what you asked.	17:23
profil	so I want master and other feature branches to keep track of the source code, and the publish branch to keep track of the generated deployable files	17:23
	→ boombatower joined	17:23
	← boombatower left	17:23
	→ boombatower joined	17:23
profil	thiago_: alright	17:23
thiago_	ok, now we have some more info	17:23
	← devoldmx left	17:23
thiago_	how is the publish branch created?	17:23
	or updated, for that matter	17:23
	→ pmally___ joined	17:24
	← nnyk left	17:24
thiago_	my suggestion is to create a separate checkout of this repository (a clone or a new-workdir) and adapt your scripts to modify this other checkout instead	17:24
	→ EvilPenguin joined	17:24
profil	thiago_: thats what I am trying to figure out, I want to be able to run "git checkout publish ; git add . ; git commit -m ... ; git push server publish"	17:25
thiago_	profil: how about: cd ../publish; git add .; git commit -m ...; git push server	17:25
	→ petersr joined	17:26
	→ dfas joined	17:27
	← bb010g left	17:27
	→ nnyk joined	17:27
	← petersr left	17:27
	← pmallya_ left	17:27
profil	thiago_: it would be neat to have it as a subdir	17:28
	→ ehmatthes joined	17:28
thiago_	profil: make it a submodule then	17:28
	profil: the submodule can be a different branch on the same repository	17:28
	→ in_deep_thought joined	17:29
	← dorkmafia left	17:29
	← aswen left	17:29
	→ pheaver joined	17:30
	→ otter768 joined	17:30
profil	thiago_: but that requires changes to the submodule to be tracked in master?	17:30
	→ a_le joined	17:30
	← francisfish left	17:32
	← liamkeily left	17:32
	← doev left	17:32
	→ agileadam joined	17:33
	← agileadam left	17:33
	← bhuvanaurora left	17:33
	← ehmatthes left	17:33
	→ bhuvanaurora joined	17:34
	← mikecmpbll left	17:34
	→ Sijdesign joined	17:34
	→ arnaud___ joined	17:35
	← otter768 left	17:35
	← pmally___ left	17:36
	← bhuvanaurora left	17:36
thiago_	profil: add the subdir to .gitignore	17:36
	→ bhuvanaurora joined	17:36
	→ sinkensabe joined	17:37
	← listochkin left	17:37
	→ m0viefreak joined	17:37
	→ dangerousdave joined	17:40
	→ sohail joined	17:40
	→ moritzs joined	17:40
	→ LeMike joined	17:41
	→ converge joined	17:42
	→ desposo joined	17:42
	→ leeN joined	17:43
	← Malsasa_ left	17:44
	→ listochkin joined	17:44
	→ skylite_ joined	17:44
	← skylite left	17:44
	← skylite_ left	17:45
	← ajmichels left	17:45
	→ skylite joined	17:45
	→ Vile joined	17:46
	← converge left	17:46
profil	thiago_: I went with the first approach, doing `cp -rv build/* .` and then adding and committing	17:48
	→ Gizburdt joined	17:48
profil	thiago_, kadoban: thanks for your help guys :)	17:48
	← freimatz left	17:48
	→ akushner joined	17:48
	← mikemont_ left	17:48
	→ Shusshu joined	17:48
	→ DeathIncarnate joined	17:48
	← Shusshu left	17:49
	← dangerousdave left	17:49
	← m0viefreak left	17:50
	← nastri left	17:50
	← hahuang61 left	17:50
	← martinklepsch left	17:50
	← sohail left	17:50
	→ dm7freek joined	17:50
	← darnir left	17:51
	→ causasui joined	17:51
	← niro left	17:51
	→ florianb joined	17:51
	← florianb left	17:51
	← encod3 left	17:52
	→ dorkmafia joined	17:52
dm7freek	True story: I have a local git repo... I copied that repo onto a flash drive. I worked on the flash drive, and I worked on the original. How do I merge them?	17:52
	→ iamjarvo joined	17:52
	marthinal_ → marthinal	17:52
kadoban	dm7freek: Add one as a remote of the other, fetch it in, and do something with the result, merge/rebase/whatever.	17:53
dm7freek	kadoban: how do I add one as the other's remote?	17:53
	→ morb joined	17:53
kadoban	dm7freek: 'git remote add flashdrive /some/path/or/whatever/'	17:54
dm7freek	kadoban: thanks ill give that a try	17:54
	← nnyk left	17:54
kadoban	dm7freek: After you 'git fetch', check !lol or 'gitk --all' to see what's what, and then you can go from there merging or whatever.	17:55
gitinfo	dm7freek: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	17:55
	← ropav left	17:55
	← nettoweb_ left	17:56
	← dpio left	17:56
	→ kopparam joined	17:56
dm7freek	cool	17:56
	→ xcesariox joined	17:56
	→ mtahmed joined	17:56
	← iamjarvo left	17:57
	← atran left	17:59
	← barduck left	17:59
	→ iamjarvo joined	17:59
	→ safinaskar joined	17:59
	← iamjarvo left	17:59
	→ Neozonz\|Disc joined	18:00
	← Neozonz\|Disc left	18:00
	→ Neozonz\|Disc joined	18:00
	← Neozonz left	18:00
	← kopparam left	18:00
	→ nour joined	18:02
	← thiago_ left	18:02
	← alexwhitman left	18:02
	→ m0viefreak joined	18:02
dm7freek	kadoban: I went to the flash drive and added the original as remote 'og'. I git fetched, and now I'm trying to git merge og, but I get "not something we can merge"	18:03
	→ licnep joined	18:03
dm7freek	Does remote basically attach a remote branch?	18:03
	← profil left	18:03
dm7freek	kadoban: This is prob a rookie mistake, i know :/	18:04
	→ kyb3r_ joined	18:04
	← paul424 left	18:05
	→ govg joined	18:05
kadoban	dm7freek: A remote isn't a branch. A remote usually has branches. Take a look at 'gitk --all' and see if it makes more sense. If it's still not clear, you should really read a tutorial about this. It's rather subtle, and it will make a ton more sense.	18:05
	→ kpease_ joined	18:05
	govg → Guest17962	18:05
	← Guest17962 left	18:05
mtahmed	I tried googling for a release process that uses git but I am unable to find anything that suits my needs. What I want to be able to do is after I make a release, I want to be able to tell which features/bug fixes are in that release. Currently I use svn for that because it gives me a unique commit id for each feature/bug fix.	18:05
	← a_le left	18:06
mtahmed	But commit hashes change and therefore are not a dependable alternative to svn commit ids.	18:06
dm7freek	kadoban: I just got gitk --all, that's slick. An I figured out the issues, i needed og/master not og	18:06
kadoban	dm7freek: Right, that sounds correct	18:06
dm7freek	kadoban: thanks	18:06
kadoban	'welcome	18:06
	← m0viefreak left	18:06
	→ m0viefreak joined	18:07
dm7freek	mtahmed: tags stay with commits even if the has changes i think	18:07
kadoban	mtahmed: git commit hashes are immutable unless you do evil things that you shouldn't do.	18:07
dm7freek	hash*	18:07
	← dreiss left	18:07
	← St1gma left	18:08
qsuscs	mtahmed: man git tag the release, then e.g. git log --oneline v1.2..v1.3	18:08
gitinfo	mtahmed: the git-tag manpage is available at http://jk.gs/git-tag.html	18:08
	→ St1gma joined	18:08
qsuscs	and commit hashes change less than SVN revnos	18:08
	← kpease left	18:08
	← DeathIncarnate left	18:08
	→ m8 joined	18:08
	← richardlitt left	18:09
	→ dreiss joined	18:09
mtahmed	kadoban: E.g. if I cherry-pick the commits into branches, the two cherry-picked commits will have different hashes, no.	18:09
	*?	18:09
	→ diegoviola joined	18:10
mtahmed	dm7freek: qsuscs: I will look into git tags.	18:10
qsuscs	mtahmed: yes, cherrypicking changes the commit hashes	18:10
kadoban	mtahmed: Yes, but you shouldn't do that if you've already published that history, or if you've already tagged it, so I'm not sure how that affects what you want to do.	18:10
qsuscs	but this is i think something SVN doesn’t even support	18:10
	→ richardlitt joined	18:10
	← Ankaan left	18:11
	← pheaver left	18:11
	← DevAntoine left	18:11
	→ durre joined	18:11
qsuscs	ok, you can do e.g. `svn sw "^/branches/1.4"; svn diff -c 1337 "^/trunk" \| svn patch`, but this will get you a new revision number as well	18:11
	← steele left	18:12
	→ steele_ joined	18:12
mtahmed	qsuscs: Should I be tagging every single commit? What I want to do is have a develop branch and have release branches branched off of develop. But sometimes I want to merge bug fixes back into old releases ... I use cherry-picking for that ... but that changes commit hashes ... so there is no way for me to tell what is and isn't in a given release.	18:12
	→ sohail joined	18:13
	→ antoks joined	18:13
qsuscs	mtahmed: no, you should tag releases. then you do a log between them and get all the commits between the two releases	18:14
	→ Skapadapaduu joined	18:14
qsuscs	this looks e.g. like this: http://pastie.org/private/dpi9ieq54wucff84qxjua	18:15
licnep	guys, i started a project and i'm pushing my local code to github and then pulling from my live server, but how can i push the code directly to the server instead?	18:15
	i tried setting the server as a remote and pushing to it, but it gives me an error	18:15
qsuscs	licnep: !deploy	18:15
gitinfo	licnep: 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	18:15
grawity	also !bare	18:15
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/	18:15
qsuscs	licnep: ^ (bare vs. non-bare)	18:15
licnep	thanks ill take a look at that	18:16
	yea apparently the server repo has to be bare for some reason	18:16
	← listochkin left	18:16
	→ listochkin joined	18:16
	← EminenceHC left	18:16
licnep	mm, that could be annoying if i want to change some config file on the server only though..	18:17
	→ jonatasnona joined	18:17
	→ EminenceHC joined	18:17
licnep	ill have to think about that	18:17
	← vital left	18:17
	kpease_ → kpease	18:17
	kpease → kpease_	18:18
	→ blorbx joined	18:18
mtahmed	qsuscs: But if I have a releases 1.4 and 2.5. I want to be able to find out if a certain bug fix is in an of the 1.x releases. So I do a git log between e.g. 0.9 and 1.4 and manually search for the commit? What if it has 100s of commits?	18:18
	I guess free text search would be okay.	18:18
	→ t0th_-_ joined	18:18
	→ vital joined	18:18
	→ mennea joined	18:19
kadoban	mtahmed: There's automatic ways, like 'git tag --contains' and some flags to 'git describe'	18:19
	← belak left	18:19
	→ Sadi joined	18:19
	→ belak joined	18:19
	← belak left	18:19
	→ belak joined	18:19
qsuscs	mtahmed: git log --oneline \| grep "bugfix description" for a cheap solution, but yes, there are gitish ways	18:19
	← listochkin left	18:21
	← flaguy48 left	18:21
	← LeMike left	18:22
	→ bitkiller joined	18:22
	→ DolpheenDream joined	18:22
qsuscs	how does junio do this? putting every bugfix in a feature branch and merging that one to maint-$VERSION and master?	18:22
	→ devoldmx joined	18:22
	← teran_ left	18:23
	← marthinal left	18:23
	← Sijdesign left	18:23
	→ jb55 joined	18:23
	← jb55 left	18:24
	← tranzfuse left	18:24
	→ jb55 joined	18:24
	→ tranzfuse joined	18:24
	→ pheaver joined	18:25
	→ eletuchy joined	18:25
	→ marthinal joined	18:27
	→ dangerousdave joined	18:27
	→ LeMike joined	18:28
	→ hahuang61 joined	18:28
	← marcogmonteiro left	18:28
	Eugene bites HedgeMage	18:28
	← paulweb515 left	18:29
	← ManikM left	18:29
	→ ManikM joined	18:29
	qsuscs throws a bone to Eugene, so that he has something to bite	18:29
	→ listochkin joined	18:30
	← morb left	18:30
Eugene	qsuscs - Im guessing it involves either octomerges or cherries, but youcan just clone it and find out ;-)	18:30
	→ michelangelo joined	18:31
qsuscs	yes, but it’s so … overwhelming.	18:31
mtahmed	kadoban: `git tag --contains` wouldn't work if the commits are cherry-picked, right?	18:32
	← davidreis left	18:32
Eugene	Is that a normal apostrophe or is my Unicode buggered on this device?	18:32
	Or maybe yours	18:32
kadoban	Looks like a backtick	18:33
	```'''	18:33
	← ruukasu left	18:33
	← Gizburdt left	18:33
	→ Gizburdt joined	18:33
	→ sinequanon joined	18:33
kadoban	mtahmed: I don't think it would work correctly, no. There are ways to have a workflow like that that doesn't require cherry-picking, of course.	18:33
	← Akagi201 left	18:34
qsuscs	Eugene, kadoban: yes, perhaps, no, no—http://www.fileformat.info/info/unicode/char/2019/index.htm	18:34
mtahmed	kadoban: Could you point me towards such workflows?	18:34
	← donmichelangelo left	18:34
	← pheaver left	18:34
Eugene	I get an accented a, euro symbol, and a superscript TM from qsus. kado's is three backticks(by the tilde) and three single apostrophes	18:34
	← subhojit777 left	18:34
mtahmed	kadoban: What I would like to have is to be able to include new commits into older release branches (e.g. security bug fixes etc.)	18:34
Eugene	I hate unicode	18:34
kadoban	Ah maybe it's different then, I just went by looks, heh.	18:34
qsuscs	unicode > *	18:35
	<insert random english-speaking countries rant from the perspective of a european here>	18:35
kadoban	mtahmed: Hmm, well that exact thing, I'm not sure a workflow that would help exactly...	18:35
qsuscs	so you interpret my righteous UTF-8 as some variant of ISO 8859	18:35
	→ thiago joined	18:36
	← phantombeta left	18:36
	← dangerousdave left	18:36
	→ Akagi201 joined	18:36
	→ sorenb joined	18:37
	→ ruukasu joined	18:37
Eugene	Correction: I hate dealing wit Unicode points. I think its a great idea, but I dislike interacting with anything outside of ASCII	18:37
	→ quetz joined	18:37
kadoban	I mostly just make sure everything I can is using utf-8, and otherwise ignore it completely.	18:37
	← e66 left	18:37
	← levifig left	18:37
qsuscs	i’m completely used to using typographically correct apostrophes and quotation marks	18:37
	in fact, i find it easier to type ’ instead of ' on my de-latin1 keyboard	18:38
ojacobson	“they're not that hard to type” -qsuscs	18:38
qsuscs	ojacobson: indeed.	18:38
	together with my beloved compose key, i get along with most european languages	18:38
Eugene	I choose "UTF8, no BOM" as my text editor default and call it a day	18:38
	← sinequanon left	18:38
qsuscs	a pity i don’t have any french and spanish anymore in school.	18:39
	← durre left	18:40
	→ encod3 joined	18:40
	→ durre joined	18:40
	→ DeathIncarnate joined	18:40
	→ Marcus_ joined	18:40
Remram	but you don't do uppercase?	18:41
	→ levifig joined	18:41
qsuscs	« surtout en français, il faut utiliser des symboles speciaux souvent, ou des lettres qui n’apparaissent pas en allemand ou anglais, pour exemple ‹ œ ›, ‹ ç ›, et cetera. »	18:42
	Remram: in IRC, mostly not.	18:42
	← Gamecubic left	18:42
Remram	I can't type œ on my keyboard	18:43
	:(	18:43
	→ Gamecubic joined	18:43
Remram	now I'm sad.	18:43
qsuscs	Remram: compose o e	18:43
	→ pmallya joined	18:43
Remram	I don't have a compose key	18:43
	mattl_ → mattl	18:43
qsuscs	but you might have a useless flag key between ctrl and alt	18:43
Remram	also, it's "par exemple"	18:43
	← mattl left	18:44
	→ mattl joined	18:44
qsuscs	… as i said, no french lessons for over a year.	18:44
	→ phantombeta joined	18:44
Remram	that's pretty good for a year	18:44
qsuscs	(and it’s “for example” in english, which translates to that, and “por ejemplo” in spanish, which sounds alike)	18:45
	← causasui left	18:45
	→ causasui joined	18:45
Remram	I don't understand why people learn French at all. I mean, it's all kinds of silly	18:45
qsuscs	if you were to choose between latin and french …	18:46
	← diegoaguilar left	18:46
	← Hipska left	18:46
qsuscs	i mean, latin really looks nice, and i would love to learn it. but it’s a dead language.	18:46
	and i get the etymology of romanian words with french, spanish and english as well, i’m good at german grammar (which is said to be the same as the latin one), and i love to speak, so again, why learn latin?	18:47
Remram	well, if it's between Latin and French, I get it	18:47
	but French and Spanish, or German, or Arabic	18:48
	← mennea left	18:48
	→ mennea joined	18:49
qsuscs	at my school, you have english from year 5 on (when you enter the school), then you choose between french and latin for year 6 and between music, spanish and “natural science and technology” for year 8	18:49
	← pmallya left	18:49
	→ govg_ joined	18:49
qsuscs	and for the last two final years, you choose all over again. you can’t take $LANGUAGE if you never had it before, but you can drop all but one languages again (like me)	18:50
Remram	well that's super-weird	18:50
qsuscs	welcome to german schools.	18:50
	→ pheaver joined	18:50
	→ pmallya joined	18:50
qsuscs	*schools of baden-wurttemberg. in the other federal states, it’s different again.	18:50
	← aynik left	18:51
qsuscs	oh and that choices are just for my school, there are also schools that teach french as first foreign language, or offer italian, russian, chinese (in fact, the best chinese speaker of the world comes from a city of this region)	18:51
	→ mennea_ joined	18:52
	← Takle left	18:52
kadoban	"Best chinese speaker"...did they have a tournament?	18:53
	→ Takle joined	18:53
qsuscs	yes	18:53
	let me see whether i find the newspaper report	18:53
	→ normalra joined	18:53
	→ hgl joined	18:53
	← palcu_ left	18:53
	← richardlitt left	18:53
	→ blackmesa joined	18:54
qsuscs	that’s from our local newspaper, maybe i find something international … skol.de/;art417921,7421879	18:54
	→ jwpeddle joined	18:54
qsuscs	http://skol.de/;art417921,7421879	18:54
	← kyb3r_ left	18:54
	← ojacobson left	18:54
	← mennea left	18:54
	← Neozonz\|Disc left	18:54
kadoban	Heh, cool. I used machine translation and got the gist	18:55
	→ flaguy48 joined	18:55
	← flaguy48 left	18:55
	← jonatasnona left	18:55
	→ ra0 joined	18:56
qsuscs	oh to heaven with google, why can’t i search for english stuff <_<	18:56
	→ LeMike1 joined	18:56
	→ flaguy48 joined	18:56
	← flaguy48 left	18:56
	← LeMike left	18:57
Remram	I should have learned more languages	18:57
	→ phanimahesh joined	18:57
	→ flaguy48 joined	18:57
	→ jeffmjack joined	18:57
Remram	I could never be bothered with Spanish	18:57
	← flaguy48 left	18:57
FutureTense	I'm desperate to try and remove some commits on my local and origin repositories. Here is a picture http://imagebin.ca/v/1iUDAVTtAXy2	18:57
Remram	and I really could have found the time to learn more	18:57
FutureTense	Im trying to remove "cca9" and all of its descendants from my local and origin	18:58
	← hgl left	18:58
	← PCatinean left	18:58
qsuscs	FutureTense: this will !rewrite	18:58
gitinfo	FutureTense: Rewriting public history is not recommended. Everyone who has pulled the old history have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push -f <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	18:58
FutureTense	no one has pulled it	18:58
Remram	FutureTense: this doesn't make sense. "Its decendents"?	18:58
	→ diegovio1 joined	18:58
	← moritzs left	18:58
FutureTense	all of the changesets after it	18:58
Remram	descendants*	18:58
	→ flaguy48 joined	18:58
FutureTense	the purple and yellow paths	18:58
Remram	well that's not how Git works	18:58
	← flaguy48 left	18:59
Remram	a branch is just a pointer to somewhere in the tree	18:59
	move that pointer and the commits become "unreachable"	18:59
	so, you want to move gh-pages and HEAD to 4a85c13?	18:59
qsuscs	FutureTense: git reset --hard cca9f56^ (note the caret!) (while you’re on that branch)	18:59
	← desposo left	18:59
	→ flaguy48 joined	18:59
	← flaguy48 left	18:59
	← KevinMGranger left	18:59
	← antoks left	18:59
FutureTense	qsuscs: so by that picture, im on "foobar"	19:00
	→ flaguy48 joined	19:00
	→ baweaver joined	19:00
	← diegoviola left	19:00
	← flaguy48 left	19:00
FutureTense	should I checkout to cca9f first?	19:00
qsuscs	FutureTense: no. checkout the branch you want to move	19:00
Remram	(gh-pages, probably)	19:01
	→ flaguy48 joined	19:01
	← flaguy48 left	19:01
	→ tesaf joined	19:01
	→ flaguy48 joined	19:02
	→ desposo joined	19:02
qsuscs	FutureTense: didn’t you come from mercurial?	19:02
FutureTense	ok, tht did it	19:02
	yes, I did	19:02
	→ Nijikokun joined	19:03
FutureTense	But I forgot what I learned with git	19:03
	ok, so its gone from my local	19:03
qsuscs	FutureTense: remember: git branches == mercurial bookmarks. mercurial branches don’t exist in git	19:03
	→ teran joined	19:03
	← SumDude left	19:03
FutureTense	so how can I push that "strip" (to use the hg vernacular) to my origin?	19:03
	→ palcu joined	19:03
FutureTense	i never used bookmarks in Hg	19:04
qsuscs	FutureTense: push -f	19:04
	← teran left	19:04
	← bhuvanaurora left	19:04
	→ sinequanon joined	19:04
	→ teran joined	19:04
	← xcesariox left	19:04
	diegovio1 → diegoviola	19:05
	→ palcu_ joined	19:05
	→ MarkyC_ joined	19:05
FutureTense	ok, that was easy.. now I want to get rid of the "foobar" branch	19:05
	or basically rename it to gh-pages	19:05
	→ Neozonz joined	19:05
	← Neozonz left	19:05
	→ Neozonz joined	19:05
	→ paulweb515 joined	19:06
FutureTense	so I "git checkout foobar"	19:06
	← robbyoconnor left	19:06
	← palcu_ left	19:06
qsuscs	FutureTense: git checkout gh-pages; git merge foobar; git branch -d foobar	19:07
	← Takle left	19:07
qsuscs	FutureTense: this will be a fast-forward merge, and branch -d will only delete if the branch is merged	19:07
	← MarkyC left	19:07
	← encod3 left	19:07
	MarkyC_ → MarkyC	19:07
FutureTense	heres what it looks like now	19:07
	http://imagebin.ca/v/1iUGT0ej8amF	19:07
Remram	yep. Looks good. What he said.	19:08
	→ sMa_ joined	19:08
qsuscs	20:07 <+qsuscs> FutureTense: git checkout gh-pages; git merge foobar; git branch -d foobar	19:08
	← palcu left	19:08
FutureTense	I guess the merge concept is different in git too.	19:08
Remram	not a whole lot	19:08
qsuscs	not necessarily	19:09
	← phantombeta left	19:09
qsuscs	but i’m not sure about the behaviour of hg merge in this case	19:09
	← hexagoxel left	19:10
	← dm7freek left	19:10
	← listochkin left	19:10
	→ veebers joined	19:10
	← jason237 left	19:10
FutureTense	that did it (thank you). It's just a little weird for me because it looks like the merge compressed two diffs	19:10
	→ martinklepsch joined	19:10
	← Neozonz left	19:10
	→ listochkin joined	19:10
	→ Zupoman joined	19:11
qsuscs	hmm, okay.	19:11
	in this case, git merge == hg update	19:11
	← ruukasu left	19:11
	→ Takle joined	19:11
FutureTense	yes, thats what seems strange to me	19:11
qsuscs	mercurial is like a toolbox, where git is some different swiss army knives	19:12
	→ alekks joined	19:12
	← tristanp left	19:12
tobiasvl	git and hg have some similar concepts and some unique ones, but the main hard part is the nomenclature	19:12
qsuscs	see e.g. http://stevelosh.com/blog/2010/01/the-real-difference-between-mercurial-and-git/	19:12
tobiasvl	merges and branches are common names but mean different things, for example	19:13
	← King_Hual left	19:13
	→ ojacobson joined	19:13
	→ KevinMGranger joined	19:13
	→ King_Hual joined	19:13
	← LeMike1 left	19:15
qsuscs	yeah coming from mercurial probably involves some !unlearn	19:15
gitinfo	Users of centralized VCSes will need to unlearn a number of habits in order to learn git. Many commands, such as "checkout" and "revert" bear little in common to those holding the same name in other systems.	19:15
qsuscs	but it’s not as bad as coming from SVN	19:15
	← listochkin left	19:15
	→ ruukasu joined	19:16
	← St_Marx_ left	19:16
	→ phantombeta joined	19:16
	→ SumDude joined	19:16
	← Sadi left	19:17
	← crose left	19:18
	→ St_Marx joined	19:18
	← baweaver left	19:20
Remram	Git was meant to be a framework at first	19:20
	not the actual vcs	19:20
	← okanck left	19:21
	→ cagedwisdom joined	19:21
	→ listochkin joined	19:21
	→ Neozonz joined	19:21
	← Neozonz left	19:21
	→ Neozonz joined	19:21
	← mennea_ left	19:22
	← Aristata left	19:22
	← awkwardusername left	19:22
	← tureba left	19:22
	→ mennea joined	19:23
	→ awkwardusername joined	19:23
Eugene	Glad to see that factoid gets use.	19:23
	← ojacobson left	19:23
Remram	well the more you use Git the more it shows	19:23
	→ pantsman- joined	19:23
	→ ats joined	19:24
	← ats left	19:24
	← govg_ left	19:24
	→ samskiter joined	19:25
	← israelpattison left	19:25
	→ cvanball joined	19:25
	→ israelpattison joined	19:25
	← cvanball left	19:25
	← sinequanon left	19:25
	← Takle left	19:26
samskiter	I’ve merged a branch into mine that had several conflicts. to do this i merged several commits on at a time. how can i squash this to make it look like i just merged the tip of the desired branch	19:26
	← Neozonz left	19:26
	→ dangerousdave joined	19:26
	← dangerousdave left	19:27
	← angelsl left	19:27
	← jiangenj left	19:28
	→ Xiti joined	19:28
	→ tureba joined	19:28
	→ richardlitt joined	19:28
	→ huglester_ joined	19:28
	→ Takle joined	19:29
	← huglester left	19:30
samskiter	I’ve merged a branch into mine that had several conflicts. to do this more easily i merged several commits from the desired branch one at a time. how can i squash this to make it look like i just merged the tip of the desired branch. (appologies for repost - clarifying)	19:30
	→ kballou joined	19:31
	→ otter768 joined	19:31
	← Takle left	19:32
	← MLM left	19:33
	→ punchaga` joined	19:33
	← punchagan left	19:33
	← punchaga` left	19:34
	→ punchaga` joined	19:34
	punchaga` → punchagan	19:34
	← ecky--ptang-zoob left	19:34
	→ ecky--ptang-zoob joined	19:34
	→ baweaver joined	19:35
	← DeathIncarnate left	19:35
	← otter768 left	19:36
	→ aard_ joined	19:36
	← ruukasu left	19:37
	→ ruukasuu joined	19:37
	→ kukks joined	19:37
	→ basiclaser_ joined	19:38
	→ baconbeckons joined	19:38
	→ settermjd joined	19:39
	← ra0 left	19:40
	→ Takle joined	19:40
	→ marioxcc joined	19:40
baconbeckons	we’re using the git flow model and want to start using continious deployment. how can we always pull the latest release/x.x.x branch? what do we do after the release has been finished and merged into master and develop?	19:40
marioxcc	Hello	19:41
	→ hexagoxel joined	19:41
marioxcc	How can I do git checkout (in non-HEAD altering mode) for a whole directory?	19:41
samskiter	baconbeckons: alot of CI systems allow pattern matchin for brances	19:41
	matching* branches*	19:41
	→ ra0 joined	19:42
baconbeckons	samskiter: i was originally thinking of using webhooks. is there a way to make that work?	19:42
basiclaser_	hey guys are there any examples of websites that you cannot make more than one account with ?	19:42
	→ tristanp joined	19:42
	→ pullphinger joined	19:42
	→ Neozonz joined	19:43
	← Neozonz left	19:43
	→ Neozonz joined	19:43
samskiter	baconbeckons: webhooks are a git hosting feature rather than a git feature right? but it might be possible	19:43
tobiasvl	basiclaser_: facebook maybe? and several chess sites I know of (so you can't inflate your rating)	19:43
	→ sq-one joined	19:44
	→ kopparam joined	19:45
	→ iamjarvo joined	19:45
baconbeckons	samskiter: that’s a good point… i was originally thinking that i would trigger the webhook and then just have our qa server pull in the latest release branch if one existed. if i did it this way, is there a git command that i can use that will do patern matching for us? `git checkout <some_magic_command>`	19:46
Seveas	marioxcc: git checkout ref -- directory	19:46
	→ DeathIncarnate joined	19:46
	→ WaReZ joined	19:46
samskiter	baconbeckons: i mean that CI servers such as Teamcity already have their own pattern matching systems	19:46
	but no, you can’t checkout like that	19:47
	you could fetch then parse the branches	19:47
baconbeckons	samskiter: i got that part, i was just trying to avoid using the CI server :)	19:47
marioxcc	Seveas: ok, thanks.	19:47
	← marioxcc left	19:47
samskiter	if you want to write a script, then just fetch, parse the branches then checkout?	19:47
	← iamjarvo left	19:48
	← Takle left	19:48
basiclaser_	tobiasvl: i know people with multiple facebook accounts, any links to those chess sites?	19:48
	→ Takle joined	19:48
Seveas	basiclaser_: there's no foolproof way to prevent people from making multiple accounts.	19:49
	← mtahmed left	19:49
	← sinkensabe left	19:49
	← kopparam left	19:49
	← baconbeckons left	19:49
	← revolve left	19:49
	→ baconbeckons joined	19:49
	← tristanp left	19:49
	→ dsdeiz joined	19:49
	← crystal77 left	19:49
tobiasvl	basiclaser_: sure, no website can PREVENT you from doing it, but I think it's against Facebook's TOS	19:50
	basiclaser_: chess.com for example, and lichess.org	19:50
	what are you really after?	19:50
	← Spacew00t left	19:51
	→ HerrK joined	19:51
	→ SonikBoom joined	19:51
	← mennea left	19:52
	→ mennea joined	19:53
	← Pessimist left	19:53
	← Dquernoti left	19:54
	← dreiss left	19:54
	← safinaskar left	19:54
	← phantombeta left	19:55
	← baweaver left	19:58
	→ vurma joined	19:58
	← richardlitt left	19:59
	← Takle left	19:59
	→ TomyLobo joined	19:59
	← t0th_-_ left	19:59
	← raatiniemi left	19:59
	← Gamecubic left	19:59
	← diegoviola left	20:00
basiclaser_	tobiasvl: Looking to make a web service where each human can only make one account..	20:00
	→ phantombeta joined	20:00
	→ Takle joined	20:00
	← howitdo left	20:01
	← martinklepsch left	20:03
	→ nettoweb joined	20:03
	→ tvw joined	20:05
	← pheaver left	20:06
	← BSaboia left	20:06
	← ensirius left	20:06
	→ ensirius joined	20:07
	← michael_mbp left	20:08
	← folken left	20:08
	→ martinklepsch joined	20:09
	→ michael_mbp joined	20:09
	← dorkmafia left	20:10
	→ folken joined	20:10
	← phantombeta left	20:10
	← baegle left	20:10
	→ phantombeta joined	20:10
	← KevinMGranger left	20:10
	← zumba_addict left	20:11
	→ zumba_addict joined	20:12
	→ zumba_ad_ joined	20:12
	→ dorkmafia joined	20:13
	→ dpio joined	20:13
	← EminenceHC left	20:13
	← Sasazuka left	20:13
	← ruukasuu left	20:14
	→ sinkensabe joined	20:14
	→ Gamecubic joined	20:15
	→ francisfish joined	20:15
	← zumba_addict left	20:16
	kpease_ → kpease	20:16
	Solid1_afk → Solid1	20:17
	→ marioxcc joined	20:17
qsuscs	baconbeckons: !deploy	20:17
gitinfo	baconbeckons: 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	20:17
marioxcc	Hello. How can I convert output of "git diff" so that it's identical to the output that GNU diff would have if one version is in directory "a" and another is in directory "b"?	20:18
	← Solid1 left	20:18
qsuscs	maybe something like git reset --hard $(git branch -a \| grep release \| sort \| tail -n 1) … roughly …	20:18
	→ Solid1 joined	20:18
	→ thedudez0r joined	20:18
	→ Aikar joined	20:18
Aikar	Is there a git svn equiv for svn status --verbose that lists every file in the checkout with its revision info?	20:19
	→ derekm00re joined	20:20
	gitinfo set mode: +v	20:20
	← NoNMaDDeN left	20:21
derekm00re	with git-diff (or 'git stash show -p') is there a way to suppress the diff index header? ... or ... with git-apply, is there a way to apply a patch to the filesystem object without taking a fresh copy of that object from the index?	20:21
	← in_deep_thought left	20:22
	← samskiter left	20:22
	→ howitdo joined	20:22
	← mennea left	20:22
qsuscs	derekm00re: patch(1) probably.	20:22
	→ Dottimolly joined	20:22
derekm00re	i could just do "git stash show -p \| patch -p1 && git stash drop -q"	20:22
	→ mennea joined	20:23
derekm00re	but I wanted to use git-apply (because I'm in Perl and Git.pm is handy like that)	20:23
	but I can go the patch route	20:23
	thanks	20:23
	→ jonatasnona joined	20:24
	→ KevinMGranger joined	20:24
	→ sinequanon joined	20:26
	→ biax joined	20:27
	← mihaicris left	20:27
biax	hi. im new to git. trying to bisect. upon 'good' it complains to commit/stash changes. i have edited some config files that i wish to keep, how do i retain these modified config files that should remain the same across all revisions?	20:28
	← ManikM left	20:29
	← ianbrandt left	20:29
	→ ManikM joined	20:29
	→ EminenceHC joined	20:30
	← whomp left	20:31
	← sinequanon left	20:31
	→ diegoviola joined	20:31
	← kukks left	20:32
	→ rpg joined	20:32
	→ ianbrandt joined	20:32
	← chrisshattuck left	20:32
	→ Takle_ joined	20:33
	← Takle left	20:33
	← EminenceHC left	20:34
	→ aswen joined	20:35
	← dsdeiz left	20:35
	→ jason237 joined	20:35
	→ carlosr joined	20:36
	← IrishPrime left	20:36
_ikke_	biax: In general, don't track config files	20:37
	→ tranzfus_ joined	20:38
_ikke_	You can use git stash to cary those changes over in the mean time	20:38
derekm00re	put configs in a submodules?	20:38
	← Gizburdt left	20:39
	← sinkensabe left	20:39
_ikke_	No, doesn't really make sense	20:39
	→ nnyk joined	20:39
	→ paul424 joined	20:39
	← francisfish left	20:39
	← tranzfus_ left	20:40
	→ tranzfus_ joined	20:41
	← punchagan left	20:41
	→ hgl joined	20:42
	← tranzfuse left	20:42
	→ pheaver joined	20:42
	← Droolio left	20:42
	← ianbrandt left	20:42
	kpease → kpease_	20:45
	→ encod3 joined	20:45
	→ madewokherd joined	20:46
	← encod3 left	20:46
	← hollusion left	20:46
	← hgl left	20:47
	← thedodd left	20:47
	→ Macaveli joined	20:50
	← joeyDB left	20:50
	→ jheg joined	20:51
	← Gues480631 left	20:51
	→ Juxtapositional joined	20:51
	→ Gues480631 joined	20:51
biax	hm not sure how to do that	20:52
	← mennea left	20:52
	→ mennea joined	20:53
biax	to be exact, the configuration for ipxe are in h files such as config.h settings.h, etc	20:53
	← aswen left	20:54
	→ crose joined	20:55
	← Gues480631 left	20:55
	→ Gues480631 joined	20:55
	→ eletuchy_ joined	20:57
	→ githogori joined	20:57
	→ tpollard joined	20:57
	← baconbeckons left	20:58
	→ whomp joined	20:58
	← phanimahesh left	21:00
	← geekbri left	21:00
	← eletuchy left	21:00
	→ thedodd joined	21:00
	← kriks left	21:01
	← MarkyC left	21:01
	→ MattMaker joined	21:01
	→ duderonomy joined	21:01
	← duderonomy left	21:01
	← githogori left	21:01
	→ duderonomy joined	21:02
	→ MLM joined	21:02
	← vurma left	21:02
	← JosephFerano left	21:02
	→ MarkyC joined	21:02
	← devoldmx left	21:03
	← Aikar left	21:05
	→ sinequanon joined	21:05
	→ ianbrandt joined	21:06
	→ EminenceHC joined	21:07
	← marthinal left	21:07
	→ Takle joined	21:07
	← Takle_ left	21:07
	← helgikrs left	21:08
	← astrofog left	21:09
	← D-Boy left	21:09
derekm00re	PS: Do not create a branch called "stash" if you are going to do a bunch of experiments with git-stash/git-apply/patch, or very weird things will happen.	21:09
	→ kukks joined	21:09
	← kukks left	21:09
	→ kukks joined	21:09
	← jheg left	21:10
	→ joo-_ joined	21:11
	polyzen → bender	21:11
	← aard_ left	21:12
	→ jheg joined	21:12
	→ baweaver joined	21:12
	← quetz left	21:15
	← Takle left	21:16
	← kballou left	21:16
	→ Takle joined	21:16
	→ tristanp joined	21:16
	← s00pcan left	21:17
	→ Sasazuka joined	21:17
	← sq-one left	21:19
	→ Takle_ joined	21:19
	→ Neozonz\|Disc joined	21:20
	← Neozonz\|Disc left	21:20
	→ Neozonz\|Disc joined	21:20
	← ianbrandt left	21:20
	→ D-Boy joined	21:21
	← Neozonz left	21:21
	← awkwardusername left	21:22
	→ Neozonz\|Disc2 joined	21:22
	← mennea left	21:22
	← kqr left	21:22
	← licnep left	21:23
	← Takle left	21:23
	→ mennea joined	21:23
	bender → poly	21:23
	poly → polyzen	21:23
	→ s00pcan joined	21:23
	polyzen → bender	21:24
	→ ianbrandt joined	21:24
	← crose left	21:25
	← Neozonz\|Disc left	21:25
	→ cardguy1000 joined	21:26
	← jds left	21:26
	← ecky--ptang-zoob left	21:27
	← MarkyC left	21:28
	→ Neozonz\|Disc joined	21:29
	← Neozonz\|Disc left	21:29
	→ Neozonz\|Disc joined	21:29
cardguy1000	Just wondering what organization structure others are using, if building a website and need an opensource project like jquery. Do you have a folder called github or something and clone the different projects you need into this directory or do you just download the css js etc and put them in your own spots?	21:29
	← Internet13 left	21:30
cardguy1000	I know you can just use the CDN for something like jquery....but other projects may not be on CDN	21:31
	← Steve_Jobs left	21:31
	← jheg left	21:31
	→ jheg joined	21:32
	→ otter768 joined	21:32
	← Neozonz\|Disc2 left	21:32
	→ Steve_Jobs joined	21:33
	→ kopparam joined	21:33
	← thedodd left	21:33
	→ Neozonz\|Disc2 joined	21:34
moritz	cardguy1000: some projects, like OTRS, simply copy the js files into a 3rdparty/ folder in their git repo, and update from time to time	21:35
	← ianbrandt left	21:35
derekm00re	lots of people copy dependencies because it always sucks when someone else causes you an outage	21:36
	← FutureTense left	21:36
	← durre left	21:36
	← Neozonz\|Disc left	21:37
	→ LeMike joined	21:37
	← otter768 left	21:37
	← skylite left	21:37
	← biax left	21:38
moritz	some copy, some use subtree merges, some use separate repos and build OS packages out of static data, and then depend on them	21:38
	← kopparam left	21:38
moritz	some use submodules	21:38
	← dsantiago left	21:38
moritz	some use the CDN	21:38
KevinMGranger	cardguy1000: look into bower	21:38
moritz	there are really no limits to your creativity	21:38
KevinMGranger	or composer-components	21:38
	← eletuchy_ left	21:38
	→ a_le joined	21:39
	→ eletuchy joined	21:39
	← Neozonz\|Disc2 left	21:40
	→ dsantiago joined	21:41
	← MattMaker left	21:41
	→ steele joined	21:42
cardguy1000	KevinMGranger, thanks bower looks neat I'll check this out	21:42
	→ ianbrandt joined	21:42
	← pasokk left	21:44
	← steele_ left	21:44
	← phantombeta left	21:45
	← tvw left	21:45
	→ tvw joined	21:45
	→ samyme joined	21:46
	← tvw left	21:46
	← samyme left	21:46
	→ tvw joined	21:46
	→ samyme joined	21:46
	→ kanye-extension_ joined	21:47
	→ helgikrs joined	21:47
	← Macaveli left	21:47
kanye-extension_	hello everyone, is it possible to `git pull` a branch, when I'm on a different one?	21:47
sorenb	!pull	21:47
gitinfo	pull=fetch+merge (or with flags/config also fetch+rebase). It is thus not the opposite of push in any sense. A good article that explains the difference between fetch and pull: http://longair.net/blog/2009/04/16/git-fetch-and-merge/	21:47
kanye-extension_	say I'm on branch B, and there are changes in my remote origin on branch A. Is it possible for me to pull branch A to my own branch A, without checking out?	21:48
	sorry, thank you sorenb :)	21:48
	← LeMike left	21:48
sorenb	no, merge will always merge with HEAD, AFAIK	21:48
	how should it work in case of conflicts if you don't have it checked out?	21:48
	→ philippw joined	21:48
	→ Neozonz joined	21:49
	→ LeMike joined	21:49
	← folken left	21:49
	→ dsdeiz joined	21:49
	→ MattMaker joined	21:49
	← samyme left	21:49
	← baweaver left	21:50
	→ moritzs joined	21:52
	→ livingstn joined	21:52
	→ mennea_ joined	21:53
	← FabTG left	21:53
	← mennea left	21:53
	← ianbrandt left	21:54
	→ baweaver joined	21:54
	← KevinMGranger left	21:55
	← buffal0 left	21:55
	← cannonball left	21:55
	← JStoker left	21:56
	← baweaver left	21:56
	→ crystal77 joined	21:57
	→ Shred00 joined	21:57
	→ FabTG joined	21:58
	→ scriptThis joined	21:58
	→ ap0c joined	21:59
	← ap0c left	21:59
	→ ap0c joined	21:59
	← EvilPenguin left	21:59
	→ kballou joined	21:59
	← melter left	22:00
	← sburgess left	22:00
Shred00	if i run "git status --porcelain" at a shell prompt, modified files appear as "<space>M <filename>" however if i run that command in a git hook, the leading space in front of the "M" is dropped and in fact it is inserted before the filename, maintaining the columnar" output. why does git status --porcelain behave differently in a git hook?	22:00
	adam- → adam12	22:00
kadoban	Shred00: Are you sure? That would be surprising.	22:00
osse	Shred00: run 'type git'	22:01
	→ tinti joined	22:01
	→ puff joined	22:01
Shred00	kadoban: try it. put this in .git/hooks/prepare-commit-msg:	22:02
	git status --porcelain >> $1	22:02
	and modify a file and commit and see what's in the commit message.	22:02
	git is hashed (/usr/bin/git)	22:02
	← sohail left	22:04
	→ Embassy joined	22:05
kanye-extension_	sorenb: Sorry i didn't get back to you sooner, thank you, that clears a lot up :)	22:07
	→ palcu joined	22:07
	→ cyphase joined	22:07
	← settermjd left	22:07
	→ KevinMGranger joined	22:08
	→ melter joined	22:08
	← danemacmillan left	22:08
	→ ruukasu joined	22:08
	← tristanp left	22:11
	sorenb → soerenb	22:11
	→ aswen joined	22:11
	← palcu left	22:12
	← tier_ left	22:12
	← joo-_ left	22:14
	→ Internet13 joined	22:14
	→ Tobbi_ joined	22:14
	← tesaf left	22:14
Tobbi_	When I want to rebase interactively, the editor that opens in the command line window shows arrow keys as A, B, C or D in the window instead of ignoring them. Any idea what to do?	22:15
osse	Tobbi_: that is vim, and is running in a vi-compatible mode, making it behave like it was the 70s.	22:15
	Tobbi_: you can change which editor to use. you can also touch ~/.vimrc	22:16
Tobbi_	OKay, will do in a minute.	22:16
osse	Tobbi_: option 3: use hjkl as arrow keys :)	22:17
Tobbi_	Ah!	22:17
	Yeah, that seems to be the short fix.	22:18
osse	Tobbi_: it's how vi(m) is meant to be used also	22:18
	→ t4nk729 joined	22:18
Tobbi_	osse: When I'm in insert mode, that doesn't work, of course.	22:19
	Also, the "bug" only occurs in insert mode.	22:19
osse	correct	22:19
	← denete left	22:19
osse	oh, that's strange	22:19
Tobbi_	Not sure if that's strange.	22:19
osse	I'm not either	22:20
charon	the terminal sends some funny escape sequence and A/B/C/D for the arrows	22:20
	(try 'cat' and then an arrow key)	22:20
	← jonatasnona left	22:20
Shred00	kadoban: did you try it?	22:20
kadoban	Shred00: No. It's the same command, I don't see it doing anything different and I'm not interested enough to perform the experiment.	22:21
Tobbi_	charon: As far as I know this started in Yosemite.	22:21
	→ dreiss joined	22:22
Shred00	kadoban: i know it's the same command. it just behaves differently. here is what is in my commit message when i do the experiment:	22:22
	M Makefile	22:22
	with the M in col 1, followed by 2 spaces	22:23
	→ mennea joined	22:23
	→ baconbeckons joined	22:23
	← mennea_ left	22:23
	← tranzfus_ left	22:23
	← aswen left	22:24
	← nrsk left	22:24
	← dpio left	22:24
	→ adamben joined	22:25
	← adamben left	22:25
	→ adamben joined	22:25
	← pullphinger left	22:26
	→ riceandbeans joined	22:26
riceandbeans	if I need to change the committer of my last commit by an amend, what do I do?	22:26
	I've changed the author, but I need to change the committer too	22:26
kadoban	Shred00: Well, check your assumptions one step at a time I guess. Output to a file on its own from the hook, input to the commit message part separately, etc. shrug	22:26
	→ s8321414 joined	22:26
riceandbeans	it's breaking gerrit	22:26
	← JohnBat26 left	22:27
	← desposo left	22:27
	→ phantombeta joined	22:27
	→ baweaver joined	22:27
	← marioxcc left	22:27
Shred00	kadoban: i don't have to output to a file. i can see that git is printing it exactly as i am seeing it:	22:28
	16817 write(1, "M Makefile\n?? .0\n?? .coverage.h"..., 4096) = 4096	22:28
	Tobbi_ → Tobbi	22:28
	← pantsman- left	22:28
Shred00	that is git printing first the M and then two spaces and then the file name, when called in a git hook	22:28
	← t4nk729 left	22:29
	← ManikM left	22:29
	→ ManikM joined	22:29
	← jason237 left	22:29
Shred00	and this is git on a command line:	22:30
	18398 write(1, " M Makefile\n", 12) = 12	22:30
	→ marioxcc joined	22:31
	→ hgl joined	22:31
	← marioxcc left	22:31
	→ samskiter joined	22:31
	← baweaver left	22:32
	← hxm left	22:32
	← v0n left	22:33
	← i_ron left	22:33
	← FabTG left	22:33
	→ baweaver joined	22:33
	→ kopparam joined	22:34
	→ lidaaa joined	22:35
	→ i_ron joined	22:35
	← hgl left	22:36
	← livingstn left	22:36
	→ Juxtapoe joined	22:36
	→ devoldmx joined	22:36
	← baweaver left	22:37
	→ JStoker joined	22:37
	← mennea left	22:38
	← Juxtapositional left	22:38
	← adamben left	22:38
	← kopparam left	22:39
	→ adamben joined	22:39
	→ baweaver joined	22:39
	→ EvilPenguin joined	22:40
	← alekks left	22:40
	→ joo-_ joined	22:40
osse	charon: are you still there?	22:41
	← steele left	22:41
	← joo-_ left	22:41
	← KONIG left	22:41
	← devoldmx left	22:42
	→ steele joined	22:42
	→ v0n joined	22:42
	← yamatoxxx left	22:42
	← moritzs left	22:43
	→ KONIG joined	22:43
derekm00re	Shred00: I've been tempted to use git's short status in hooks, but I find it can be avoided entirely	22:44
	Shred00: it is better to use the proper git command than parse the output of shitty porcelain commands	22:45
	Shred00: What are you trying to find?	22:45
	→ shpoont joined	22:45
	← shpoont left	22:46
	← pheaver left	22:46
	← steele left	22:46
	→ bb010g joined	22:46
	← cagedwisdom left	22:47
osse	charon: ahh, it's ok. I've been having trouble with git-send-email for a while (it segfaults). But I nuked some stuff in .../site_perl which I also have in .../core_perl and now it works (I don't know what I'm doing).	22:47
	← netj left	22:48
	→ netj joined	22:48
	← kanye-extension_ left	22:48
	← BlaXpirit left	22:48
	← Sasazuka left	22:49
derekm00re	Shred00: M <SP> <SP> Makefile and <SP> M <SP> Makefile is showing you how index and work tree are changing as you go through the workflow	22:49
	→ Sasazuka joined	22:49
	← Sasazuka left	22:50
	→ Sasazuka joined	22:50
	← kermit left	22:50
	→ steele joined	22:50
	← steele left	22:50
	→ J1G\|Anon126 joined	22:50
	→ msmith_ joined	22:50
	→ kermit joined	22:51
	→ steele joined	22:51
	→ coredumb joined	22:52
derekm00re	Shred00: you probably want the list of files that are staged for commit in your prepare-commit-msg hook? use "git diff --cached --name-only" (some people add --no-color)	22:52
coredumb	I folks	22:52
	← nfk left	22:52
coredumb	i was wondering why git client when cloning sometimes doesn't show any progress	22:52
	is it coming from the server ?	22:53
	← helgikrs left	22:53
	→ yamatoxxx joined	22:54
	← msmith left	22:54
derekm00re	does it happen on the same protocol? or is it an http:// vs. git:// thing?	22:54
coredumb	seems to happen on http	22:55
	never had this issue on ssh://	22:56
	← scriptThis left	22:56
	← jheg left	22:57
derekm00re	that's what I was thinking, I see to recall similar differences in output long ago	22:57
	→ dobby156 joined	22:58
derekm00re	probably has something to do with not being able to lseek(2) files over http?	22:58
dobby156	gah, somehow I have managed to detach from master	22:58
osse	dobby156: !reattach	22:58
gitinfo	dobby156: Letters refer to !detached. (a) and (b): 'git checkout branchname' to continue working on another branch, or 'git checkout -b branchname' to start a new one here; (c) git am --continue; (d) git rebase --continue	22:58
	→ pheaver joined	22:58
dobby156	osse: thanks; so git checkout master should do that?	22:59
osse	dobby156: yes	22:59
dobby156	osse: any ideas as to how that might have happened?	22:59
	I have a pretty basic workflow	23:00
osse	!detached	23:00
gitinfo	A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach	23:00
	→ sohail joined	23:00
dobby156	osse: ah submodule	23:00
	thanks again :)	23:00
	← King_Hual left	23:00
osse	You're welcome ma'am	23:00
	← kukks left	23:00
	← teran left	23:00
	← rpg left	23:01
	→ rpg joined	23:01
	→ teran joined	23:01
	← EvilPenguin left	23:01
	→ cyphase_ joined	23:02
	← normalra left	23:02
	cyphase_ → Guest65152	23:02
	← LeMike left	23:02
	→ kukks joined	23:03
	← cyphase left	23:03
	← phantomcircuit left	23:04
	← EvanDotPro left	23:05
	← akiva left	23:05
	→ phantomcircuit joined	23:05
	→ EvanDotPro joined	23:05
	← baweaver left	23:06
	← jazper- left	23:07
	→ licnep joined	23:07
	← tgunr left	23:09
	← Dopagod left	23:10
	→ sgen joined	23:10
coredumb	derekm00re: seems to work correctly on http on some servers though :O	23:10
derekm00re	could be whether the server reports file-size headers (or continuations)	23:10
	Content-Length or whatever	23:11
	← Marcus_ left	23:11
	→ tgunr joined	23:12
	← martinklepsch left	23:12
	→ nardev joined	23:12
	← SumDude left	23:13
	→ chrisshattuck joined	23:13
	Solid1 → Solid1_afk	23:13
	← m8 left	23:13
	← Kicer86 left	23:14
	← s8321414 left	23:14
	← jwpeddle left	23:14
	← Juxtapoe left	23:15
	← lindenle left	23:15
	→ s8321414 joined	23:15
	→ SumDude joined	23:15
derekm00re	So I think I've successfully implemented RCS keyword substitutions in Git using git-archive, smudge/clean filters and hooks... The only accurate and thorough implementation of $Author$, $Date$ and $Revision$ in existence. ;)	23:15
	← SumDude left	23:15
	→ SumDude joined	23:16
	→ EvilPenguin joined	23:16
	← diegoviola left	23:16
	→ kristanner joined	23:17
	← dobby156 left	23:18
kadoban	derekm00re: Can't say I've really missed those... was it worth it?	23:18
	→ jheg joined	23:18
	← sMa_ left	23:19
	← Skapadapaduu left	23:19
	→ smccarthy joined	23:19
	→ d10n-work joined	23:19
	→ t0th_-_ joined	23:20
derekm00re	kadoban: it was definitely complicated! I just conquered a bug where changes not staged for commit during "add -p" were being overwritten	23:20
	have a look: https://github.com/derekm/git-keywords	23:20
	→ ojacobson joined	23:21
	← steele left	23:21
derekm00re	I should say, $Author: $Format:%an <%ae>$ $, $Date: $Format:%ai$ $ and $Revision: $Format:%h$ $ ;)	23:21
	← TomyLobo left	23:22
kadoban	derekm00re: :) Glad you succeeded, that does indeed look complicated	23:22
derekm00re	basically, anywhere there's a state-machine transition, I hook into it to overwrite files from the index with the results of git-archive (this work exposes several state transitions that are just missing entirely from git)	23:23
	but the edge cases from those missing state transitions aren't important	23:24
	← ojacobson left	23:24
	→ tranzfuse joined	23:24
	→ HACKING-FACEBOOK joined	23:26
	← Etheco left	23:26
derekm00re	to put it simply, it is a very surgical: for i in $(git ls-tree --name-only @); do git update-index $(git archive $(git log -1 --format=%H @ -- $i) -- $i \| tar vx); done	23:26
	← Noldorin left	23:26
	→ teran_ joined	23:27
	kpease_ → kpease	23:27
	→ jazper- joined	23:27
	← jazper- left	23:27
	→ jazper- joined	23:27
derekm00re	that for loop is how you initialize the substitutions after a clone and after configuring the filter	23:28
	← philipd left	23:28
	← tranzfuse left	23:29
	← teran left	23:30
	→ Gitzilla joined	23:31
	kpease → kpease_	23:31
	← msmith_ left	23:32
	→ pretzel80 joined	23:32
	→ otter768 joined	23:33
	→ hebz0rl_ joined	23:33
	→ diegoviola joined	23:34
	← Zupoman left	23:37
	← jheg left	23:38
	← otter768 left	23:38
	→ akiva joined	23:39
	← EvilPenguin left	23:39
	← hebz0rl_ left	23:40
	← derekm00re left	23:41
	← paul424 left	23:42
	→ philipd joined	23:42
	← DeathIncarnate left	23:43
	← netcarver left	23:44
	→ checkit joined	23:45
	← nour left	23:45
	→ dpio joined	23:47
	← howitdo left	23:49
	→ pcypher joined	23:49
	→ n-st joined	23:49
	← HACKING-FACEBOOK left	23:52
	← corni left	23:53
	← a_le left	23:54
	→ danemacmillan joined	23:56
	→ baweaver joined	23:56
	← sinequanon left	23:57
	→ ome joined	23:58
	← mz\|` left	23:58
	← knownasilya left	23:59
	→ HACKING-FACEBOOK joined	23:59

Logs Search ←Prev date Next date→

Channels Documentation