IRCloggy #git 2014-09-26

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-09-26
	← fstd left	00:00
	→ afhammad joined	00:00
	→ fstd joined	00:00
	← ColKurtz left	00:01
	→ MistuhKurtz joined	00:01
	← ianbrandt left	00:03
	→ kristofferR joined	00:04
	→ Vivekananda_y510 joined	00:04
	→ revyd joined	00:04
	← KrofDrakula left	00:05
	← tmcmahon left	00:06
	← PaulCapestany left	00:06
	→ HedgeMage joined	00:06
	← jdrumheller left	00:06
	→ Sebtoast joined	00:06
	→ Motoko joined	00:06
	→ ropav joined	00:07
	← kristoff_ left	00:07
	← danemacmillan left	00:08
	→ PaulCapestany joined	00:08
	→ ki0 joined	00:08
	→ moritzschaefer joined	00:09
	← endiruna left	00:09
	← hahuang65 left	00:09
	← MistuhKurtz left	00:10
	← Sebtoast left	00:10
	← jenni_naiaretti left	00:11
	→ danemacmillan joined	00:11
	→ Drool joined	00:12
	→ Sebtoast joined	00:12
	→ Peuc2 joined	00:12
	→ mribeirodantas joined	00:12
	← ki0 left	00:12
	← ecky--ptang-zoob left	00:12
	← Droolio left	00:13
	← booboy left	00:13
	→ ecky--ptang-zoob joined	00:13
	bedouin_ → bedouin	00:13
	→ booboy joined	00:15
	← ropav left	00:15
	→ ColKurtz joined	00:15
	← Peuc left	00:15
	Peuc2 → Peuc	00:15
	→ damccull joined	00:16
	← howitdo left	00:16
	→ amikiri joined	00:16
	← imkmf left	00:16
	← Apocalis_ left	00:16
	← nodekid left	00:19
	→ howitdo joined	00:23
	→ ropav joined	00:23
	→ ehmatthes joined	00:24
	← howitdo left	00:24
	← CheckDavid left	00:24
	← AdrianGuenter_ left	00:25
	← ropav left	00:25
	→ nodekid joined	00:26
	← boombatower left	00:26
	← amalloy left	00:27
	→ howitdo joined	00:27
	← howitdo left	00:27
	← noonian left	00:29
	→ GreZephyr1123 joined	00:29
	→ ropav joined	00:30
	← jonr22 left	00:30
	→ hahuang65 joined	00:30
	← imachuchu left	00:31
	→ archdori joined	00:32
	→ robarelli joined	00:32
	→ eletuchy joined	00:34
	← ropav left	00:34
	→ sean_ joined	00:34
	← maslowbeer left	00:34
	← zanchoPa1sa left	00:35
	← baweaver left	00:35
	← Quevin left	00:36
	→ fatalhalt joined	00:36
	→ baweaver joined	00:36
	→ jonr22 joined	00:36
	→ tokik joined	00:37
	← moritzschaefer left	00:37
	← robarelli left	00:37
	→ ropav joined	00:38
	← GreZephyr1123 left	00:39
	← nath_schwarz left	00:40
	→ skynxnex joined	00:40
	← MattMake_ left	00:40
	→ nb_bez__ joined	00:41
	→ MattMaker joined	00:41
	← ropav left	00:41
	← harish_ left	00:42
	← martinklepsch left	00:43
	→ jonmorehouse joined	00:44
	← sean_ left	00:45
	→ MattMake_ joined	00:45
	← skynxnex left	00:45
	← am0khuman left	00:45
	→ simesy joined	00:45
	← jottr left	00:46
	→ wakd joined	00:46
	→ ropav joined	00:47
	→ neonixcoder joined	00:47
	← simesy left	00:47
	→ simesy joined	00:47
	← thiago left	00:48
	← MattMaker left	00:48
	← ropav left	00:48
	→ msmith_ joined	00:48
	← mueslo left	00:49
	← simesy left	00:49
	→ simesy joined	00:49
	← kballou left	00:50
	← decompiled left	00:50
	← neonixcoder left	00:51
	← loz-- left	00:51
	→ loz--_ joined	00:51
	→ Macaveli joined	00:51
	→ nodekid_ joined	00:51
	← ErKa left	00:52
	→ Neozonz joined	00:53
	← msmith_ left	00:53
	← nodekid left	00:53
	→ snuffeluffegus joined	00:54
	→ wrouesnel1 joined	00:54
	← seanmerron left	00:54
	→ zivester joined	00:55
	← Sasazuka left	00:55
	→ EminenceHC joined	00:56
	→ marscher joined	00:56
	→ ajustrun joined	00:58
	← jon_r left	00:58
	← zahlman left	00:59
	← ehmatthes left	00:59
	← roflin left	01:00
	→ roflin joined	01:00
	← EminenceHC left	01:01
	← eto left	01:01
	← dccc left	01:01
	→ akushner__ joined	01:01
	→ ferreum` joined	01:03
	→ eto joined	01:03
	← einonm left	01:03
	→ kaendfinger joined	01:04
	→ Mobutils joined	01:05
	← akushner_ left	01:05
	← baweaver left	01:05
	← johtso left	01:05
	→ pheaver joined	01:05
	← akushner__ left	01:05
	→ kpease joined	01:06
	← ferreum_ left	01:06
	← afhammad left	01:06
	← hyperair left	01:07
	← MattMake_ left	01:07
	← hmsimha_ left	01:08
	→ lukeholder joined	01:08
	→ jon_r joined	01:08
	→ ki0 joined	01:09
	→ howitdo joined	01:09
	→ msmith_ joined	01:09
	← veebers left	01:09
	← kpease left	01:10
	← tinti left	01:10
	→ watabou joined	01:10
	→ MattMaker joined	01:12
	← ki0 left	01:13
	← ColKurtz left	01:14
	→ ColKurtz joined	01:15
	→ einonm joined	01:15
	→ mellernoia joined	01:16
	→ Mso150_u joined	01:17
	→ zahlman joined	01:18
	gitinfo set mode: +v	01:18
	← MattMaker left	01:18
zahlman	how can I purge the repository of normally unreachable commits? I happen to have recorded some commit IDs for branches 'left behind in detached HEAD mode', and have found that I can actually `checkout` them again; I'd like them really gone.	01:19
	← hahuang65 left	01:19
	← sgen_ left	01:19
	→ k_sze[work] joined	01:20
	→ smccarthy joined	01:20
zahlman	I thought `git prune` would do the trick, but it seems not to have.	01:21
	← maestrojed left	01:23
	→ hahuang65 joined	01:23
	← pombreda left	01:24
	← Macaveli left	01:24
	gfixler → Guest94606	01:25
	→ refried_ joined	01:25
	→ sgen_ joined	01:25
gfixler_	git gc	01:26
	jhass → jhass\|off	01:27
	← ajustrun left	01:27
	→ daito joined	01:27
	→ helgikrs3 joined	01:28
	← Neozonz left	01:30
imMute	zahlman: git gc with some options, or just wait a month.	01:30
	→ Vampire0_ joined	01:30
	→ nettoweb joined	01:30
	→ Warrior-kk joined	01:30
	→ Goplat joined	01:31
	→ nath_schwarz joined	01:31
	← mdel left	01:32
	← Sebtoast left	01:33
	→ toothrot joined	01:33
	← Vampire0 left	01:34
zahlman	imMute: I tried that. After setting the appropriate config option, the total number of objects went way down, but I can still reach my test 'zombie' commit o_O	01:34
	→ robarelli joined	01:34
	← jonr22 left	01:35
zahlman	(and doing so seems to have added some objects...)	01:35
imMute	does "git fsck --unreachable" list that commit as unreachable?	01:35
	← pwnz0r left	01:37
zahlman	Yes.	01:37
imMute	and you did "git gc --aggressive --prune=all" ?	01:38
	→ Pyrogerg joined	01:38
	← robarelli left	01:39
zahlman	... not after making the config change; let me try it again.	01:39
	ok; now nothing is reported unreachable; so if that means what it ought to...	01:39
	→ rchavik joined	01:40
zahlman	excellent, everything's clean now.	01:40
	← dgpalmer left	01:41
	→ harish_ joined	01:41
	→ skynxnex joined	01:41
zahlman	why isn't `git remote -v` showing me a url for the remote?	01:42
	← lyang0 left	01:43
imMute	becaues you need to tell it which remote you want verbose info about	01:43
	er	01:43
	you need "git remote -v show"	01:43
zahlman	it just says 'origin'. Are there 0..N urls associated with a remote or something?	01:44
	← MutSbeta left	01:44
imMute	no, just one.	01:44
	well, two (one for push, one for pull)	01:45
	even "git remote -v" shows the URL for me. what version of Git do you have?	01:45
zahlman	...so then what am I to make of `git remote set-url --add` o_O	01:45
	← skynxnex left	01:46
zahlman	I just updated by getting github's current windows package, which claims to have 1.9.4.	01:46
	(.msysgit.1, if it matters)	01:46
	← rdbell left	01:46
imMute	... uh. maybe it does support multiple URLs...	01:46
	learn something new every day	01:46
	→ rdbell joined	01:47
zahlman	I can vaguely imagine how it would be useful.	01:47
	→ lyang0 joined	01:47
	→ otter768 joined	01:47
	← jon_r left	01:49
	→ hyperair joined	01:49
	← dsdeiz_ left	01:50
	← Mso150_u left	01:50
	← refried_ left	01:50
	← rdbell left	01:52
	→ veebers joined	01:52
	← hahuang65 left	01:52
	← mribeirodantas left	01:52
	← otter768 left	01:53
	← darkbasic left	01:54
	→ darkbasic joined	01:55
	→ listochkin joined	01:55
zahlman	When I do `git rev-list HEAD`, that only shows commits on the current branch, right? Is there a direct way to list the entire repository?	01:57
	→ jonr22 joined	01:58
imMute	git log --all ?	01:58
	hell, git rev-list --all	01:58
	→ jpf_ joined	01:59
	← _lrh_ left	01:59
	← DolpheenDream left	01:59
	← listochkin left	02:00
	← msmith_ left	02:00
zahlman	aha, rev-list also accepts --all, excellent.	02:01
	← dreiss left	02:01
zahlman	so I can feed that to wc -l for statistical purposes, for example.	02:01
	→ EminenceHC joined	02:01
	← booboy left	02:01
	→ msmith_ joined	02:02
	← desposo left	02:02
	← jpf left	02:02
	← pheaver left	02:02
	← m0viefreak left	02:02
	← jpf_ left	02:03
	→ it0a joined	02:03
	← JosephFerano left	02:04
	→ JosephFerano joined	02:04
	← EminenceHC left	02:05
	← msonntag left	02:06
	← kaendfinger left	02:06
	→ zacg joined	02:07
	← zacg left	02:07
	→ zacg joined	02:07
	→ diegoviola joined	02:07
	→ msonntag joined	02:08
	→ yacks joined	02:08
	→ ki0 joined	02:08
	← tanath left	02:09
	← JosephFerano left	02:09
	← mscook left	02:09
	→ joelteon joined	02:09
joelteon	is it possible to ignore, but not remove with git clean -X, certain files?	02:10
	→ jon_r joined	02:10
	→ tanath joined	02:11
	← msmith_ left	02:13
	← ColKurtz left	02:13
	← ki0 left	02:13
	← zivester left	02:16
	← atomx_ left	02:19
	→ acharlieh joined	02:19
	← jonr22 left	02:21
	← howitdo left	02:23
	← marscher left	02:24
	← alvaro_o left	02:26
	→ mscook joined	02:26
	← robbyoconnor left	02:27
	→ msmith_ joined	02:27
	← mscook left	02:27
	→ robbyoconnor joined	02:27
	→ mscook joined	02:28
	← mellernoia left	02:29
	→ cads joined	02:29
	← jonmorehouse left	02:29
	→ maestrojed joined	02:29
	← joelm left	02:31
	→ maslowbeer joined	02:32
	→ Quevin joined	02:32
	→ jonr22 joined	02:33
	← Noldorin left	02:33
	→ joelm joined	02:33
	→ iamjarvo joined	02:33
	← Xiti left	02:33
	→ devoldmx joined	02:34
	→ robarelli joined	02:35
	→ Darkle joined	02:35
	← Quevin left	02:36
	→ otter768 joined	02:36
	← jonr22 left	02:36
	→ Nazrhom_ joined	02:37
	← amikiri left	02:37
	→ jonr22 joined	02:37
	→ howitdo joined	02:37
	← devoldmx3 left	02:38
	← Dougie187 left	02:38
	← msmith_ left	02:39
	← robarelli left	02:39
	← acharlieh left	02:40
	→ Dougie187 joined	02:41
	← Nazrhom_ left	02:41
	→ muhaha03__ joined	02:41
	→ skynxnex joined	02:42
	→ DolpheenDream joined	02:43
	← howitdo left	02:44
	← it0a left	02:44
	← Enekk left	02:45
	← hagabaka left	02:46
	← skynxnex left	02:47
	→ acharlieh joined	02:48
	→ jpf joined	02:48
	→ hagabaka joined	02:49
	← jpf left	02:50
	← acharlieh left	02:51
	→ pwnz0r joined	02:52
	→ jpf joined	02:53
	→ arup_r joined	02:56
	→ howitdo joined	02:57
xp_prg	what is the command to see all the differences in a particular directory, I tried git diff but it did all directories, not the one I was currently in	02:57
	← c0ded left	02:57
imMute	git diff .	02:58
	← arup_r left	02:58
xp_prg	I heart you inMute :>	02:58
	← Mitchbones left	02:58
	← nettoweb left	02:58
	→ pheaver joined	02:59
	← nb_bez__ left	03:01
	→ ome joined	03:04
	→ jitendravyas joined	03:04
	→ EminenceHC joined	03:04
	→ c0ded joined	03:05
	← maestrojed left	03:06
	→ msmith_ joined	03:07
	← msmith_ left	03:08
	← EminenceHC left	03:08
	← xcyclist left	03:09
	→ maestrojed joined	03:14
	← sgen_ left	03:16
	← blakbunnie27 left	03:17
	← jonr22 left	03:17
	← Consuela left	03:18
	→ fission6 joined	03:18
	← LucasTT left	03:18
lng	Hi! Merge failed because the file was deleted in a branch while it was modified on master. How to force merge to delete this file?	03:19
Hello71	!eek	03:19
gitinfo	[!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, don't panic. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II	03:19
	→ Carl_ joined	03:20
lng	Hello71: this info is too basic	03:20
	Hello71: you just learnt how to query bot?	03:21
	← pheaver left	03:22
	← maestrojed left	03:23
	→ maestrojed joined	03:23
	→ pheaver joined	03:25
	→ BuenGenio joined	03:26
imMute	lng: no, we just get the same questions over and over, so we made a FAQ bot	03:28
	← toothrot left	03:30
	← Pyrogerg left	03:31
	← kukks left	03:31
	→ Pyrogerg joined	03:31
lng	solved with rebasing	03:32
	← maestrojed left	03:32
	→ BuenGenio_ joined	03:33
	← BuenGenio left	03:34
	← otter768 left	03:35
	→ otter768 joined	03:36
	← kermit left	03:36
	→ rdbell joined	03:36
	→ robarelli joined	03:37
	→ Xiti joined	03:37
	→ kermit joined	03:37
	← BuenGenio_ left	03:37
	← iamjarvo left	03:37
	← zahlman left	03:39
	← otter768 left	03:40
	← Dougie187 left	03:41
	← hagabaka left	03:41
	← robarelli left	03:42
	→ skynxnex joined	03:42
	← lindenle left	03:43
	← DolpheenDream left	03:43
	→ lindenle joined	03:43
	→ hagabaka joined	03:45
	← worc left	03:46
	→ DolpheenDream joined	03:46
	← skynxnex left	03:47
	← marchelzo_ left	03:47
	→ worc joined	03:47
	← mscook left	03:47
	→ glosoli joined	03:48
	→ TwoSheds joined	03:49
	gitinfo set mode: +v	03:49
TwoSheds	hi all	03:49
	← Carl_ left	03:49
	← TwoSheds left	03:51
	← joelm left	03:52
	→ mscook joined	03:52
	→ jerius joined	03:53
	→ blakbunnie27 joined	03:53
	→ listochkin joined	03:54
	→ joelm joined	03:55
	→ jonmorehouse joined	03:56
	→ GT4066 joined	03:58
	← lindenle left	03:58
	← listochkin left	03:59
	→ monitti joined	03:59
	→ awkwardusername joined	03:59
	← glosoli left	04:00
	→ smw joined	04:00
	→ thiago joined	04:00
	← smw left	04:01
	→ smw joined	04:01
	← nodekid_ left	04:01
	← Tuna-Fish left	04:02
	← Darkle left	04:04
	→ lacrymology joined	04:04
	→ nodekid joined	04:04
	→ Darkle joined	04:04
	→ amikiri joined	04:05
lacrymology	I've got TOPIC which has been merged into DEVELOP, how can I see only the changes introduced by TOPIC? I'm doing `git diff DEVELOP...TOPIC` but it's returning empty, I guess because it's merged already	04:05
	→ BuenGenio_ joined	04:05
lacrymology	and if I do TOPIC...DEVELOP I get what's NOT in TOPIC	04:06
	← Darkle left	04:06
	→ chessguy joined	04:06
	← fission6 left	04:07
lacrymology	if I do DEVELOP^...TOPIC it works	04:08
	DEVELOP^2...TOPIC actually	04:09
	→ EminenceHC joined	04:09
thiago	there you go	04:09
	ChanServ set mode: +o	04:10
	thiago set mode: +b	04:10
	thiago kicked monitti (spamming the channel)	04:10
	thiago set mode: -o	04:10
	← daito left	04:11
	← shauna left	04:11
	→ daito joined	04:12
	→ lindenle joined	04:12
	← fatalhalt left	04:12
	← allouis________ left	04:13
	← titusjose_______ left	04:13
	← smw left	04:13
	→ Tuna-Fish joined	04:13
	→ smw joined	04:13
	← watabou left	04:13
	← shennyg__ left	04:13
	→ allouis________ joined	04:13
	← EminenceHC left	04:13
	→ titusjose_______ joined	04:14
	→ shauna joined	04:14
	→ ande joined	04:15
	ande → Guest3934	04:15
	→ shennyg__ joined	04:15
	← daito left	04:16
	→ irqq joined	04:16
	→ watabou joined	04:16
	← watabou left	04:16
	→ watabou joined	04:16
	→ JosephFerano joined	04:17
imMute	thiago: delayed reaction?	04:18
	← DolpheenDream left	04:19
	→ msmith_ joined	04:19
	← ItSANgo left	04:20
	← chessguy left	04:20
	← lindenle left	04:21
	← smw left	04:21
	← dropdrive left	04:22
	← asakura left	04:22
	← jitendravyas left	04:23
	← hagabaka left	04:23
	← bbloom left	04:23
	← msmith_ left	04:23
	→ lindenle joined	04:24
	← farn left	04:25
	← kpreid left	04:25
	→ kpreid joined	04:26
	→ dv_ joined	04:27
	← dv__ left	04:27
	→ hagabaka joined	04:28
	← BuenGenio_ left	04:29
	← a_le left	04:32
	← lindenle left	04:33
	→ Quevin joined	04:33
	← pwnz0r left	04:34
	← nonmadden left	04:36
	→ lindenle joined	04:37
	→ BuenGenio joined	04:38
	← Quevin left	04:38
	→ robarelli joined	04:39
	← jimmyy left	04:40
	← amikiri left	04:41
	→ glosoli joined	04:41
	→ zumba_ad_ joined	04:42
	← lindenle left	04:43
	← robarelli left	04:43
	→ subhojit777 joined	04:43
	→ skynxnex joined	04:43
	→ lindenle joined	04:45
	→ tvw joined	04:45
	← zumba_addict left	04:46
	→ jimmyy joined	04:47
	← skynxnex left	04:48
	← jimmyy left	04:48
	← BuenGenio left	04:49
	← irqq left	04:50
	→ kiran joined	04:51
	← lindenle left	04:57
	← simesy left	04:59
	→ smw joined	04:59
	→ DanMAbraham joined	04:59
	→ lindenle joined	05:00
	→ simesy joined	05:01
thiago	imMute: no, it wasn't delayed	05:01
	→ zoso joined	05:01
	← Gamecubic left	05:02
	← danemacmillan left	05:02
	← UmbraMalison_ left	05:03
	← snuffeluffegus left	05:03
	← unglid left	05:04
	→ MattMaker joined	05:04
	← mscook left	05:04
	→ UmbraMalison joined	05:05
	→ mennea joined	05:06
	← lindenle left	05:07
	→ lindenle joined	05:08
	→ PinkSpecs joined	05:08
	← smccarthy left	05:08
	← veebers left	05:09
	→ unglid joined	05:09
	→ sinkensabe joined	05:12
	→ EminenceHC joined	05:13
	← zacg left	05:14
	→ koderok joined	05:15
	← Lyqyd left	05:15
	← Jarboe left	05:16
	→ BuenGenio joined	05:16
	← BuenGenio left	05:16
	→ beautifulmind joined	05:17
	← EminenceHC left	05:18
	→ BuenGenio joined	05:18
	← madewokherd left	05:18
	← RogerWS_ left	05:18
	← ecky--ptang-zoob left	05:19
	→ RogerWS joined	05:19
	→ mmattice joined	05:19
	→ ecky--ptang-zoob joined	05:19
	→ mscook joined	05:21
	→ kopparam joined	05:21
	← BuenGenio left	05:21
	→ asakura joined	05:23
	→ jceb joined	05:23
	← sinkensabe left	05:24
	→ daito joined	05:25
	← mscook left	05:26
	← PinkSpecs left	05:28
	← lindenle left	05:29
	→ sinkensabe joined	05:29
	→ jontmorehouse joined	05:31
	→ astrofog joined	05:33
	← gargola left	05:33
	← jonmorehouse left	05:33
	← mennea left	05:33
	← sinkensabe left	05:33
	→ vital joined	05:35
	→ mscook joined	05:35
	← watabou left	05:36
	← astrofog left	05:36
	→ dreiss joined	05:37
	→ thevishy joined	05:38
	→ thevishy_home joined	05:38
	← tpollard left	05:38
	→ BuenGenio joined	05:38
	→ justinmburrous joined	05:38
	→ wrouesnel3 joined	05:39
	→ mennea joined	05:39
	→ robarelli joined	05:39
	→ nonmadden joined	05:40
	← mscook left	05:40
	→ Junior` joined	05:40
	← robarelli left	05:45
	← starkhalo left	05:45
	→ ThomasLocke joined	05:45
	← dreiss left	05:46
	→ arup_r joined	05:46
	→ kyb3r_ joined	05:46
	← Fissure left	05:47
	← JosephFerano left	05:47
	← Mobutils left	05:47
	← Guest12022 left	05:48
	← sdrfnord1 left	05:48
	→ Fissure joined	05:49
	→ olspookishmagus joined	05:49
	→ lindenle joined	05:49
	← nonmadden left	05:49
	→ nonmadden joined	05:50
	← kopparam left	05:51
	→ kopparam joined	05:51
	→ rob_w joined	05:52
	← rob_w left	05:52
	→ rob_w joined	05:53
	← smw left	05:54
	→ smw joined	05:55
	→ Silmarilion joined	05:55
	← kopparam left	05:56
	← lindenle left	05:58
	→ chessguy joined	05:58
	← thevishy_home left	05:59
	← thevishy left	06:00
	→ saurabh joined	06:00
	saurabh → Guest73625	06:00
	→ lindenle joined	06:03
	← darkbasic left	06:03
	→ mscook joined	06:04
	→ darkbasic joined	06:04
	→ Sasazuka joined	06:04
	→ kopparam joined	06:04
	← chessguy left	06:05
	← mscook left	06:08
	→ ItSANgo joined	06:09
	← jontmorehouse left	06:09
	← Streward left	06:11
	← daito left	06:11
	→ daito joined	06:11
	→ ciampix joined	06:12
	← lindenle left	06:12
	→ dreiss joined	06:12
	→ FilipNortic joined	06:12
	→ lindenle joined	06:12
	→ KeelOfSteel joined	06:13
	← blubberbop left	06:14
	→ roelmonnens joined	06:15
	← Sasazuka left	06:15
	← daito left	06:15
	→ GluonQuark joined	06:17
	→ booboy joined	06:17
	→ Sasazuka joined	06:18
	→ Mobutils joined	06:18
	→ EminenceHC joined	06:18
	→ vgarg joined	06:18
	→ mscook joined	06:19
	→ acolson joined	06:20
	← gfixler_ left	06:20
	← mennea left	06:20
	→ mennea joined	06:20
	→ skynxnex joined	06:20
	← northfurr left	06:21
	← skynxnex left	06:21
	→ skynxnex joined	06:21
	→ LeMike joined	06:21
	→ daito joined	06:22
	→ freimatz joined	06:22
	← oojacoboo left	06:22
	← govg left	06:23
	→ nnyk joined	06:23
	← EminenceHC left	06:23
	→ thevishy joined	06:23
	→ thevishy_home joined	06:23
	← mscook left	06:24
	← Goplat left	06:24
	→ govg joined	06:24
	← lindenle left	06:27
	→ jontmorehouse joined	06:28
	← jwmann left	06:28
	← piccata left	06:28
	→ jwmann joined	06:28
	→ sitaram joined	06:29
	← sitaram left	06:29
	→ sitaram joined	06:29
	→ snuttilatti_ joined	06:29
	← joevandyk left	06:29
	→ piccata joined	06:29
	← LLaurent left	06:29
	← olspookishmagus left	06:29
	← Floatingman left	06:29
	← tank100 left	06:29
	← ToxicFrog left	06:29
	→ cite joined	06:30
	→ qdii joined	06:30
	→ jimmyy joined	06:31
	→ purpleidea joined	06:31
	→ joevandyk joined	06:31
	→ esc joined	06:31
	→ olspookishmagus joined	06:31
	← esc left	06:31
	→ esc joined	06:31
	→ tank100 joined	06:31
	olspookishmagus → Guest21790	06:32
	← jontmorehouse left	06:33
	→ lindenle joined	06:33
	← dreiss left	06:33
	→ Quevin joined	06:34
	→ Mso150_u joined	06:35
	→ heavystorm joined	06:35
	→ jagob joined	06:35
	→ ToxicFrog joined	06:35
	← lacrymology left	06:35
	→ __main__ joined	06:36
	→ Bucciarati joined	06:36
	→ uber joined	06:36
	← uber left	06:36
	→ nfk joined	06:36
	→ uber joined	06:36
	→ jontmorehouse joined	06:37
	→ lacrymology joined	06:37
	← lun_ left	06:38
	← Quevin left	06:38
	→ nilg joined	06:40
	← sohail left	06:41
	→ robarelli joined	06:41
	← lindenle left	06:42
	→ lun_ joined	06:42
	→ Floatingman joined	06:43
	→ gauke joined	06:44
	← pheaver left	06:45
	← Vivekananda left	06:45
	→ mscook joined	06:46
	← jagob left	06:47
	← robarelli left	06:47
	→ King_Hual joined	06:47
	← mennea left	06:50
	→ encod3 joined	06:50
	← mscook left	06:50
	→ mennea joined	06:50
	← awkwardusername left	06:52
	→ awkwardusername joined	06:53
	→ mlechner joined	06:53
	→ t4nk598 joined	06:54
	← nnyk left	06:55
t4nk598	hi guys, short question: if i want to create a new repository on a server i would need to log in via ssh right?	06:55
Sajbar	if you don't have direct access to the server yes:)	06:56
	← lacrymology left	06:56
t4nk598	i exist as a git user. (whatever that exactly means)	06:56
	so that is not sufficient?	06:56
	→ FunkyAss joined	06:57
	← jpf left	06:59
_ikke_	nope	07:00
	← Sasazuka left	07:00
	→ otter768 joined	07:00
	← ThomasLocke left	07:01
	→ ThomasLocke joined	07:02
osse	t4nk598: does the server have a web interface or something like that? stash? gitlab? github? gitorious?	07:02
	← jon_r left	07:02
	→ mscook joined	07:02
	→ Sasazuka joined	07:02
	← encod3 left	07:03
t4nk598	osse: no :(	07:03
	→ avvs joined	07:04
osse	t4nk598: then you need shell access	07:04
	→ mscook_ joined	07:04
	→ dropdrive joined	07:04
	→ hebz0rl joined	07:04
osse	something like curl -U '() { :;}; cd /repos; mkdir project; git init --bare' https://companygitserver.com should do the trick	07:05
	← Sasazuka left	07:05
	← otter768 left	07:05
	← luto left	07:05
	→ luto joined	07:05
luto	osse: lol.	07:05
osse	woops, forgot to cd into the project	07:05
	→ Gabri joined	07:05
	← Warrior-kk left	07:06
	→ Warrior-kk joined	07:07
	← acl_ left	07:07
	→ bbloom joined	07:07
	← mscook left	07:07
	→ sdrfnord1 joined	07:07
	← kristofferR left	07:08
	← mscook_ left	07:09
	→ farn joined	07:09
t4nk598	osse: k thx	07:09
	← eletuchy left	07:09
	→ Xiti` joined	07:09
osse	t4nk598: but in reality I assume it means sending an email to the server admin or something like that	07:09
	t4nk598: CC your boss, so the admin knows it's serious stuff	07:09
	← thevishy_home left	07:09
	← thevishy left	07:10
	← avvs left	07:10
	← jceb left	07:11
	→ aswen joined	07:12
	→ Nazrhom joined	07:12
	← Xiti left	07:13
	← Nazrhom left	07:13
	→ cvanball joined	07:13
	→ alorence joined	07:13
	→ Nazrhom joined	07:13
t4nk598	osse: lol now i got it ^^	07:14
	i dont think the server admins would be super happy if i did that ;)	07:15
	← kopparam left	07:15
	← piccata left	07:15
	← koderok left	07:16
	→ piccata joined	07:16
	→ lacrymology joined	07:17
	→ skylite joined	07:18
	← smw left	07:18
	← robbyoconnor left	07:18
	← mennea left	07:20
	→ mennea joined	07:21
	→ durre joined	07:21
	→ petersr joined	07:21
	→ intellix joined	07:21
	→ endiruna joined	07:21
	→ GGflags joined	07:22
	→ EminenceHC joined	07:22
	← thiago left	07:23
	→ avvs joined	07:23
	→ zapb_ joined	07:24
	→ mkaesz joined	07:25
	→ kriks joined	07:25
	→ gua_ould joined	07:26
	→ jargon joined	07:26
	→ cbr_ joined	07:26
	← EminenceHC left	07:27
	→ EminenceHC joined	07:31
	→ seschwar joined	07:31
	→ Marcus joined	07:34
	← subhojit777 left	07:34
	← xobb left	07:35
	← polyzen left	07:36
	← justinmburrous left	07:36
	→ Malsasa_ joined	07:36
	→ WormDrink joined	07:37
	→ subhojit777 joined	07:37
	→ noxd joined	07:37
	← Malsasa left	07:37
	→ encod3 joined	07:38
	Malsasa_ → Malsasa	07:38
	← harish_ left	07:38
	→ prettyd joined	07:38
	→ ghostlin_ joined	07:39
	← mennea left	07:40
	← encod3 left	07:40
	→ encod3 joined	07:40
	→ xobb joined	07:41
	← EminenceHC left	07:42
	→ jnavila joined	07:42
	→ Trudko joined	07:42
	→ EminenceHC joined	07:42
	→ mlnppy joined	07:43
	← jnavila left	07:43
	→ jnavila_ joined	07:43
	→ robarelli joined	07:44
	→ lindenle joined	07:44
	← prettyd left	07:44
	→ nnyk joined	07:45
	→ prettyd joined	07:45
	← rchavik left	07:46
	← himikof left	07:46
	← EminenceHC left	07:47
	← hebz0rl left	07:48
	→ jitendravyas joined	07:48
	← lindenle left	07:48
	← prettyd left	07:48
	→ prettyd joined	07:49
jitendravyas	Hi	07:49
	Everytime I run git pull --rebase gerrit master	07:49
	→ p4trix joined	07:49
jitendravyas	want to run Bundle install after that automatically	07:49
	How can I do that	07:49
	← robarelli left	07:49
	→ jonmorehouse joined	07:49
	→ rchavik joined	07:49
	← jas4711 left	07:50
j416	jitendravyas: git pull --rebase gerrit master ; Bundle install	07:50
jitendravyas	I want to do it using hook	07:50
	← jontmorehouse left	07:50
	→ kopparam joined	07:50
j416	not sure you want to but	07:51
	→ mennea joined	07:51
j416	!deploy was it	07:51
gitinfo	Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html	07:51
j416	I would use a wrapper script, not a git hook	07:51
	← beautifulmind left	07:51
j416	jitendravyas: because it sounds like a deploy thing -- is it?	07:52
osse	jitendravyas: echo 'Bundle install' > .git/hooks/post-rewrite; chmod +x .git/hooks/post-rewrite	07:52
jitendravyas	no want to run just on my local	07:52
j416	ok	07:53
	then what osse said should do it but I'd avoid it	07:53
	feels like it'd slow things down..	07:53
	→ hebz0rl joined	07:54
	gitinfo set mode: +v	07:54
prettyd	hi there	07:54
gitinfo	prettyd: 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.	07:54
prettyd	hi there	07:54
j416	you already said that	07:54
	← govg left	07:55
prettyd	hi	07:55
	j416 off to work afk o/	07:55
	← prettyd left	07:55
	→ robbyoconnor joined	07:58
	→ prettyd joined	07:58
	gitinfo set mode: +v	07:58
prettyd	hi there	07:58
	→ Sonderblade joined	07:58
	← Sonderblade left	07:59
	→ Sonderblade joined	07:59
	← arup_r left	07:59
prettyd	im trying to figure out how to setup git-daemon on debian, my git been installed and working for a week now, wanted to automatize some things, but cant seem to find git-daemon ? isn't it supposed to come with the package?	08:00
	→ arup_r joined	08:01
	← arup_r left	08:01
	→ P4_Denis joined	08:02
	→ chessguy joined	08:02
	→ CheckDavid joined	08:03
	→ mikecmpbll joined	08:04
	← jnavila_ left	08:04
	→ jottr joined	08:05
	← chessguy left	08:06
	→ ki0 joined	08:07
	→ Suchit joined	08:07
	→ jceb joined	08:08
_ikke_	You mean the binary?	08:08
	← Drool left	08:08
	← Suchit left	08:08
	→ nour joined	08:09
prettyd	yup	08:09
	→ TititaTitutu joined	08:09
	→ Suchit joined	08:09
prettyd	apt-get did not get anything looking like a daemon to me.	08:09
	though it was outside but ? where	08:09
	→ Gonzo89 joined	08:10
	← jitendravyas left	08:11
osse	maybe it's in a seperate package	08:11
maxb	It's in the 'git' package	08:12
	Try 'git daemon --help'	08:13
	→ anaran joined	08:13
	→ jenni_naiaretti joined	08:13
	← zumba_ad_ left	08:14
prettyd	hum yes that work. damn ther emust be something i dont do right so :)	08:14
	→ La0 joined	08:14
osse	prettyd: it is probably located in the directory printed by 'git -exec-path'	08:15
	'git --exec-path'	08:15
	← La0 left	08:15
prettyd	ok trying to figure out :) brb	08:16
	→ La0 joined	08:17
	← La0 left	08:17
	→ La0 joined	08:17
	← La0 left	08:17
	→ h0bbit joined	08:18
	← BuenGenio left	08:19
	← mennea left	08:20
	← Motoko left	08:21
	→ mennea joined	08:21
	← multi_io left	08:22
	← maslowbeer left	08:22
	← jenni_naiaretti left	08:22
	← jceb left	08:23
	→ jnavila_ joined	08:24
	→ shruggar joined	08:24
	→ Macaveli joined	08:25
	→ hexagoxel joined	08:26
	← shruggar left	08:27
	→ thevishy_home joined	08:27
	→ thevishy joined	08:27
	→ jenni_naiaretti joined	08:28
	→ Skapadapaduu joined	08:29
	← Gabri left	08:30
	→ BuenGenio joined	08:32
	→ mongag joined	08:32
	→ tomseek joined	08:33
	← avvs left	08:34
	← tanath left	08:34
	→ Quevin joined	08:35
	→ eletuchy joined	08:35
	→ johnny2600 joined	08:36
	→ Gizburdt joined	08:36
	← thibaultcha left	08:37
	← petersr left	08:38
	← LeMike left	08:39
	← Quevin left	08:39
	← intellix left	08:40
	← Macaveli left	08:40
	→ LeMike joined	08:40
	← wakd left	08:44
	→ amcsi_work joined	08:44
	← darkbasic left	08:44
	← Tuna-Fish left	08:44
	→ darkbasic joined	08:45
	→ oskarkv joined	08:45
	← Suchit left	08:45
	→ Suchit joined	08:45
	→ robarelli joined	08:46
	→ tanath joined	08:46
	→ wakd joined	08:46
	→ liamkeily joined	08:46
	→ avvs joined	08:46
	← wakd left	08:47
	→ emrox joined	08:47
	→ wakd joined	08:48
	← joki left	08:48
	→ chovy joined	08:48
chovy	`git config --local user.name "chovy"` doesn't work for me.	08:48
	→ jatt joined	08:49
chovy	ok, nm	08:49
	it works	08:49
	you can only do one setting at a time.	08:49
	← jatt left	08:49
	→ jatt joined	08:49
chovy	but this is weird, i was able to commit to my repo as another user.	08:49
	← mongag left	08:49
chovy	how is that possible?	08:49
	← mennea left	08:50
	← piccata left	08:50
	→ mennea joined	08:51
	→ seanmerron joined	08:51
	← robarelli left	08:51
osse	chovy: git doesn't care. you can commit under any name you like. don't confuse git's "user names" with actual usernames/accounts on a system	08:51
	→ Dudi joined	08:51
	→ piccata joined	08:52
	← DanMAbraham left	08:52
osse	chovy: user.name is simply your name, the human that is using git.	08:52
chovy	oh i see	08:53
bremner	set user.name to "Edward Snowden" and you're good to go.	08:53
chovy	https://github.com/chovy/humanparser/commit/1a3b6255a063d2cb8b12372de84cf5f48579c4c9	08:53
	this is a little weird though	08:53
	it was commited by 'chovy' but everything looks like it was committed by 'anthonyettinger'	08:53
	→ earthdog joined	08:54
	→ joki joined	08:54
chovy	is there anyway to tell who really committed?	08:54
tobiasvl	chovy: are you anthonyettinger?	08:55
chovy	yes. i'm both users	08:55
	→ Tuna-Fish joined	08:55
chovy	i had ~/.gitconfig set with user.name and user.email to my corporate account	08:55
tobiasvl	github associates commits to github accounts by using the e-mail address that it was commited with	08:56
bremner	chovy: you can use "git log --pretty=fuller" on the command line	08:56
tobiasvl	so the reason those commits are associated to anthonyettinger instead of chovy is that you commited them with one of anthonyettinger's e-mail addresses	08:56
	← Mso150_u left	08:56
osse	chovy: if a commit author also has a github user then the github user stuff is shown instead of the "real" data	08:57
	FYI, the user.name setting is usally set to your full name	08:57
chovy	so i can just figure out who i want to pretend to be and make it look like they are commiting to my project??	08:57
osse	yep	08:58
chovy	awesome :)	08:58
	← BuenGenio left	08:58
chovy	TJ is back on js guys!	08:58
	← sitaram left	08:59
	→ evildmp joined	09:00
	← zarubin left	09:01
	← Nijikokun left	09:01
	→ sitaram joined	09:01
	← endiruna left	09:01
	← tanath left	09:03
	→ tanath joined	09:04
	→ chessguy joined	09:04
	→ shuaib joined	09:04
	→ BuenGenio joined	09:06
	→ Nijikokun joined	09:06
	← Vivekananda_y510 left	09:06
	← DrSkyLizard left	09:07
	→ joo-_ joined	09:07
	→ a_l_e joined	09:08
	← archdori left	09:08
	← chessguy left	09:08
	← GT4066 left	09:10
	← johnny2600 left	09:10
	← h0bbit left	09:12
	→ johnny2600 joined	09:13
	→ PinkSpecs joined	09:13
	← dharrigan left	09:14
	→ dharrigan joined	09:15
	← BuenGenio left	09:15
	← iiiinzg left	09:17
	← Nijikokun left	09:17
	← FabTG_ left	09:17
	gitinfo set mode: +v	09:17
tomseek	nice web based git GUI : https://github.com/alberthier/git-webui	09:17
	→ martinklepsch joined	09:18
	→ Nijikokun joined	09:18
	← Nijikokun left	09:18
	← johnny2600 left	09:18
	→ FabTG_ joined	09:19
	→ Nijikokun joined	09:19
	→ mnavratil joined	09:19
	→ vtunka joined	09:19
	← PinkSpecs left	09:20
bremner	sorry, you lost me at wget \| bash	09:20
	← TititaTitutu left	09:20
	← mennea left	09:20
bremner	even before shellshock ;). wget \| some_other_shell is not better.	09:21
	→ mennea joined	09:21
	→ TititaTitutu joined	09:21
	→ PinkSpecs joined	09:23
	← earthdog left	09:24
canton7	I don't like what that install script does, either :P	09:25
majoh	"Copyright 2015" it's from the future!	09:26
canton7	:O	09:26
	← UmbraMalison left	09:26
chovy	heh	09:26
	i just jumped on someone today for installing a process on my machine w/o telling me.	09:26
	boots up and starts this nsa process.	09:27
	→ FreezingCold joined	09:27
	→ UmbraMalison joined	09:27
	← hebz0rl left	09:28
	→ hebz0rl joined	09:29
	← Dudi left	09:29
	→ Marcus___ joined	09:30
	→ harish joined	09:32
pasky	so what's the difference between wget \| bash and downloading the software, compiling it if applicable and running it?	09:32
	either way you need to trust the author	09:33
	← hexagoxel left	09:33
	← Marcus left	09:33
	→ PinkSpecs_ joined	09:33
	→ palcu joined	09:33
	← PinkSpecs left	09:34
	PinkSpecs_ → PinkSpecs	09:34
chovy	you can't see the code	09:34
	→ ockham joined	09:34
chovy	especially with shadowbox bug	09:35
	→ jitendravyas joined	09:35
	→ Gabri joined	09:35
	→ stamina joined	09:36
	→ mueslo joined	09:38
	← ki0 left	09:38
	→ ki0 joined	09:38
	← jonmorehouse left	09:40
	robustus → robustus\|Off	09:41
	→ ngw joined	09:43
	→ martinkl_ joined	09:43
_ikke_	shadowbox bug?	09:44
moritz	also, with a pipe, wget might lose the connection	09:44
	and bash executes an incomplete script	09:44
	like rm -rf /home/ instead of rm -rf /home/somehting/much/more/specific	09:44
chovy	oh man, that would suck	09:45
	so it pipes it before it receives a complete response?	09:45
	is it like a stream?	09:45
moritz	yes	09:45
	→ lindenle joined	09:45
	→ amcsi_work_ joined	09:45
chovy	is it just wget? or anything \| anything	09:46
bremner	it's a feature.	09:46
	← martinklepsch left	09:46
	→ amcsi_work__ joined	09:47
_ikke_	There is a buffer, but this buffer is limited in size. But I guess if the process dies, the buffer still gets sent to the proces	09:47
	→ Advocation joined	09:47
_ikke_	other process*	09:47
bremner	heh. nice typo.	09:47
	→ robarelli joined	09:48
	→ uffiole joined	09:48
	← teran left	09:49
	← amcsi_work left	09:50
	→ nettoweb joined	09:50
	← booboy left	09:50
	← lindenle left	09:50
	← mennea left	09:50
	← amcsi_work_ left	09:51
	→ silverfix joined	09:51
	→ mennea joined	09:51
silverfix	hello guys	09:51
	but why git pull doesn't delete a file from my filesystem if it's deleted from repo ?	09:51
canton7	!repro	09:51
gitinfo	Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will raise the odds of getting your problem fixed from about 30% to about 90%.	09:51
	→ hexagoxel joined	09:52
	→ samtuke joined	09:52
	← cbr_ left	09:52
	← robarelli left	09:52
	← ki0 left	09:52
	→ cbr_ joined	09:53
	← Gizburdt left	09:53
	→ Gizburdt joined	09:53
	← Gizburdt left	09:54
	← amcsi_work__ left	09:54
	← rchavik left	09:54
	→ ki0 joined	09:56
	← harish left	09:56
	← Malsasa left	09:57
	← FilipNortic left	09:58
	→ moritzschaefer joined	09:58
	→ Blaguvest joined	10:00
	← simesy left	10:00
	→ beautifulmind joined	10:01
	← liamkeily left	10:01
	robustus\|Off → robustus	10:03
	→ martinklepsch joined	10:03
	→ endiruna joined	10:03
	← endiruna left	10:03
	← brewmaster left	10:03
	→ endiruna joined	10:04
	→ Gizburdt joined	10:06
	→ interrobangd joined	10:06
	→ Malsasa joined	10:06
	← martinkl_ left	10:07
	← Peuc left	10:07
	← daito left	10:08
	← israelpattison left	10:08
	→ Peuc joined	10:09
	→ israelpattison joined	10:09
	→ daito joined	10:09
	← bug_sniper left	10:09
	→ rchavik joined	10:10
	← kopparam left	10:10
	← hebz0rl left	10:11
	→ hebz0rl joined	10:12
	← Gizburdt left	10:13
	← daito left	10:13
	← ItSANgo left	10:18
	→ kopparam joined	10:18
	→ jck joined	10:18
	← Advocation left	10:19
	← kopparam left	10:20
	← mennea left	10:20
	← tokik left	10:21
	→ kopparam joined	10:21
	← freimatz left	10:21
	→ mennea joined	10:21
	jhass\|off → jhass	10:22
	→ liamkeily joined	10:22
	→ listochkin joined	10:22
	← nour left	10:23
	← TititaTitutu left	10:23
	→ g4r37h joined	10:23
	← samtuke left	10:23
	→ nour joined	10:24
	← Malsasa left	10:24
	→ Dudi joined	10:24
	← mennea left	10:24
	← lukeholder left	10:25
	→ sdousley joined	10:25
	gitinfo set mode: +v	10:26
sdousley	Hey all, would there be any expected issues with upgrading a single client to git 1.8 that will only do a pull if there's other clients that will be pushing git 1.7 versions?	10:26
	→ Malsasa joined	10:27
	→ paul424 joined	10:27
	→ Wiz_KeeD joined	10:27
	← Guest21790 left	10:27
canton7	git's extremely good at compatibility in terms of the network format, and repo forms	10:27
	→ olspookishmagus joined	10:27
canton7	so no problem at all with 1.7 and 1.8 interacting	10:28
	← shuaib left	10:28
sdousley	canton7: cool, I've just checked anyway, and our local git client is actually 1.8.3 anyway, rather than 1.7.x	10:28
	olspookishmagus → Guest64673	10:28
	← Guest64673 left	10:28
canton7	s/repo forms/repo formats	10:28
	← Xiti` left	10:28
	← uffiole left	10:28
	← k_sze[work] left	10:28
	→ TititaTitutu joined	10:29
	→ olspookishmagus joined	10:29
	→ EminenceHC joined	10:30
	← sdousley left	10:31
	→ TomyWork joined	10:31
	→ Xiti joined	10:32
	→ BuenGenio joined	10:33
	→ Advocation joined	10:33
	→ brewmaster joined	10:33
	← Hello71 left	10:35
	← EminenceHC left	10:35
	→ Quevin joined	10:36
	← rchavik left	10:36
	→ Marcus joined	10:36
	→ samtuke joined	10:37
	← Nijikokun left	10:37
	→ Hello71 joined	10:37
	← cvanball left	10:37
TomyWork	can "git cherry-pick --strategy=ours" be used for grafting?	10:37
	← Marcus___ left	10:37
olspookishmagus	please, pardon my part-join flood	10:37
	→ Malsasa_ joined	10:37
	← olspookishmagus left	10:37
	← hauron left	10:38
	← silverfix left	10:38
	→ Nijikokun joined	10:38
	← Malsasa left	10:38
TomyWork	basically i have a bunch of commits on a branch and i want to keep the trees but change the parents	10:38
	trees and messages*	10:39
	← CussBot left	10:39
	→ CussBot joined	10:40
	← Quevin left	10:40
	→ rchavik joined	10:40
	← g4r37h left	10:40
	← prettyd left	10:40
	← aarcane left	10:40
	→ carandraug joined	10:41
	→ Macaveli joined	10:42
	→ FilipNortic joined	10:43
	← Warrior-kk left	10:43
	→ cntrl joined	10:44
	← cbr_ left	10:46
	→ Silex joined	10:46
	← endiruna left	10:46
	→ Gizburdt joined	10:46
	← alorence left	10:46
	→ cbr_ joined	10:47
	→ alorence joined	10:47
	→ robarelli joined	10:48
	→ jds joined	10:48
	→ endiruna joined	10:49
	→ mennea joined	10:51
	← mennea left	10:51
	← awkwardusername left	10:52
	→ mennea joined	10:52
	→ awkwardusername joined	10:52
	Malsasa_ → Malsasa	10:53
	← robarelli left	10:53
	← jdmf left	10:54
	← scarcry left	10:54
	→ scarcry joined	10:54
	← PinkSpecs left	10:54
	robustus → robustus\|Off	10:55
	← samtuke left	10:56
	→ samtuke joined	10:56
	← kyb3r_ left	10:57
	→ jottr_ joined	10:58
	← aidalgol left	10:58
	← Suchit left	10:59
	→ Suchit joined	10:59
	→ teran joined	11:00
	← jottr left	11:01
	← samtuke left	11:02
	→ chessguy joined	11:02
	→ irqq joined	11:03
	→ g4r37h joined	11:04
	→ amikiri joined	11:06
	← Advocation left	11:07
	→ kotk joined	11:08
	→ Mitchbones joined	11:08
	← chessguy left	11:09
	→ chessguy joined	11:09
	→ Advocation joined	11:13
	→ mieko joined	11:13
	← Advocation left	11:15
	← GarethAdams left	11:15
osse	TomyWork: I think it might be easier to use the actual grafting mechanism	11:16
TomyWork	osse it's more to type though :)	11:17
	and it appears to work nicely for my single-file repo	11:17
	→ govg joined	11:17
TomyWork	git cherry-pick --strategy=recursive -Xours	11:17
	err theirs	11:17
osse	that won't replicate the behaviour	11:18
	← TheMadMechanic left	11:18
	← mlnppy left	11:21
	→ harish joined	11:25
	→ afhkga joined	11:25
	→ Gamecubic joined	11:26
	→ looper joined	11:27
	→ Behi_ joined	11:28
	← Behi left	11:29
	← Guest73625 left	11:29
	→ fission6 joined	11:29
	→ autochthon joined	11:29
	→ Advocation joined	11:29
	→ i_ron joined	11:31
	→ GarethAdams joined	11:32
	← mennea left	11:32
	→ mennea joined	11:33
	→ samtuke joined	11:33
	→ ItSANgo joined	11:33
	→ EminenceHC joined	11:34
	← TititaTitutu left	11:34
	→ stormwild joined	11:35
	← Kartagis left	11:36
	→ intellix joined	11:38
TomyWork	i'm looking for a permanent graft	11:38
	→ Kartagis joined	11:38
	← lacrymology left	11:39
	← paulweb515 left	11:39
	← EminenceHC left	11:39
	← mennea left	11:39
_ikke_	it can be made permanent	11:40
	with filter-branch	11:40
	← g4r37h left	11:40
	→ bAnt_ joined	11:40
	→ PinkSpecs joined	11:41
	← zapb_ left	11:42
esc	anyone have details on how the bash bug may affect git and related software	11:42
	e.g. cgit or gitolite?	11:42
TomyWork	_ikke_ yeah i was lookign for a solution with less typing, for quick and dirty grafting :)	11:42
canton7	esc, it comes down to how ssh is affected	11:43
	→ xolubi joined	11:43
osse	esc: server-side git doesn't run any scripts afaik. the last one (git-repack) was converted to C recently. Hooks are another story :P	11:43
esc	okay, I was wondering if it may affect gitolite	11:44
	← raboof left	11:45
esc	but I couldn't find any ForceCommand directive in the sshd config	11:45
osse	TERM='() { :;}; echo vulnerable' ssh somewhere	11:46
	← joo-_ left	11:46
	→ lindenle joined	11:47
sitaram	esc: check on the gitolite mailing list archives at groups.google.com	11:47
	it does affect gitolite and such software	11:47
osse	gitolite can be vulnerable if it uses `foo` or system("foo")	11:48
esc	osse: i checked with ssh, but got no 'vulnerable'	11:48
sitaram	osse: any ssh based "restricted" environment is vulnerable if the user's shell is bash. Gitolite doesn't even gain control before the shit happens	11:48
	→ tincan joined	11:48
	→ bukagija joined	11:49
osse	sitaram: hmm, I was hoping SSH would execute gitolite directly without a shell between them	11:49
txdv	basically all the honey pots env are vunerable to exploits	11:49
	← irqq left	11:49
txdv	which is funny	11:49
	→ DARSCODE joined	11:49
txdv	because they get fucked for trying to fuck over hackers	11:49
esc	the 'git' users shell on a system that I am looking at is /bin/bash	11:50
	→ irqq joined	11:50
	→ robarelli joined	11:50
	← encod3 left	11:51
	← kopparam left	11:51
	← ItSANgo left	11:51
sitaram	osse, esc: my current solution is http://paste.fedoraproject.org/136710/11732314	11:52
	→ kopparam joined	11:52
	→ Marcus___ joined	11:52
sitaram	osse: it uses $SHELL -c	11:52
	← lindenle left	11:52
	← cntrl left	11:52
	← BuenGenio left	11:52
	→ Marcu____ joined	11:53
	→ zburns joined	11:53
	← Advocation left	11:53
sitaram	esc, osse: note that solution mitigates both the problems (the one that bash already has a fix for and the one they're still working on)	11:53
	→ lacrymology joined	11:53
	← Marcus left	11:53
	→ TititaTitutu joined	11:54
	← robarelli left	11:55
esc	oss: when I try the thing you suggest above, I only get: PTY allocation request failed on channel 0	11:55
	→ afhammad joined	11:56
	← Marcus___ left	11:56
	← kopparam left	11:57
esc	i get the same thing when I try to ssh to github.com	11:57
	← Mitchbones left	11:58
	→ lsiv568 joined	11:58
	← fstd left	12:00
	→ fstd joined	12:00
	→ joo-_ joined	12:01
	→ Gizburdt_ joined	12:03
	← nettoweb left	12:03
	← TititaTitutu left	12:03
	← fission6 left	12:04
	→ listochk_ joined	12:04
	← Gizburdt left	12:04
	→ darkbasic_ joined	12:04
	← Dudi left	12:05
	← darkbasic left	12:05
	→ plitzenberger joined	12:05
	← bukagija left	12:05
	→ lukeholder joined	12:05
	← lukeholder left	12:05
	→ toothrot joined	12:05
	← kriks left	12:05
	→ philipd joined	12:06
	← philipd left	12:06
	→ lukeholder joined	12:06
	← lukeholder left	12:06
	→ kopparam joined	12:06
	→ lukeholder joined	12:07
	→ m0ltar joined	12:07
	← lukeholder left	12:07
	← Gabri left	12:07
	→ lukeholder joined	12:08
esc	i couldn't get it to work over ssh, so I made dash the login shell of the git user	12:08
	← jatt left	12:08
esc	as a precautionary measure	12:08
	← listochkin left	12:08
esc	back later	12:08
	← lukeholder left	12:08
	→ Advocation joined	12:08
	→ kopparam_ joined	12:09
	→ lukeholder joined	12:09
	→ encod3 joined	12:09
	→ kriks joined	12:10
	← kopparam left	12:11
	robustus\|Off → robustus	12:12
	← autochthon left	12:12
	→ Gabri joined	12:13
	→ nettoweb joined	12:13
	← Suchit left	12:14
	← kopparam_ left	12:14
	→ Suchit joined	12:15
	← zoso left	12:16
	→ infernix joined	12:16
	← samtuke left	12:18
	→ sohail joined	12:19
	← lacrymology left	12:20
	→ cannonball joined	12:20
	← amikiri left	12:20
	→ JDHawke joined	12:21
	← King_Hual left	12:21
	→ tristanp joined	12:21
	→ King_Hual joined	12:22
	jottr_ → jottr	12:22
	→ atamanroman joined	12:23
	← Skapadapaduu left	12:24
	← plitzenberger left	12:25
	→ PsciCOdeliXHAt joined	12:25
	→ shizzle joined	12:25
	← t4nk598 left	12:26
	← Xiti left	12:26
	→ michelangelo joined	12:27
	← seanmerron left	12:28
	← listochk_ left	12:29
	→ listochkin joined	12:30
	← donmichelangelo left	12:30
	← PinkSpecs left	12:32
	← mechanicalduck left	12:32
	gccostab_ → gccostabr	12:33
	→ paulweb515 joined	12:33
	→ ItSANgo joined	12:34
	← jitendravyas left	12:34
	← listochkin left	12:34
	→ samtuke joined	12:34
	← nettoweb left	12:35
	→ Talisman joined	12:35
	← samtuke left	12:36
	→ mechanicalduck joined	12:36
	gitinfo set mode: +v	12:36
	→ samtuke joined	12:37
	← vgarg left	12:37
	← samtuke left	12:38
	→ livingstn joined	12:38
	→ kopparam joined	12:38
	→ samtuke joined	12:39
	→ EminenceHC joined	12:39
	← paulweb515 left	12:40
	← Kartagis left	12:40
	← LeMike left	12:40
	→ PinkSpecs joined	12:40
	← xolubi left	12:40
	→ Kartagis joined	12:40
	→ daedeloth joined	12:41
	→ fission6 joined	12:42
	← cagedwisdom left	12:42
	← kopparam left	12:43
	← teran left	12:43
	← EminenceHC left	12:44
	← fission6 left	12:44
	→ Gizburdt joined	12:44
	← jenni_naiaretti left	12:46
	→ Droolio joined	12:46
	→ nimdAsyS joined	12:46
	← Gizburdt_ left	12:47
knobo	I did "git add file", then realized I should not have done that. How do I un add it. I want to have it in a separate commit	12:48
	← mlechner left	12:48
knobo	I though "git rm --cached file" would do it	12:48
	← PinkSpecs left	12:49
knobo	but now "git status" says "changes to be committed: \n deleted: file"	12:49
	That is not so good...	12:49
	← DolphinDream left	12:50
	← madduck left	12:50
knobo	reset fixed it...	12:51
	→ robarelli joined	12:51
	← muhaha03__ left	12:51
_ikke_	yup	12:51
	git status would show you what to do	12:51
	→ BuenGenio joined	12:52
	→ dangerousdave joined	12:52
	→ jenni_naiaretti joined	12:52
	→ paulweb515 joined	12:53
	← Advocation left	12:53
	→ a_le joined	12:54
knobo	Nice to know what _reset_ actually does.	12:54
	→ teran joined	12:55
	→ mixandgo joined	12:55
_ikke_	git reset (without any parameters) will reset the index to the state of HEAD	12:55
	→ teran_ joined	12:55
_ikke_	basically unstaging everything	12:55
	← dangerousdave left	12:56
	← martinklepsch left	12:56
	← robarelli left	12:56
	→ dangerousdave joined	12:56
	→ hide joined	12:57
	← hide left	12:57
	→ danemacmillan joined	12:57
knobo	And HEAD, is that the state of my current non-committed changes?	12:57
	aha.. no..	12:57
	the index to HEAD... not my files.	12:57
	← ome left	12:57
	→ nioncode joined	12:57
	← jimmyy left	12:58
	← toothrot left	12:58
knobo	one day I'll be as fluent in git as I once was in rcs ;)	12:58
	→ hide joined	12:58
	← hide left	12:58
_ikke_	!reset	12:58
gitinfo	A good resource explaining git-reset is http://git-scm.com/2011/07/11/reset.html	12:58
_ikke_	read that	12:58
	→ martinklepsch joined	12:59
	← dangerousdave left	12:59
	→ hide joined	12:59
	← hide left	12:59
	← teran left	12:59
knobo	three roles :) I like that kind of clear explenations :)	12:59
	→ hide joined	12:59
	← hide left	12:59
	→ roflik joined	12:59
_ikke_	That's the post that made me actually understand it all	13:00
	→ hide joined	13:00
	← hide left	13:00
	→ zacg joined	13:00
	← rob_w left	13:00
	→ Sebtoast joined	13:01
	→ fission6 joined	13:01
	→ styx_ joined	13:01
	← jenni_naiaretti left	13:01
	← darkbasic_ left	13:02
	← Peuc left	13:02
	→ hide joined	13:02
	← hide left	13:02
knobo	Thaks for the help	13:02
	→ darkbasic joined	13:02
	→ hide joined	13:03
	← hide left	13:03
	← martinklepsch left	13:03
	→ hide joined	13:04
_ikke_	You'r welcome	13:04
	→ Peuc joined	13:04
albel727	hey. what's the best way to remember current tree state, checkout something else, and then return back AUTOMATICALLY? i.e. some combination of git stash; /* remember current branch or SHA for detached head */; ... checkout something else ... ; git checkout $remembered_branch_or_sha; git stash pop	13:05
	I can't seem to find an elegant solution for /* remember current branch or SHA for detached head */	13:05
_ikke_	There is nothing in git really	13:05
	→ Imdsm joined	13:06
	← hexagoxel left	13:06
	← TomyWork left	13:07
_ikke_	albel727: You could try to use the reflog	13:08
	← afhammad left	13:08
	→ afhammad joined	13:08
albel727	but git checkout HEAD@{1} would leave me in a detached head state, even if I were on a branch previously.	13:09
	→ martinklepsch joined	13:10
	→ ErKa joined	13:10
	← jerius left	13:10
	→ kirin` joined	13:11
	← Imdsm left	13:11
albel727	guess I can just remember old_head=$(cat .git/HEAD), and then cat $old_head > .git/HEAD	13:11
	but that's ugly	13:11
	← tanath left	13:12
	← beautifulmind left	13:12
	→ moparsthbest joined	13:12
	← brandonw left	13:12
	→ tanath joined	13:12
	→ madduck joined	13:12
	→ jenni_naiaretti joined	13:12
	→ Dougie187 joined	13:13
	→ brandonw joined	13:13
	← afhammad left	13:13
	← jenni_naiaretti left	13:13
	→ listochkin joined	13:14
	← lsiv568 left	13:14
	← moparisthebest left	13:15
	← tomseek left	13:15
	→ jenni_naiaretti joined	13:15
	← listochkin left	13:16
	→ afhammad joined	13:16
	← glosoli left	13:17
	→ it0a joined	13:17
	→ nettoweb joined	13:17
	← nettoweb left	13:17
	→ nettoweb joined	13:18
	← Gizburdt left	13:19
	← Peuc left	13:20
	← mnavratil left	13:21
	→ monbro joined	13:22
	← nikita left	13:22
	→ Peuc joined	13:22
	→ listochkin joined	13:23
	→ philipd joined	13:23
	← philipd left	13:23
	← Macaveli left	13:23
	→ wdkevin joined	13:24
	→ mennea joined	13:24
	→ nikita joined	13:24
wdkevin	I'm using github and I have merge conflicts when trying to merge a branch into Master. Are there any Windows dekstop tools that will let me handle these conflicts (its very large branch) and do the merge on GitHub for me?	13:24
osse	albel727: to get back, you can git checkout branchname	13:24
	or maybe I'm misunderstanding something	13:25
	→ TititaTitutu joined	13:25
	← samtuke left	13:25
Dougie187	wdkevin: if there are merge conflicts, your best bet is to handle the merge on a command line by hand.	13:26
	there are mergetools that can help	13:26
	like p4merge (I think that's the name)	13:26
wdkevin	hmm	13:26
Dougie187	But they won't do the merge on github for you	13:26
wdkevin	i suppose. i was hoping for a gui to make it a little easier	13:26
	yea	13:26
Dougie187	because there are conflicts, and github doesn't know how to do it.	13:26
wdkevin	i have to mwerge on my mahcine and then push	13:26
Dougie187	yeah	13:26
wdkevin	i was just hoping there was an easier way	13:27
	← stamina left	13:27
osse	albel727: old_head=$(git rev-parse --symbolic-full-name HEAD); ...; git checkout $old_head	13:27
wdkevin	my branch is massive	13:27
Dougie187	http://www.perforce.com/product/components/perforce-visual-merge-and-diff-tools	13:27
wdkevin	thank you Dougie187	13:27
	→ mizu_no_oto joined	13:27
Dougie187	There are other ones.	13:27
	but that's probably one of the most gui friendly merge tools around	13:27
	→ msmith_ joined	13:27
	→ dusted joined	13:28
	→ dmarkham joined	13:28
	→ jerius joined	13:29
	→ hexagoxel joined	13:29
	→ lsiv568 joined	13:29
albel727	osse: not only would leave us in detached head state (as a result of checkouting by full-ref and not branch name), but that would break if you originally were on detached head, b/c git rev-parse --symbolic-full-name returns on detached head just... "HEAD"	13:29
	→ BSaboia joined	13:29
albel727	*not only that	13:29
	→ zumba_addict joined	13:29
	→ jatt joined	13:30
	← jatt left	13:30
	→ jatt joined	13:30
albel727	now I'm working on solution based around git symbolic-ref --short HEAD and falling back to git rev-parse HEAD if the former doesn't succeed	13:30
	← liamkeily left	13:30
albel727	so, my solution is old_head=$(git symbolic-ref --quiet --short HEAD \|\| git rev-parse HEAD)	13:31
	← irqq left	13:32
wdkevin	Dougie187, these GUI tools need to be ran on the same server as the repo though, right?	13:32
osse	albel727: old_head=$(git rev-parse --symbolic-full-name HEAD); ...; git checkout ${old_head##*/}	13:32
	=)	13:32
	← jatt left	13:32
Dougie187	wdkevin: no, they have to be run locally.	13:32
wdkevin	so if i work on a windows desktop but have my own VM for web server, it needs to run on that VM?	13:33
Dougie187	Regardless, you have to do the merge locally and push.	13:33
	→ Advocation joined	13:33
	→ Gizburdt joined	13:33
	→ dccc joined	13:33
	→ mnavratil joined	13:34
	→ StarManta joined	13:34
	→ dangerousdave joined	13:34
	→ Xiti joined	13:34
albel727	osse: "git rev-parse --symbolic-full-name HEAD" still fails if head is detached.	13:34
	→ zumba_ad_ joined	13:34
albel727	it returns just "HEAD" instead of a SHA	13:34
	← TititaTitutu left	13:35
	← listochkin left	13:35
albel727	and naturally, once you checked out some other commit git checkout HEAD ain't gonna return you back to where you were.	13:35
	← zumba_addict left	13:35
osse	albel727: well, if you're already detached, then you can't attach without an explicit branch name	13:35
	my latest will leave you where you began.	13:36
albel727	I don't want to attach if I were detached. I just want to return the detached head to where it was.	13:36
osse	mine does that	13:36
	→ listochkin joined	13:37
albel727	nope it doesn't. /* on detached head with $sha1 / ; git checkout $sha2 ; ... ; git checkout HEAD ; / still on detached head with $sha2 */	13:37
	← jenni_naiaretti left	13:37
osse	ho i see what you mean now	13:38
	→ tesaf joined	13:39
	← dangerousdave left	13:39
	→ Peuc2 joined	13:39
	→ dangerousdave joined	13:40
osse	albel727: old_head=$(git rev-parse --symbolic-full-name HEAD); if [[ $old_head = HEAD ]]; then old_head=$(git rev-parse HEAD); fi	13:40
	← cbr_ left	13:40
	→ cbr_ joined	13:41
	← bAnt_ left	13:41
	← ockham left	13:41
albel727	mine is shorter, and yours still needs checkout ${old_head##*/} :P	13:41
	← Pyrogerg left	13:41
	← Segfault_ left	13:41
osse	ahh, didn't notice that one	13:41
	yeah yours is better	13:41
albel727	anyway, thanks for trying to help	13:42
	← Peuc left	13:42
osse	i always forget symbolif-ref exists :(	13:43
	albel727: waaait, a minute. I think you can do simply 'git checkout -' and it will do The Right Thing	13:44
	← Peuc2 left	13:44
osse	but not 100% sure	13:44
	→ HanClinto_ joined	13:44
wdkevin	Dougie187, This Perforce is asking for a server and it has "perforce:1666" entered. does that mean i need to install something on the linux server for this perforce client to connect to?	13:45
	→ jonr22 joined	13:45
	→ Peuc joined	13:45
	← Gizburdt left	13:45
Dougie187	wdkevin: I've never used the perforce merge tool. I just know people who want a gui like it. I live in the cli :P...	13:45
	← zumba_ad_ left	13:46
wdkevin	haha, ok	13:46
	im not opposed to the CLI, i just thought a GUI would be easier in this case	13:46
	everything else i do is CLI	13:46
	→ Gizburdt joined	13:46
	← dangerousdave left	13:46
	→ iamjarvo joined	13:46
	← iamjarvo left	13:46
albel727	interesting. it seems to work, but doesn't seem to be documented.	13:46
	→ ockham joined	13:47
osse	albel727: it's in man git-checkout udner <branch>	13:47
gitinfo	albel727: the git-checkout manpage is available at http://jk.gs/git-checkout.html	13:47
	→ iamjarvo joined	13:47
	→ mike_af joined	13:47
	→ samtuke joined	13:47
	← HanClinto left	13:47
	← Gizburdt left	13:48
	→ Gizburdt joined	13:48
Dougie187	wdkevin: the cli isn't that bad.	13:48
albel727	I don't see it. all I see there is >You could omit <branch>, in which case the command degenerates to "check out the current branch",	13:48
wdkevin	Dougie187, yea i dont mind it normally	13:49
	→ lindenle joined	13:49
wdkevin	ive never fixed a merge conflict though :-X	13:49
albel727	but nothing there seems to describe the behaviour like cd -	13:49
	→ jenni_naiaretti joined	13:49
	→ zumba_addict joined	13:50
albel727	and git checkout - seems to behave exactly like cd - for directories. i.e. it flips you between two dirs indefinitely.	13:50
	→ jitendravyas joined	13:51
	→ Ankhers joined	13:51
Dougie187	wdkevin: Have you used svn to fix merge conflicts before?	13:51
	wdkevin: if so, it's almost the same.	13:51
	← _Vi left	13:51
Dougie187	although you can use other tools (like p4merge) to help deal with the conflicts.	13:51
wdkevin	no i havent	13:52
osse	albel727: As a special case, the "@{-N}" syntax for the N-th last branch/commit checks out branches (instead of detaching). You mayalso specify - which is synonymous with "@{-1}".	13:52
	← mennea left	13:52
	→ liamkeily joined	13:53
	← lindenle left	13:53
	→ robarelli joined	13:53
	→ mennea joined	13:53
	→ marscher joined	13:54
	← martinklepsch left	13:55
	→ johtso joined	13:56
	← nettoweb left	13:56
	→ kukks joined	13:56
	← kukks left	13:56
	→ kukks joined	13:56
	← Malsasa left	13:56
	→ zapb_ joined	13:56
	→ AaronMT joined	13:57
	← Gizburdt left	13:57
albel727	whoa whoa, I completely missed @{-N} syntax. on the surface it looks just like @{N}, but it looks like it can check out symbolic refs too.	13:57
	← samtuke left	13:57
albel727	s/check out/refer to/	13:58
	← kukks left	13:58
	→ zumba_ad_ joined	13:58
	← robarelli left	13:58
	→ Gizburdt joined	13:58
	→ MutSbeta joined	13:58
	← mennea left	13:58
	→ kukks joined	13:59
	→ zerofun joined	13:59
	← zumba_addict left	13:59
albel727	learn something new every day	13:59
	osse++	13:59
j416	albel727: what is the underlying problem you're solving?	13:59
	→ modcure joined	14:00
	← tristanp left	14:00
	← BuenGenio left	14:00
	← gauke left	14:01
	← paul424 left	14:01
	→ kpease joined	14:01
	← wagle left	14:01
	← Ankhers left	14:02
	← tgies left	14:02
	← Gizburdt left	14:02
	→ wagle joined	14:02
albel727	I want a helper command that would generate for me some stuff from the state of the tree in the past. a one that I can run and then continue working, obviously.	14:02
	← zerofun left	14:02
j416	hmm	14:02
	→ ki0_ joined	14:02
albel727	well, I'm almost there anyway.	14:02
	← ki0 left	14:02
j416	alright	14:02
	you _could_ check that out into a separate worktree (--work-tree), do what you need there, then throw it away, maybe	14:03
	→ Neozonz joined	14:03
j416	not sure if that helps.	14:04
	← zumba_ad_ left	14:04
	← marscher left	14:04
	← skylite left	14:04
	→ eburcat joined	14:04
	→ Malsasa joined	14:05
	→ jceb joined	14:05
	← m0ltar left	14:06
	→ tgies joined	14:06
albel727	I'm not sure how would it help. either I'd need to do git checkout to init the new worktree, but then I still have to restore HEAD afterwards. or I'd need to do git read-index git checkout-index dance	14:06
	← noxd left	14:06
	→ Neozonz\|Disc joined	14:06
	→ dvdchr joined	14:07
albel727	and I'm not talking about copying overhead.	14:07
j416	yeah, just thought I'd throw it out there as an option	14:07
	→ PinkSpecs joined	14:07
albel727	if outside tree were really a good option, I'd just git clone --local somewhere	14:08
j416	there's also git-archive fwiw	14:08
	→ ehmatthes joined	14:08
	→ m0ltar joined	14:09
	→ thiago_ joined	14:09
	← thiago_ left	14:09
	→ thiago joined	14:09
	→ mdel joined	14:10
	→ mennea joined	14:10
	→ cure_ joined	14:11
	← Trudko left	14:11
	cure_ → Guest42676	14:11
albel727	s/git read-index/git read-tree/	14:11
	→ zivester joined	14:12
	→ nettoweb joined	14:12
albel727	now if only git stash just had an option to allow producing an empty stash, instead of "check if there's something to stash, and only then do stash/stash pop" dance that is necessary otherwise.	14:12
	→ jdrumheller joined	14:13
	← jitendravyas left	14:13
	→ Pyrogerg joined	14:13
	← modcure left	14:14
	→ polyzen joined	14:14
	→ Ankhers joined	14:14
	→ tristanp joined	14:15
	→ bezet joined	14:15
	← seschwar left	14:16
	← monbro left	14:17
	→ FortySix2 joined	14:17
	→ _Vi joined	14:19
	→ SumDude joined	14:19
	→ hmsimha_ joined	14:19
j416	albel727: you _could_ create a commit manually instead of doing stash..	14:19
	→ samtuke joined	14:19
	→ zumba_addict joined	14:20
	← WormDrink left	14:21
	→ Vasastan joined	14:21
	→ Gizburdt joined	14:22
	← jonr22 left	14:22
albel727	that would require two commits, one for staging area and one for worktree changes. and a dance with git commit while trying to avoid corner cases like committing untracked files etc, with the end result of... emulating git stash just with the empty commit option.	14:22
	← zivester left	14:23
	← mennea left	14:23
	→ tang^ joined	14:23
albel727	it's easier to check if there's anything to stash with git diff --quiet --exit-code HEAD	14:23
	→ mennea joined	14:23
	→ xolubi joined	14:23
	robustus → robustus\|Off	14:24
	← Gabri left	14:24
	← diegoviola left	14:25
	← Suchit left	14:26
	→ Suchit joined	14:27
	→ milkohol joined	14:27
	→ EminenceHC joined	14:28
	→ pheaver joined	14:28
	← xolubi left	14:29
	→ gargola joined	14:31
	→ d10n-work joined	14:31
	← Suchit left	14:32
d10n-work	Is there a nice tool to automatically git fetch or git remote update specified repositories at an interval?	14:32
	← eletuchy left	14:32
	← milkohol left	14:33
_ikke_	cron	14:33
	→ Macaveli joined	14:33
	← FortySix2 left	14:35
	→ jonr22 joined	14:36
	← jonr22 left	14:36
	← lsiv568 left	14:36
	→ diegoviola joined	14:37
	← m0ltar left	14:37
	← samtuke left	14:37
	→ Quevin joined	14:37
	← nettoweb left	14:38
	→ petersr joined	14:38
	→ milkohol joined	14:38
	→ Sivil joined	14:38
	→ starkhalo joined	14:38
	→ dreiss joined	14:39
	→ glosoli joined	14:39
	← pheaver left	14:40
	→ parcs joined	14:40
parcs	hello	14:40
	→ xolubi joined	14:40
	← hmsimha_ left	14:41
skelterjohn	is there a nice place to get older releases of git? I'm looking at https://www.kernel.org/pub/software/scm/git/ but there is a gap between 0.7 and 1.8.2. i specifically want 1.7.1 :)	14:41
	→ kevwil joined	14:41
	← Quevin left	14:42
	→ Nizumzen joined	14:42
	→ jiggerypokery joined	14:42
_ikke_	Do you want source releases?	14:42
parcs	when i clone a repository and then do a fetch (which updated origin/master), "git show origin/master@{1}" fails with "fatal: Log for 'origin/master' only has 1 entries." why is that?	14:42
	← a_le left	14:43
StarManta	is there any way to see how much space a repository is taking up on my drive?	14:43
_ikke_	StarManta: windows or linux/	14:43
	?	14:43
StarManta	os x	14:43
	using sourcetree	14:43
parcs	shouldn't the reflog have more than 1 entry? the first entry would correspond to the initial clone, and the 2nd to the subsequent fetch	14:43
_ikke_	du -sch should work	14:43
	← atamanroman left	14:43
	→ lsiv568 joined	14:45
	← milkohol left	14:46
StarManta	i guess i should rephrase the question. any way to tell _where_ a repository is on my hard drive?	14:47
skelterjohn	_ikke_: source release is fine, yes	14:47
StarManta	it's all the sort of abstracted away and hidden somewhere	14:47
	← acolson left	14:47
tang^	StarManta: whereever you checked it out to	14:47
skelterjohn	_ikke_: does the git git repo have nice takes? i guess i can just go check	14:47
StarManta	not the working versino	14:47
	version	14:47
	i mean the whole repository	14:47
	← Junior` left	14:48
tang^	repo is stored with the working directory	14:48
	→ kkuno joined	14:48
skelterjohn	_ikke_: nice takes = nice tags	14:48
kkuno	hello	14:48
	→ Kicer86 joined	14:48
kkuno	I have often this problem:	14:48
	→ joelrobichaud joined	14:48
	→ acharlieh joined	14:49
kkuno	I make a change in the readme in github and I often don't remember to pull locally	14:49
	then I make a commit locally	14:49
	← dvdchr left	14:49
kkuno	and I can't push anymore	14:49
	← afhammad left	14:49
ToxicFrog	kkuno: why is that a problem? Fetch your changes from github, merge, push	14:49
kkuno	If I try to pull the readme change, I need to merge it	14:49
Sonderblade	why does git config --list list core.autocrlf twice?	14:50
kkuno	mmh ok, I don't like much merges	14:50
parcs	kkuno: you need to rebase your local changes on top of the already pushed changes	14:50
	→ upene joined	14:50
StarManta	er....that doesn't seem to be the case. i don't see any unaccounted-for folders in here and the folder size is not nearly what i would expect if it contained all the past versions of the project	14:50
kkuno	parcs: so git rebase master origin/master?	14:50
tang^	StarManta: using ls -a?	14:50
_ikke_	StarManta: Even in compressed form?	14:50
tang^	StarManta: .git is a hidden folder by default	14:51
parcs	kkuno: that will probably be enough	14:51
_ikke_	StarManta: Git uses delta compression	14:51
	← Pyrogerg left	14:51
parcs	kkuno: actually just do "git rebase origin/master"	14:51
	← afhkga left	14:51
parcs	not really sure what master origin/master does	14:51
	← roelmonnens left	14:51
	→ Pyrogerg joined	14:51
_ikke_	it refers to the latest changes you fetched for master from the origin repostiory	14:51
	repository	14:51
	→ zyla joined	14:52
	← rchavik left	14:52
	← mennea left	14:53
	→ mennea joined	14:53
kkuno	yeah it did the reverse of what I need	14:53
_ikke_	reverse?	14:53
kkuno	mmmh	14:54
StarManta	ok, thanks. it was hidden	14:54
	← Advocation left	14:54
kkuno	now locally I have local change --> update readme	14:54
	→ robarelli joined	14:54
	← sdrfnord1 left	14:54
kkuno	and github won't let me push because I'm violating its timeline	14:54
	← ifdm_ left	14:55
_ikke_	lol	14:55
kkuno	I would need readme --> local change	14:55
parcs	what does that mean???	14:55
	please read http://git-scm.com/book/ch3-6.html	14:55
ToxicFrog	kkuno: git rebase master origin/master rebases origin/master onto master. You wanted the opposite: git checkout master; git rebase origin/master	14:55
	As parcs said earlier.	14:56
	robustus\|Off → robustus	14:56
kkuno	yeah	14:56
	I'm rebasing again to remove the readme commit	14:56
	→ a_le joined	14:56
kkuno	so that I can rebase correctly afterwards	14:56
	lol	14:56
	robustus → robustus\|Off	14:56
	→ WormDrink joined	14:56
	← upene left	14:57
	← kpease left	14:57
	→ kpease joined	14:57
kkuno	no wait	14:58
	it's just a reset	14:58
	I'm too tired	14:58
	→ jmichaelward joined	14:59
	← emrox left	14:59
	← robarelli left	14:59
	← brandonw left	15:00
	← Gizburdt left	15:00
	← thiago left	15:00
	→ LeMike joined	15:00
	← msmith_ left	15:00
	→ cuppscakes joined	15:01
	← Macaveli left	15:01
	← ghostlin_ left	15:01
kkuno	ok, now it seems all ok, but github keeps rejecting my push	15:01
	don't know why it should be a simple fastforward	15:01
	← kpease left	15:01
	→ AnujSharma joined	15:02
	→ kpease joined	15:02
	← GGflags left	15:02
	← AnujSharma left	15:02
	→ logix812 joined	15:02
	→ treehug88 joined	15:03
	← osfe left	15:03
ToxicFrog	kkuno: check the shas. You may have screwed things up with all the rebasing and resulted in divergent history even if the commit contents are the same.	15:03
	→ eletuchy joined	15:03
	→ msmith_ joined	15:03
	← zumba_addict left	15:03
ToxicFrog	kkuno: IMO, your best option here is just to reset master back to origin/master, cherry-pick the commits you wanted, push that, and then rebase properly next time.	15:03
	← listochkin left	15:04
	→ ghostlin_ joined	15:04
	← eletuchy left	15:05
kkuno	yeah solved	15:05
	← Pyrogerg left	15:05
kkuno	actually I was on no branches	15:05
	maybe I screwed up things playing with rebase	15:05
	→ eletuchy joined	15:05
	→ milkohol joined	15:05
	← Silmarilion left	15:06
	→ Suchit joined	15:06
	← alorence left	15:07
	→ killtheliterate joined	15:09
	← eletuchy left	15:10
	← eburcat left	15:11
	→ xSmurf joined	15:11
	← pooh22 left	15:11
	→ Dudi joined	15:11
	→ eburcat joined	15:12
	← AaronMT left	15:12
	→ BuenGenio joined	15:12
	→ AaronMT joined	15:12
	← BuenGenio left	15:12
	→ bukagija joined	15:13
	→ m0ltar joined	15:14
	← Suchit left	15:14
	← Marcu____ left	15:14
	← kukks left	15:15
	→ Suchit joined	15:15
	→ Marcus joined	15:15
	← LeMike left	15:15
	→ fold joined	15:15
	← jnavila_ left	15:15
	← ErKa left	15:16
	→ msankhala joined	15:16
	→ Marcus_ joined	15:16
	→ Frodosagbag joined	15:18
	← lsiv568 left	15:19
	→ thedodd joined	15:19
	← Suchit left	15:19
	→ jnavila_ joined	15:19
	← ThomasLocke left	15:20
	gitinfo set mode: +v	15:20
Frodosagbag	Having trouble excluding files from an archive, I have a .gitattributes file in the root directory of my site (same directory as .git) with the following contents: http://pastebin.com/4Tht0fDp	15:20
	Then I run sudo git archive --worktree-attributes -o dfegit-qa.zip develop	15:20
	← Marcus left	15:21
Frodosagbag	I'm committing before the archive, and I've tried without worktree attributes	15:21
	← interrobangd left	15:21
	← msankhala left	15:22
	→ lsiv568 joined	15:23
	← mennea left	15:23
	← PinkSpecs left	15:23
	→ mennea_ joined	15:23
	← zyla left	15:24
	→ punchagan joined	15:24
	→ ojacobson joined	15:24
	→ cubeport joined	15:25
	→ m0viefreak joined	15:25
	→ zyla joined	15:25
	→ chen__ joined	15:26
	← vtunka left	15:26
	← mizu_no_oto left	15:27
	← kermit left	15:27
	← jiggerypokery left	15:28
	→ listochkin joined	15:28
	← gua_ould left	15:28
	robustus\|Off → robustus	15:28
	← lukeholder left	15:29
	← Marcus_ left	15:29
	← jottr left	15:30
	→ iiiinzg joined	15:31
	→ kermit joined	15:31
	→ jonr22 joined	15:32
	← jonr22 left	15:32
	← a_l_e left	15:32
	← nour left	15:33
	→ Pyrogerg joined	15:34
	← CheckDavid left	15:34
	← avvs left	15:35
	← chen__ left	15:37
	→ cure_ joined	15:37
	→ nour joined	15:37
	cure_ → Guest53211	15:37
	← cbr_ left	15:38
	→ morphix0 joined	15:40
	→ smccarthy joined	15:40
	← Guest42676 left	15:41
	→ Trindaz joined	15:41
	→ atomx joined	15:42
	→ jottr joined	15:43
	← logix812 left	15:44
	→ n-st joined	15:44
	→ lindenle joined	15:44
	→ blubberbop joined	15:44
	→ LeMike joined	15:45
	← p4trix left	15:45
	→ roaet joined	15:45
	← Gonzo89 left	15:45
roaet	hello git masters!	15:45
	← morphix0 left	15:46
Trindaz	how do I remove just one commit from about 5 commits ago?	15:46
	do I have to rebase to do that	15:46
roaet	What is the relationship between merge commits and the commit that was in the merge?	15:46
	if I revert the commit do I revert both? Or just the merge?	15:46
ToxicFrog	Trindaz: depends on what you mean by "remove". See !revert	15:47
gitinfo	Trindaz: That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?	15:47
ToxicFrog	If you want to completely excise it from history, yes, rebase -i is the easiest way to do that.	15:47
	← Pyrogerg left	15:48
Trindaz	THanks ToxicFrog, I want the last option	15:48
	→ Pyrogerg_ joined	15:48
roaet	I believe I need git-revert then	15:48
	but I don't know how to undo multiple commits then keep some in between	15:48
	and I'm confused about the difference between a merge commit and a regular commit	15:48
	← kermit left	15:49
	→ smw joined	15:49
	→ jonalmeida joined	15:49
	← ehmatthes left	15:49
	← cubeport left	15:50
	← stormwild left	15:50
roflik	i want to see all objectids affected by a certain commit. how should i go about this? git rev-list --objects withholds information about moves.	15:51
	→ Malsasa_ joined	15:52
	→ kermit joined	15:52
	← mennea_ left	15:53
	→ mennea joined	15:53
	← Malsasa left	15:53
	→ pheaver joined	15:53
	← nilg left	15:53
	← Nazrhom left	15:54
	← bukagija left	15:56
	→ robarelli joined	15:56
	→ Quevin joined	16:00
	← a_le left	16:00
	← lsiv568 left	16:01
	→ Mso150_u joined	16:01
	→ maslowbeer joined	16:01
	← mikecmpbll left	16:02
	← robarelli left	16:02
	← aswen left	16:02
	→ zumba_addict joined	16:02
	← thevishy left	16:03
	← listochkin left	16:03
	← thevishy_home left	16:03
	← ghostlin_ left	16:04
	← diegoviola left	16:04
	→ nettoweb joined	16:04
	→ diegoviola joined	16:05
	← DARSCODE left	16:06
	← Malsasa_ left	16:07
	robustus → robustus\|Off	16:08
	← Trindaz left	16:08
	← rdbell left	16:08
	→ BuenGenio joined	16:09
	→ rdbell joined	16:09
	← Quevin left	16:09
	← smw left	16:10
	→ Quevin joined	16:10
	→ desposo joined	16:10
	→ smw joined	16:11
	→ akushner__ joined	16:11
	→ burhan joined	16:11
	← mnavratil left	16:12
	← burhan left	16:12
	→ burhan joined	16:12
burhan	I have a repository cloned and then from another computer I cleaned up the branches on the remote - how can I synchronize my computer so that it only has those branches that are in the remote (origin)?	16:12
	→ mnavratil joined	16:12
canton7	burhan, 'git fetch --prune' will delete remote-tracking branches which are no longer on the remote	16:13
burhan	doing git pull just pulls changes from the branches that exist, but it doesn't remove the references to the non-existing branches.	16:13
canton7	git won't automatically delete local branches	16:13
	→ imachuchu joined	16:13
canton7	...but you shouldn't have tons of unused local branches lying around anyway	16:13
	← rdbell left	16:13
	← elasticdog left	16:14
burhan	no I don't, I was developing on two laptops and then one machine was repurposed now its back so I am trying to bring it up to date.	16:14
	← ki0_ left	16:14
canton7	like I say, try 'git fetch --prune'	16:14
	← kiran left	16:14
burhan	I think that does it - need to specify all my remotes as it does it for origin only by default, thanks.	16:15
	→ elasticdog joined	16:15
	→ mikehaas763 joined	16:15
burhan	I guess its upto me to clean the local branches.	16:15
canton7	yeah, though you can script something up pretty quickly	16:15
	→ __TheDodd__ joined	16:16
	← LeMike left	16:16
	→ a_le joined	16:16
burhan	thanks canton7	16:16
	← GluonQuark left	16:16
mikehaas763	at http://git-scm.com/about/staging-area it says that "Now you can just stage the change you need for the current commit and stage the other change for the next commit. " This page implies to me that you can edit a file and then stage just some of the edits. Is what it's actually saying is: (to come in next message)	16:16
	← thedodd left	16:17
mikehaas763	That you can edit a file, stage it.. then edit it again and those changes are not staged?	16:17
	← Nizumzen left	16:17
ToxicFrog	mikehaas763: both, actually.	16:18
	← jenni_naiaretti left	16:18
ToxicFrog	mikehaas763: 'git add' adds the current state of the file, so you can make some edits, stage them, and then make more and those changes are not staged; if you did a commit at that point, only the first batch of changes would be committed.	16:18
	mikehaas763: you can also stage only some of the changes to a file using 'git add -p' or using graphical tools like 'git gui' or 'git cola'.	16:19
	(at a resolution of individual diff hunks or even individual lines)	16:19
	→ Cheaterman1 joined	16:19
	→ fritti_tailchase joined	16:19
mikehaas763	ToxicFrog, ahhh.. didn't know about the -p flag	16:19
	← jargon left	16:20
	→ PinkSpecs joined	16:20
	→ HanClinto__ joined	16:20
	fritti_tailchase → tang^2	16:20
	← __TheDodd__ left	16:20
	← punchagan left	16:21
	→ ErKa joined	16:22
mikehaas763	All very interesting.. I don't know how I ended up on that page but when I read "This allows you to stage only portions of a modified file. Gone are the days of making two logically unrelated modifications to a file before you realized that you forgot to commit one of them" I was like what is this sorcery... not that I'm surprised I've just never attempted to make a partial file commit	16:22
	→ rdbell joined	16:22
ToxicFrog	mikehaas763: I use it all the time, because I have a bad habit of making several commits worth of changes and then needing to disentangle them	16:22
	→ sdrfnord1 joined	16:22
	← mennea left	16:23
ToxicFrog	I find 'add -p' kind of awkward but I use the graphical tools constantly.	16:23
	→ mennea joined	16:23
	→ hebz0rl_ joined	16:24
	← imachuchu left	16:24
	← ciampix left	16:24
	← HanClinto_ left	16:24
	← iiiinzg left	16:24
mikehaas763	ToxicFrog, I'm sure it's not so much of an actual problem but that would kind of worry me that I would be checking in something that unknowingly broke the build, or something similar	16:25
	*When going through all the modified files and checking in only certain parts.	16:25
ToxicFrog	mikehaas763: this is where a benefit of distributed version control comes in -- after making the commits but before pushing them, you can test each commit locally and fix any that broke things.	16:25
	→ pcypher joined	16:26
	→ Nizumzen joined	16:26
mikehaas763	ToxicFrog, I always thought that modifying a commit (even before pushing) was quite dangerous	16:27
	← dreiss left	16:27
	uber → Guest71879	16:27
	← Guest71879 left	16:27
	← a_le left	16:27
	→ uber_ joined	16:27
	← uber_ left	16:27
	← jnavila_ left	16:27
	→ a_le joined	16:28
ToxicFrog	mikehaas763: no, not at all. Modifying it after pushing is a problem because other people may have seen it. But modifying local history is quite common.	16:28
	→ uber joined	16:28
	← uber left	16:28
ToxicFrog	mikehaas763: Lots of people make many intermediate commits and then squash them down before pushing, or constantly rebase against upstream to maintain a linear history, or use --amend with wild abandon.	16:29
	→ uber joined	16:29
	← uber left	16:29
	← dusted left	16:29
	→ uber joined	16:29
	← uber left	16:29
	→ dsdeiz joined	16:30
	→ Advocation joined	16:30
	→ uber joined	16:30
	→ swahili joined	16:30
swahili	hi	16:30
gitinfo	swahili: 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.	16:30
swahili	Q: If I checkout `foobar`, from there, can I go up a commit or keep going up from there ? the same way we do with ^^ and stuff like that from HEAD (I never do it anyway, not sure if correct). Any tips ? thanks !	16:31
	→ maestrojed joined	16:31
mikehaas763	I've only used amend. I've worked with team members that rebased and squashed but I never partook. I thought that even local commits though, if you modify your 2nd to last commit, it can mess things up because you commited after it.	16:32
	← chovy left	16:32
tobiasvl	swahili: foobar^ works fine	16:32
	swahili: foobar^^^ is the same as foobar~3 btw	16:32
ToxicFrog	mikehaas763: no, if it can safely reconcile the later commits against the earlier ones it will, and if it can't it'll pause and ask you to either resolve conflicts or abort	16:32
swahili	tobiasvl: oh cool : D awesome! That is to go up right ?	16:32
tobiasvl	swahili: yes	16:33
	→ DARSCODE joined	16:33
swahili	tobiasvl: wait maybe I explained myself wrongly. what I mean is I go in history -2 and then from that ocmmit I want to go +2 ?	16:33
tobiasvl	ahh... no, you can only go one way unfortunately. a commit only knows its parent	16:34
swahili	tobiasvl: oh makes sense : )	16:34
	thanks!	16:34
	← robbyoconnor left	16:34
swahili	Thanks a lot for your attention anyway : )	16:34
tobiasvl	np	16:35
ToxicFrog	mikehaas763: my workflow at work actually rebases my local commits against upstream daily. Then when the changes are ready they get squashed into a single commit and pushed.	16:35
	← zizzfizzix left	16:35
swahili	is it possible to know how many commits exist ? that would be handy to actually know more or less in time I'd like.. based on number of commits (I know not perfect)	16:35
	→ JosephFerano joined	16:37
	← tang^ left	16:39
	← tang^2 left	16:39
	→ tang^ joined	16:39
	← jmichaelward left	16:40
	← tang^ left	16:40
	→ thedodd joined	16:40
	→ tang^ joined	16:40
	→ reyha joined	16:40
	→ Gizburdt joined	16:41
	← liamkeily left	16:41
	← glosoli left	16:41
	← mnavratil left	16:41
	→ cablop joined	16:41
	→ zizzfizzix joined	16:42
	→ ajustrun joined	16:42
cablop	hello	16:42
moritz	swahili: in a given repo? git log --all -1\|wc -l	16:44
	erm no	16:44
	--online instead of -1	16:44
swahili	moritz: cool thanks : D	16:44
moritz	git rev-list --all\|wc -l # faster, same result	16:45
	→ jenni_naiaretti joined	16:45
	← ojacobson left	16:45
	← PinkSpecs left	16:45
cablop	i have this issue: i have a rebase that is failing because one of the previous scommits is not receiving me all the changes on some files, i need for that commit to accept changes even at newline level, but it is ignoring the fact one file has unix new lines, the other has windows new lines, and it does nothing, i need to replace the old unix newlines with windows newlines AND the git to send thos	16:47
	those new lines in the commit!	16:47
	← P4_Denis left	16:47
	← teran_ left	16:47
	→ skeuomorf joined	16:50
	← carandraug left	16:50
	← thedodd left	16:51
	→ mnavratil joined	16:51
	← Advocation left	16:51
	→ Bilge joined	16:52
	→ Advocation joined	16:52
	← nour left	16:52
	← mnavratil left	16:52
	← mkaesz left	16:53
	← Advocation left	16:54
	→ fragamus joined	16:54
	← batrick_ left	16:54
	→ batrick joined	16:55
skeuomorf	Hey folks, I have a directory .vim that wasn't tracked using git, however I have a bunch of plugins inside .vim/bundle/ with each one of them tracking a remote branch, I would like to `git init` my .vim directory and make each one of these plugins a submodule, how would I go about doing that?	16:55
	batrick → Guest37439	16:55
	← swahili left	16:55
	← cuppscakes left	16:55
	→ mnavratil joined	16:57
	→ mizu_no_oto joined	16:57
	→ SethM joined	16:57
	← Guest37439 left	16:58
	→ cuppscakes joined	16:58
	← cuppscakes left	16:58
	← xolubi left	16:58
	→ robarelli joined	16:58
	→ cuppscakes joined	16:58
	→ msankhala joined	16:58
cablop	how do i force commiting breaklines?	16:59
	→ thedodd joined	16:59
	→ forwchen joined	16:59
	← place left	17:01
	→ imachuchu joined	17:01
	← hexagoxel left	17:01
	← pcypher left	17:01
	← fission6 left	17:03
	← robarelli left	17:03
	→ refried_ joined	17:03
tobiasvl	skeuomorf: read up on !submodules	17:04
gitinfo	skeuomorf: [!submodule] git-submodule is ideal to add subsidiary git repositories to a git superproject when you do not control the subprojects or more specifically wish to fix the subproject at a specific revision even as the subproject changes upstream. See http://www.git-scm.com/book/en/Git-Tools-Submodules	17:04
	← mennea left	17:04
	← fold left	17:04
	→ imkmf joined	17:04
	→ mikecmpbll joined	17:04
	→ mennea joined	17:04
	← kkuno left	17:05
	← fragamus left	17:05
	→ vgarg joined	17:05
	→ fragamus joined	17:05
skeuomorf	tobiasvl: I've read that actually before asking here and the information conveyed there was mostly for adding submodules from scratch after having an existing git directory, will reread though	17:05
	→ dgpalmer joined	17:06
	robustus\|Off → robustus	17:06
	→ DolphinDream joined	17:07
	← msankhala left	17:07
	← _Vi left	17:07
	← m0viefreak left	17:09
	→ logix812 joined	17:09
	← mizu_no_oto left	17:09
	← Gamecubic left	17:10
	→ Gamecubic joined	17:11
	← StarManta left	17:11
	→ fission6 joined	17:11
	→ davividal joined	17:11
	→ Advocation joined	17:11
	← Vasastan left	17:11
	← subhojit777 left	17:12
	→ jeremyheiler joined	17:12
	→ dreiss joined	17:12
	→ HanClinto_ joined	17:12
	← forwchen left	17:13
	← Gizburdt left	17:13
	→ P4_Denis joined	17:13
	← chessguy left	17:13
	← skeuomorf left	17:13
	→ a_le_ joined	17:14
	← a_le left	17:14
	robustus → robustus\|Off	17:15
	← HanClinto__ left	17:15
	← bbloom left	17:16
	→ baweaver joined	17:16
	→ Gizburdt joined	17:16
	→ Sample joined	17:17
	→ wagle_ joined	17:17
	→ HanClinto__ joined	17:17
	← wagle left	17:17
	← palcu left	17:18
	→ lsiv568 joined	17:18
	→ hmsimha_ joined	17:18
	← Mobutils left	17:19
	→ palcu joined	17:19
	← HanClinto_ left	17:19
	→ rutnop joined	17:20
	→ leeN joined	17:20
	→ thevishy_home joined	17:21
	→ thevishy joined	17:21
	→ ojacobson joined	17:21
	← mieko left	17:21
	← a_le_ left	17:21
	→ akagr joined	17:22
	← joelteon left	17:22
	← palcu left	17:23
	← msmith_ left	17:23
	→ subhojit777 joined	17:23
	→ thiago_ joined	17:23
	← subhojit777 left	17:24
	→ ropav joined	17:25
	→ teran joined	17:25
	← daedeloth left	17:26
	← encod3 left	17:26
	← Gizburdt left	17:26
	→ Gizburdt joined	17:27
	→ palcu joined	17:28
	→ pcypher joined	17:28
	→ Gizburdt_ joined	17:28
	→ subhojit777 joined	17:28
	← palcu left	17:28
	→ ncthom91 joined	17:29
	→ palcu joined	17:29
	← ncthom91 left	17:30
	← fragamus left	17:31
	← skynxnex left	17:31
	→ Sample_ joined	17:31
	← Sample_ left	17:31
	→ Sample_ joined	17:31
	← maestrojed left	17:31
	← Gizburdt left	17:31
	→ a_le joined	17:31
joo-_	Can i use git to check out to blame for a specific json item while handling json in php or some other technology?	17:31
	→ __TheDodd__ joined	17:32
	← Sample left	17:32
	→ forwchen joined	17:32
	← thedodd left	17:32
	← ropav left	17:32
	← kermit left	17:33
	← jenni_naiaretti left	17:33
_ikke_	what?	17:33
	← jwmann left	17:33
	← palcu left	17:34
	← cuppscakes left	17:34
	← BuenGenio left	17:34
	← subhojit777 left	17:34
	← mennea left	17:34
joo-_	when iterating through elements in php that i was decoded in some json that is under version control, i want to know what operator can be blamed for committing the specific json, but i suppose i will just embed the operator and commit date inside the data also	17:34
	→ cuppscakes joined	17:34
	→ mennea joined	17:35
	→ Sample joined	17:35
	→ thedodd joined	17:35
tobiasvl	haha what	17:35
PerlJam	"json under version control" sounds a little weird.	17:35
	← awkwardusername left	17:36
	→ kermit joined	17:36
	→ kermit1 joined	17:36
joo-_	i have been going wild on the pain medicate i must admit maybe i cannot help	17:36
	but i think i kinda need it	17:36
	← kermit1 left	17:37
	→ kermit1 joined	17:37
	→ koderok joined	17:37
	← kermit left	17:37
	kermit1 → kermit	17:37
	→ msmith_ joined	17:37
	← __TheDodd__ left	17:38
	→ WaReZ joined	17:38
	wagle_ → wagle	17:38
	→ jitendravyas joined	17:38
	→ maestrojed joined	17:39
	← Dudi left	17:40
	← mnavratil left	17:40
	← lsiv568 left	17:41
	← cablop left	17:41
	← evildmp left	17:41
	→ __TheDodd__ joined	17:41
akagr	joo-_: can you break down what you are trying to do? Do you have json file checked in git? It is generally difficult/discourged to access git functions from inside a running app	17:41
	→ evildmp joined	17:41
akagr	git is for managing code... it should not participate in it	17:42
ojacobson	"can I invoke git from some other program" yes, that's how git works internally, too	17:42
	however, yeah, using git as a data store for your app is likely to end in tears	17:42
	→ subhojit777 joined	17:43
	← parcs left	17:43
	← koderok left	17:43
	→ lsiv568 joined	17:43
	← thedodd left	17:44
	← cuppscakes left	17:45
	← Guest53211 left	17:45
	← joo-_ left	17:45
	→ gccostab_ joined	17:47
	→ CheckDavid joined	17:48
	← thiago_ left	17:48
	→ thiago joined	17:48
	→ mizu_no_oto joined	17:48
	← ecky--ptang-zoob left	17:49
	← gccostabr left	17:49
	→ Mobutils joined	17:49
	← vgarg left	17:49
	→ ecky--ptang-zoob joined	17:49
	← mixandgo left	17:49
	→ Aikar joined	17:50
	← __TheDodd__ left	17:50
	→ beaky joined	17:50
beaky	hello	17:50
	→ martinklepsch joined	17:51
	← Gizburdt_ left	17:51
beaky	how do i modify an earlier commit to include my staged changes	17:51
_ikke_	Last commit you made?	17:51
beaky	second last :D	17:51
	→ Gizburdt joined	17:51
_ikke_	git stash; git rebase -i HEAD~2; change pick to edit for the commit, save, quit; When in the shell: git stash pop; git commit --amend; git rebase --continue	17:52
	← worc left	17:53
	→ Cassiopaya joined	17:53
	→ Dudi joined	17:54
	→ Not_Whatever joined	17:54
_ikke_	(don't forget to add the changes before the commit	17:54
	)	17:54
Aikar	Hi - I’m desperately trying to get a git-svn workflow going so I can use git at work where we use SVN. Migrating to Git just isnt on the companies plans. My issue is that git svn clone does not work with specifying revisions and a path that was not changed by that revision. Sure I can fix the revision on the svn side… but I’m trying to work up some scripts that will full clone the svn repo and handle the externals. If an external of my project also does the sa	17:55
	thing… i cant really go chasing down and updating the revision of every depth level :/ - so for example this checks out no files: git svn clone -r 26 svn+ssh://svn01.colo/repo/tags/v1.4/lib lib/repo - any way to work around this?	17:55
	→ jaeckel joined	17:55
	→ Fomina joined	17:55
nezZario	what the heck would this do in a config under [remote "all"]	17:55
	url = access-3:/var/www/html.git	17:56
	← Gizburdt left	17:56
Sonderblade	can you get git to convert to lf but never to crlf?	17:56
ojacobson	ssh protocol, host/config access-3, path /var/www/html.git	17:56
	→ sq-one joined	17:56
	→ Suchit joined	17:56
	← jdrumheller left	17:57
	→ thedodd joined	17:57
	← EminenceHC left	17:57
	→ EminenceHC joined	17:58
	gitinfo set mode: +v	17:59
	→ btanaka joined	17:59
_ikke_	Sonderblade: Use dos2unix as a clean filter, and cat as a smudge filter?	17:59
	Sonderblade: see man gitattributes	17:59
gitinfo	Sonderblade: the gitattributes manpage is available at http://jk.gs/gitattributes.html	17:59
	→ robarelli joined	17:59
	→ ropav joined	17:59
	← forwchen left	18:01
	→ cuppscakes joined	18:01
nezZario	ojacobson: holy .. thanks	18:01
	would of never got that	18:01
Sonderblade	_ikke_: im on windows	18:01
nezZario	trying to reverse engineer some guy's stuff here	18:01
	→ forwchen joined	18:01
	← diegoviola left	18:02
	← EminenceHC left	18:02
Sonderblade	basically i want core.autocrlf=true but without crlf insertion	18:02
	→ jpf joined	18:03
	← jpf left	18:03
	→ jpf joined	18:03
	← pcypher left	18:04
	← mennea left	18:04
	← Suchit left	18:04
	← Pyrogerg_ left	18:04
	→ mennea joined	18:05
	→ Suchit joined	18:05
	← ropav left	18:05
	← robarelli left	18:05
	← killtheliterate left	18:06
	→ CEnnis91 joined	18:06
	→ ropav joined	18:06
	→ Blaster joined	18:07
	→ skeuomorf joined	18:07
	← cuppscakes left	18:07
Blaster	Someone made a PR on my GH repository from their fork.	18:08
	→ worc joined	18:08
Blaster	How do I pull that forked branch down to my local machine?	18:08
	I want to fast-forward it, because we try to avoid merge commits.	18:08
	← Sonderblade left	18:09
	← burhan left	18:09
	← forwchen left	18:09
	→ TititaTitutu joined	18:10
_ikke_	github has instrunction on it	18:11
	→ aidalgol joined	18:11
_ikke_	It says it on the pull request	18:11
	← martinklepsch left	18:11
	→ burhan joined	18:11
_ikke_	This pull request can be automatically merged.	18:12
	You can also merge branches on the command line.	18:12
	← Guest3934 left	18:12
	→ Pyrogerg joined	18:12
	→ bihi joined	18:12
	→ mixandgo joined	18:12
	→ JeanCarloMachado joined	18:13
	← maqr left	18:13
	← mixandgo left	18:13
	← JeanCarloMachado left	18:13
	gitinfo set mode: +v	18:13
	→ SirSilence joined	18:13
	→ ande_ joined	18:14
	→ lorenx joined	18:15
	← tristanp left	18:16
	→ zamabe joined	18:16
	→ sevenless joined	18:16
lorenx	hi all. excuse me for the silly question... i need to slipt the root commit and i'm following this hint: http://goo.gl/Y9OvHz	18:17
	← dmarkham left	18:17
lorenx	but i don't understand how to use the second command, "git commit --amend"	18:17
	how can i slipt the commit with the amend option?	18:18
	→ noxd joined	18:18
sevenless	Hi. I don't understand how you're supposed to merge something on Github.	18:19
Seveas	lorenx: 'slipt'?	18:19
lorenx	i've also tried with "git rebase -i --root"	18:19
	Seveas: split	18:19
Seveas	ah!	18:19
lorenx	:D	18:19
Seveas	that's tricky. How many commits do you have in total?	18:19
lorenx	not many	18:20
	why?	18:20
Seveas	sevenless: pull requests that can be merged automattically will show a merge button. Other's you'll have to fetch and merge manually	18:20
	→ cagedwisdom joined	18:20
	→ avocado joined	18:20
	gitinfo set mode: +v	18:21
	← Sample left	18:21
	← Sample_ left	18:21
	← zyla left	18:22
sevenless	Seveas: OK, how do you do that? I've forked the master.	18:22
	→ Sample joined	18:22
Seveas	lorenx: in that case I suggest tagging what you have now, doing a reset --hard to the root commit. Then edit to remove what you don't want in the root and committing that. And then reverting that commit with revert. And then rebase -i to squash the root and the second commit, and give the third commit a better commit message	18:22
	lorenx: and then cherry-pick all the other commits.	18:22
	→ thibaultcha joined	18:22
sevenless	Seveas: I go git fetch <master>, right	18:22
Seveas	no	18:22
	if you've forked a repo and want to merge from it, ready !sync	18:22
gitinfo	[!fork_sync] You can read a nice guide on how to update your fork with the upstream repository here: https://help.github.com/articles/syncing-a-fork	18:22
	→ decompiled joined	18:23
	← Dudi left	18:23
	→ EminenceHC joined	18:23
lorenx	Seveas: sorry but what do you mean, at that stage, when you say "Then edit to remove what you don't want"	18:25
	→ cnj joined	18:25
sevenless	Seveas: reading, thanks	18:25
lorenx	i mean, if i set my root commit to be edited, how do i actually split it	18:25
sevenless	Seveas: I can use "git clone" to check out my own fork, then "git fetch upstream" to fetch the master.	18:26
	← oskarkv left	18:26
lorenx	i usually do a reset HEAD^ but i cannot do it at the root stage, right?	18:26
	→ nour joined	18:26
bihi	Hi, is there a way to have a master branch that follows origin/master without needing to pull or rebase or merge --ff to get to the new stuff?	18:26
	→ ColKurtz joined	18:26
bihi	I tried git symbolic-ref refs/heads/master refs/remotes/origin/master	18:27
Seveas	lorenx: yeah, so what I said will sort-of do a reverse split: if you merge the root commit with the second commit, it'll have the effect of the split, as the third commit reverts the split	18:27
bihi	it's basically what I need, but things like git branch --merged don't work if I do that	18:28
Seveas	lorenx: e.g. if your root commit has a file with just two lines "a" and "b", and in the second commit you remove "b" and the third commit reverts that removal, sqaushing root and the second commit together later will make it look like you've split the root	18:28
	← baweaver left	18:28
	← nnyk left	18:29
Remram	Why is 'status' super-fast while 'checkout -- .' and 'stash -p' are super-slow? Don't they use the same mechanism to find changed files?	18:29
lorenx	Seveas: wait, let's say that my root commit has 2 files and i need it to have just one of them and then the second file in a "new" second commit	18:30
Seveas	lorenx: so your second commit would remove that second file	18:30
	and the third commit reverts that removal	18:30
	and then you squash 1 and 2 together	18:31
	← evildmp left	18:31
lorenx	sorry, maybe i don't understand :)	18:31
	→ dan64 joined	18:31
lorenx	my root commit has file a and file b, then my second commit has file c	18:31
Seveas	that's why you reset --hard to your root commit first	18:31
	so you don't have all these commits that get in the way	18:31
ojacobson	Remram: what makes you think 'git checkout -- .' only looks at changed files?	18:32
Seveas	and after you've cleaned up your root commit, you cherry-pick all your other commits	18:32
	→ Sasazuka joined	18:32
lorenx	i need to have 3 commits, the first with file a, the "new" second commit with file b and the third (ex second) with c	18:32
Seveas	(so don't forget to tag your current HEAD, that way you can find those commits again!)	18:32
	→ jgardella joined	18:32
Seveas	git tag pre-reworked-root; git reset --hard shaq_of_root_commit; git rm file_i_dont_want_in_root; git commit -am "fixup root"; git revert HEAD; git rebase to squash root and second commit	18:34
	but if it's really that simple, you can do a simpler dance	18:34
	← mennea left	18:34
	→ mennea joined	18:35
	→ skeuomor1 joined	18:35
	← jgardella left	18:35
Seveas	git tag pre-reworked-root; git reset --hard shaq_of_root_commit; git rm --cached file_i_dont_want; git commit --amend; git add file_i_didn't_want_but_want_now; git commit	18:35
	← bezet left	18:35
	→ cuppscakes joined	18:35
Seveas	and then cherry-pick the other commits	18:35
	← cuppscakes left	18:35
lorenx	well, let me try ;)	18:35
	→ jgardella joined	18:35
Seveas	remember to !backup :)	18:36
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	18:36
	→ cuppscakes joined	18:36
	← milkohol left	18:36
lorenx	Seveas: anyway, can i also use "git rebase -i --root"?	18:36
Seveas	not for splitting the root commit	18:37
	← skeuomorf left	18:37
lorenx	what about this then: http://goo.gl/qrd0In	18:38
	← Sasazuka left	18:38
lorenx	it is just to reword it?	18:38
	→ Sasazuka joined	18:38
	← endiruna left	18:39
	→ joo-_ joined	18:39
	← Tuna-Fish left	18:39
	← Pyrogerg left	18:40
Seveas	lorenx: hmm. It may work if you set the root commit to 'edit', and then when you get to edit that comit, git rm --cached that_file; git commit; git add that_file; git commit; git rebase --continue	18:40
sevenless	Seveas: So how do I fetch the master from the repo that I forked?	18:41
	→ Toaster` joined	18:41
Seveas	sevenless: !sync explains that	18:41
gitinfo	sevenless: [!fork_sync] You can read a nice guide on how to update your fork with the upstream repository here: https://help.github.com/articles/syncing-a-fork	18:41
	← shinnya left	18:41
Seveas	lorenx: let me experiment a bit with that :)	18:41
	→ irqq joined	18:41
	→ Manny joined	18:41
	← Manny left	18:42
	← EminenceHC left	18:42
	→ Pyrogerg joined	18:42
	→ killtheliterate joined	18:42
	→ Manny joined	18:43
Seveas	lorenx: yeah that works	18:43
	even easier than my convoluted tag/cherry-pick dance	18:43
	← Sebtoast left	18:44
	← Sasazuka left	18:44
lorenx	ok, let me try the easier one then	18:44
	→ zyla joined	18:44
	→ epifanio joined	18:44
lorenx	i should do rebase -i --root and edit the root commit, right?	18:44
	→ mieko joined	18:44
Seveas	yes	18:45
	→ Sasazuka joined	18:45
	← reyha left	18:46
Seveas	and the edit process should be: git rm --cached file_i_dont_want_in_the_root; git commit --amend; git add file_i_dont_want_in_the_root; git commit	18:46
	and then git rebase --continue	18:46
	← subhojit777 left	18:47
lorenx	it seems i have 2 root commit now :D	18:47
	→ baweaver joined	18:48
	← Sasazuka left	18:48
lorenx	ok, it seems i got it ;)	18:49
	← Bilge left	18:49
lorenx	thanks a lot	18:49
Seveas	no problem, and sorry for the confusion	18:49
	→ vgarg joined	18:49
	→ Tuna-Fish joined	18:50
	→ aard_ joined	18:50
	← lorenx left	18:50
	→ Sasazuka joined	18:50
	→ tristanp joined	18:50
	← TititaTitutu left	18:51
	← vgarg left	18:51
	→ vgarg joined	18:51
	→ listochkin joined	18:51
	← avocado left	18:52
	→ _Atom_ joined	18:52
	← Nizumzen left	18:53
	← joo-_ left	18:53
	→ TititaTitutu joined	18:53
	→ _Vi joined	18:54
	→ joo-_ joined	18:54
	← akagr left	18:55
	← ropav left	18:55
	→ Bilge joined	18:56
	→ EminenceHC joined	18:57
	→ bug_sniper joined	18:57
	← robustus\|Off left	18:57
	← lsiv568 left	18:58
JDHawke	afternoon folks....	18:59
Remram	ojacobson: it doesn't	18:59
	→ robbyoconnor joined	18:59
Remram	ojacobson: reset --hard is fast, status is fast, but stash -p is slow, checkout -- is slow	18:59
JDHawke	I have a working copy of a website, and I want to convert it to a sparse checkout without having to remove the whole thing and re-clone it....I just want to exclude some folders and have them removed from the disk in this case	19:00
grawity	Remram: run all of them under `strace`, it'll show how they differ	19:00
	← akkad left	19:00
Remram	whereas I can't see any reason they can use the same (fast) approach at determining which files changed	19:00
grawity	JDHawke: a sparse checkout is only applied on the "checkout" step, so just... create the checkout-list file and run `git checkout -f` or something	19:00
	← salgotrav left	19:00
	← jitendravyas left	19:01
JDHawke	thanks	19:01
	← vgarg left	19:01
	→ robarelli joined	19:01
	→ ropav joined	19:02
	→ Eminence_ joined	19:02
	→ robustus joined	19:02
	← Sasazuka left	19:03
	← EminenceHC left	19:03
	→ akkad joined	19:03
	← mennea left	19:04
	← Eminence_ left	19:04
	→ mennea joined	19:05
	→ pcypher joined	19:05
	→ Sasazuka joined	19:05
	→ cuppscak_ joined	19:05
	← cuppscak_ left	19:06
	← PsciCOdeliXHAt left	19:06
	← jgardella left	19:06
	→ cuppscak_ joined	19:06
	← cuppscak_ left	19:06
	← ropav left	19:07
	→ cuppscak_ joined	19:07
	← robarelli left	19:07
	← ojacobson left	19:07
	→ ojacobson joined	19:08
	← TititaTitutu left	19:08
	← Sasazuka left	19:08
	→ TititaTitutu joined	19:09
	→ dmarkham joined	19:09
	← cuppscakes left	19:09
	← wrouesnel1 left	19:10
	← pcypher left	19:10
	→ Mso150_u_n joined	19:10
	→ aswen joined	19:10
	→ Sasazuka joined	19:10
	→ jdrumheller joined	19:10
	← Mso150_u left	19:11
	← Bilge left	19:11
	← intellix left	19:11
	← sq-one left	19:13
sevenless	OK. I don't get the line endings thing. If I have CR-LF line endings, and my .gitattributes says to make text=auto, is that OK?	19:14
	→ vgarg joined	19:15
	→ martinklepsch joined	19:15
	← vgarg left	19:16
	→ jenni_naiaretti joined	19:16
	→ Bilge joined	19:16
	→ vgarg joined	19:16
	→ vire joined	19:16
	← akushner__ left	19:17
	← martinklepsch left	19:18
	→ ianbrandt joined	19:18
	→ hexagoxel joined	19:18
	← jdrumheller left	19:19
	← skeuomor1 left	19:20
	→ ropav joined	19:20
	← squirrel left	19:20
	→ skeuomorf joined	19:20
	→ sqrrl joined	19:21
skelterjohn	anyone know when credential.helper was introduced? having trouble looking that up	19:21
	→ seu_barriga joined	19:21
	→ t4nk059 joined	19:22
seu_barriga	hello	19:22
	→ EminenceHC joined	19:22
sevenless	Help. I don't know what's up with the line endings here.	19:22
	→ liamkeily joined	19:23
	→ pandeiro joined	19:23
seu_barriga	someone made a commit that deleted some important files on my repository. I can reset to a previous commit to restore the files, but i can't find a way to "recommit" them over	19:23
	I'v e already tried rebasing	19:23
	← Suchit left	19:24
seu_barriga	is it possible?	19:24
	← darkbasic left	19:24
	→ Suchit joined	19:24
	→ darkbasic joined	19:25
	← thiago left	19:25
	← johtso left	19:25
	→ milkohol joined	19:25
	← nimdAsyS left	19:25
	→ pcypher joined	19:26
	← hexagoxel left	19:26
	← Sample left	19:27
	← t4nk059 left	19:27
	→ himikof joined	19:27
	← vgarg left	19:28
	→ jstimm joined	19:28
someplace	seu_barriga, do you want to revert the entire commit?	19:28
_ikke_	skelterjohn: 1.7.9 is what I can find	19:28
	← Suchit left	19:29
	← MutSbeta left	19:29
	→ cablop joined	19:29
	← himikof left	19:29
	← sLite left	19:29
cablop	how good is git at resolving path changes?	19:29
someplace	git can't store path changes in its database	19:29
seu_barriga	someplace, yes, but i want to keep my current changes	19:29
	← _Atom_ left	19:30
someplace	seu_barriga, you should be able to do "git revert [commit]" for that	19:30
	→ himikof joined	19:30
	→ MutSbeta joined	19:30
Seveas	skelterjohn: abca927dbef2c310056b8a1a8be5561212b3243a - 1.7.9	19:30
someplace	if it's complaining about working tree, !stash	19:30
	maybe that's not at hing	19:30
_ikke_	Seveas: Beat you :P	19:30
Seveas	_ikke_: but with less complete info :P	19:30
	→ _Atom_ joined	19:30
	← pcypher left	19:30
cablop	someplace: i mean, i have a file .../dirA/file.ext then i move it to .../dirB/dirC/file.ext	19:30
	→ marchelzo_ joined	19:31
_ikke_	v1.7.9-rc2~3^2~16	19:31
Seveas	cablop: pretty decent, given that it doesn't store rename info.	19:31
	→ Nerd42 joined	19:31
_ikke_	Seveas: That complete enough?	19:31
seu_barriga	someplace, by [commit] do you mean the commit that deleted the file or the one before it?	19:31
someplace	seu_barriga, the one that removed the file.	19:31
	cablop, it depends on the tool, the tool needs to guess that the file was moved	19:31
	← paulweb515 left	19:31
someplace	git can't store renames or moves	19:31
_ikke_	It doesn't by design	19:31
cablop	o.o	19:31
_ikke_	You can tell git to infer it	19:32
someplace	it's generally pretty good though, as long as the file wasn't modified too much in the same commit that it was moved	19:32
	_ikke_, I'm aware, and it's a lot cleaner for it :)	19:32
seu_barriga	ok	19:32
	i'm gonna try it	19:32
	→ vgarg joined	19:32
cablop	what if instead of moving i move and copy it, i.e., dirA/file.01 becomes dirB/file.01 and dirC/file.01	19:33
	?	19:33
Seveas	cablop: git's log/blame etc. will detect that too	19:33
_ikke_	https://lkml.org/lkml/2005/4/10/70	19:33
sevenless	I don't get it. Git merge created two complete copies of the same file. Is this because the line endings changed?	19:33
cablop	Seveas: so i can reach the repo history of file.01 from both files, right?	19:34
	→ Sample joined	19:34
	← ItSANgo left	19:34
	→ jgardella joined	19:34
	← aidalgol left	19:34
	← mennea left	19:34
	→ mennea joined	19:35
Seveas	_ikke_: "	19:35
	But it clearly is the only right way. The fact that everybody else does it	19:35
	some other way only means that they are wrong."	19:35
someplace	cablop, I don't believe so.	19:35
	← Quevin left	19:36
Seveas	cablop: good question. I don't know. I don't store duplicates :)	19:36
	→ thiago joined	19:36
cablop	hmmm	19:36
	← sohail left	19:36
cablop	we don't need to duplicate, but to fork a file instead	19:36
	→ robertodecurnex joined	19:36
cablop	svg files, but we need to keep the history of both	19:36
	→ sohail joined	19:36
	← baweaver left	19:37
	← hmsimha_ left	19:37
	← Nerd42 left	19:37
Seveas	you don't lose history	19:38
sevenless	Ah. I can use git reset --hard HEAD; git push -f	19:38
	← jenni_naiaretti left	19:38
	→ baweaver joined	19:39
	→ Nizumzen joined	19:40
	← jgardella left	19:42
	→ sr____ joined	19:42
	→ jgardella joined	19:42
	→ Diemuzi joined	19:43
	← ropav left	19:43
	← Diemuzi left	19:43
	→ jeremyhe_ joined	19:43
seu_barriga	sevenless , something weird happenned	19:44
cablop	i need to force commiting line endings	19:44
Steve_Jobs	is it possible to do a shallow mirror of a bare repo that includes only 1 snapshot of 1 branch?	19:44
seu_barriga	the file is being deleted after a specific commit, but the log shows no reference of deleting it	19:44
cablop	how can i force the commit of line endings? i have a rebase that it's failing because of line endings!	19:45
	← jds left	19:45
	← nettoweb left	19:46
	← joo-_ left	19:46
	← jeremyheiler left	19:47
	← Walex left	19:47
	→ ropav joined	19:47
	← dmarkham left	19:47
	→ martinklepsch joined	19:48
	← mizu_no_oto left	19:48
	→ cuppscakes joined	19:49
cablop	is there no way for that?	19:49
	← cuppscakes left	19:49
	→ paul424 joined	19:49
	← damccull left	19:50
	← zburns left	19:50
someplace	cablop, force the commit..?	19:50
_ikke_	Seveas: btw	19:50
	Seveas: http://tinyurl.com/git-changes	19:50
	→ cuppscakes joined	19:50
	← cuppscakes left	19:51
	← vgarg left	19:51
cablop	someplace: i have a file that i need to store with windows line endings, it currently has linux line endings, git says, nothing to commit	19:51
someplace	unix2dos file	19:51
	git add file && git commit?	19:51
xender	cablop: !lf	19:51
gitinfo	cablop: [!use_lf] To eliminate all issues with line-endings in a repo it is recommended to change all files to use LF, and then convince all contributors to use LF-aware editors (Notepad++ works well for Windows), by force if necessary. !crlf has some tips if this is not feasible.	19:51
xender	!crlf	19:51
gitinfo	to fix problems with line endings on different platforms, check out http://line-endings.gitrecipes.de/	19:51
xender	I meant the second one I think	19:52
	!line-endings	19:52
gitinfo	[!crlf] to fix problems with line endings on different platforms, check out http://line-endings.gitrecipes.de/	19:52
	← cuppscak_ left	19:52
xender	Sorry, I don't remember those keywords	19:52
	→ ItSANgo joined	19:53
	← ecky--ptang-zoob left	19:53
	→ ecky--ptang-zoob joined	19:54
	← jjasinski left	19:54
sevenless	God, fuck line endings on git	19:54
	← ecky--ptang-zoob left	19:54
sevenless	Are you supposed to use core.autocrlf false?	19:54
	→ PinkSpecs joined	19:54
xender	Depends on use case?	19:54
	→ ecky--ptang-zoob joined	19:55
sevenless	Say I want to use LF everywhere, which seems to be the standard	19:55
	And I'm editing on Windows	19:55
maslowbeer	hello. so i'm doing a merge of a pull request from BB where there are a ton of conflicts but they're all easily resolved since the same source should prevail with each conflict. i just want to clarify which is "ours" and which is "theirs" before executing. Also clarifying the difference between git merge --theirs vs git merge --strategy-option theirs	19:55
sevenless	I just need to use core.autocrlf false and make sure Notepad++ uses LF too... right?	19:55
cablop	xender, sadly it is a rebase... so, i cannot change the lf in the past with no pain... 200 commits to rebase... :/	19:55
xender	cablop: filter-branch maybe?	19:56
maslowbeer	i'm on develop now and I want to merge lite-changes into develop. the pull request was done in BB	19:56
_ikke_	maslowbeer: When merging, ours is the branch you're on, theirs is the branch you are merging	19:56
	maslowbeer: git merge --theirs doesn't exist..	19:56
xender	sevenless: autocrlf is just for use in that situations - it automatically commits with LF and checkouts with CRLF	19:56
	sevenless: So I'd say set it to true	19:56
_ikke_	maslowbeer: git merge --strategy-option theirs means it will always choose the 'theirs' side when a conflict happens	19:57
sevenless	xender: So what happens if something's committed with CRLF, checked out on windows, then merged with something committed with LF	19:57
	It seems to screw up.	19:57
cablop	sevenless: in fact it screws up!	19:57
xender	sevenless: That's why autocrlf never commits with CRLF	19:58
	It does conversion between LF repo and CRLF workspace	19:58
sevenless	cablop: Yes. I just had a "WTF" reaction when I noticed my push had entirely replaced the entire code base.	19:58
cablop	my repo says, rebasing... when it is, say in the commit 170... it says, i cannot commit it because you have changes in your workspace...	19:58
	→ kukks joined	19:58
maslowbeer	_ikke_, ok great. in the diffs on the pull request which is source and which is destination? I presume source would be the branch we're merging (theirs) into the destination (ours). that right?	19:58
	→ doitjay joined	19:58
cablop	commit them.... but it refuses to commit them, cause git believe line endings are no issue	19:58
sevenless	Why isn't git smart enough to just turn CRLF into LF	19:59
	if this is an issue	19:59
	← petersr left	19:59
	→ lsiv568 joined	19:59
_ikke_	maslowbeer: I would think so, yes	19:59
xender	sevenless: But it does it... When you have autocrlf set to true	19:59
cablop	git is openning the files and saying, oh, i have nothing to do, files are the same, but when rebasing, oh, stop, the files are different! i cannot continue!	19:59
	← ColKurtz left	20:00
sevenless	xender: But it doesn't. I tried to merge a remote committed with LF and an origin committed with CRLF.	20:00
	← sdrfnord1 left	20:00
	→ dmarkham joined	20:00
cablop	crlf... auto?	20:00
xender	sevenless: something that is actually committed with CRLF is another matter	20:00
cablop	hmmm	20:01
xender	sevenless: And another problem	20:01
cablop	ah, no, it is not going to work... once i rebase... then the rebase is going to delete the gitpreferences!	20:01
	← thevishy left	20:01
xender	sevenless: autocrlf will only convert line endings when checking out and committing. No more	20:01
sevenless	xender: it only takes one push to contaminate the repo with CRLF and you only find out when your merges don't work.	20:02
	← thevishy_home left	20:02
	→ jdrumheller joined	20:02
	← baweaver left	20:02
	← bihi left	20:02
xender	sevenless: Yes	20:02
	← skeuomorf left	20:02
xender	sevenless: As it takes "only" one force push to do much worse things with repo	20:03
sevenless	xender: this is particularly pernicious because it's invisible	20:03
	← mieko left	20:03
	← dgpalmer left	20:03
xender	Actually, at work we have problems with some poeple overseas committing binaries to repo...	20:03
	← lsiv568 left	20:03
	→ pcypher joined	20:04
xender	And they use force push sometimes too. As in "I don't know what's going on, so --force"	20:04
	← m0ltar left	20:04
	→ robarelli joined	20:04
xender	sevenless: You may try a mergetool which can ignore LF differences	20:04
	← mennea left	20:04
	→ cuppscakes joined	20:04
	← cuppscakes left	20:04
xender	p4merge can be set to do that... And for sure there are some other tools	20:04
	→ mechanicalduck_ joined	20:05
xender	But yeah, it may still produce ugly diff	20:05
cablop	xender, sevenless: afaik autocrlf true could damage my binaries, couldn't it?	20:05
	→ mennea joined	20:05
	← Toaster` left	20:05
	→ cuppscakes joined	20:05
	← pheaver left	20:05
	← cuppscakes left	20:05
sevenless	cablop: iirc it tries to only do it to things that look like text	20:05
	← Advocation left	20:06
	→ sdrfnord1 joined	20:06
xender	cablop: Dunno. That's unrelated to CRLF. More like "committers should be qualified" thing	20:06
	→ whaley joined	20:06
cablop	yep	20:06
	← mechanicalduck left	20:07
	← txdv left	20:07
	← ropav left	20:08
	→ baweaver joined	20:08
	mechanicalduck_ → mechanicalduck	20:09
	← robarelli left	20:09
	→ mollitz joined	20:10
	→ Noldorin joined	20:10
	→ nettoweb joined	20:10
	← nettoweb left	20:11
	← havanamint left	20:11
	← jottr left	20:11
	← seu_barriga left	20:11
	→ nettoweb joined	20:11
	← nettoweb left	20:12
	← eliasr left	20:12
	← rezrov left	20:12
	← Guest37896 left	20:12
	→ nettoweb joined	20:12
	← nettoweb left	20:12
	→ rezrov joined	20:12
	→ ropav joined	20:13
	→ nettoweb joined	20:13
	← nettoweb left	20:13
	← sdrfnord1 left	20:13
	→ txdv joined	20:13
	→ nettoweb joined	20:13
	→ kukuuu joined	20:14
	→ thevishy_home joined	20:14
	← moritzschaefer left	20:14
	→ thevishy joined	20:14
	→ cuppscakes joined	20:14
	← cuppscakes left	20:14
	→ cuppscakes joined	20:15
	← cuppscakes left	20:15
	→ fabiobik joined	20:16
	→ cuppscakes joined	20:16
	← cuppscakes left	20:16
	→ pheaver joined	20:16
fabiobik	Hello guys	20:16
gitinfo	fabiobik: 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.	20:16
	→ cuppscakes joined	20:17
	← cuppscakes left	20:17
	→ jonmorehouse joined	20:17
	← nour left	20:17
fabiobik	Does someone here uses bitbucket? its possible to use git:// intead of https:// ?	20:17
	→ cuppscakes joined	20:17
	← cuppscakes left	20:17
	← ajustrun left	20:17
belak	fabiobik: bitbucket supports ssh and https.	20:17
xender	fabiobik: You have to have ssh key set up to use git protocol I think	20:18
	→ cuppscakes joined	20:18
	← EminenceHC left	20:18
	← D-Boy left	20:18
	← epifanio left	20:19
	→ EminenceHC joined	20:19
belak	xender: the git:// and ssh:// protocols are very different.	20:19
	Well, they act similarly, but are very different in how they run.	20:19
xender	But doesn't git:// use ssh for auth anyway?	20:19
_ikke_	no	20:19
belak	xender: http://git-scm.com/book/en/Git-on-the-Server-The-Protocols	20:19
_ikke_	git uses no auth at all	20:19
	git://	20:19
	It's meant for 'public' read-only access	20:20
	← martinklepsch left	20:20
xender	Oh, nvm	20:20
	→ nour joined	20:20
belak	fabiobik: are you running into any issues with https or git?	20:20
	Er or ssh	20:20
_ikke_	there is the internal git protocol which is used to transfer objects, and there is the git:// protocol, which is basically a plain git protocol over a specific port	20:21
	→ Marcus joined	20:22
fabiobik	does anyone knows a service that runs that ? excluding github?	20:22
	← Wiz_KeeD left	20:22
	Matrixiumn → HAL9001	20:22
belak	fabiobik: why, out of curiosity?	20:23
	← EminenceHC left	20:23
	→ jenni_naiaretti joined	20:23
_ikke_	fabiobik: that runs what?	20:23
	→ paulweb515 joined	20:23
	→ D-Boy joined	20:23
_ikke_	github doesn't use git://	20:23
fabiobik	_ikke_, yes it does	20:23
	→ Quevin joined	20:24
belak	https://gist.github.com/grawity/4392747	20:24
fabiobik	belak, because i'm running a package that download his source from git://	20:24
	→ mizu_no_oto joined	20:25
_ikke_	https://git.kernel.org/cgit/ uses it too	20:25
	← wrouesnel3 left	20:25
belak	Yeah, makes sense for kernel.org because everything's public...	20:25
	← beaky left	20:26
_ikke_	there are more like that	20:26
	basically using cgit / gitweb plus git-daemon	20:26
	← jenni_naiaretti left	20:27
_ikke_	hmm, since git 2.1, merge.defaultToUpstream is by default true instead of false	20:27
	← imkmf left	20:27
	→ freeman42 joined	20:27
	← thevishy left	20:28
	← baweaver left	20:28
	→ baweaver joined	20:29
	← thevishy_home left	20:29
	← Neozonz\|Disc left	20:31
	← Neozonz left	20:31
	→ jenni_naiaretti joined	20:31
	← jceb left	20:31
	→ dgpalmer joined	20:31
_ikke_	cool, fast-export --anonymize	20:32
	→ jottr joined	20:32
_ikke_	git 2.2	20:32
	← liamkeily left	20:32
	← tvw left	20:32
	← fabiobik left	20:33
	→ gauke joined	20:33
	→ TheFuzzball joined	20:34
	← mennea left	20:34
	← n-st left	20:35
	→ rnaveiras joined	20:35
	→ nnyk joined	20:35
	→ mennea joined	20:35
	← gauke left	20:35
	→ lun__ joined	20:35
	→ imkmf joined	20:35
	HAL9001 → Xack	20:35
	→ alvaro_o joined	20:35
	← TititaTitutu left	20:35
	→ bezet joined	20:35
	← killtheliterate left	20:36
	← nour left	20:36
	← jeremyhe_ left	20:36
	← lazarus477 left	20:36
	← rnaveiras left	20:36
	→ jeremyheiler joined	20:37
	← zapb_ left	20:37
	→ n-st joined	20:37
	← bgerber left	20:38
	← ropav left	20:38
	← lun_ left	20:38
	← zamabe left	20:39
	← bezet left	20:39
	→ Neozonz joined	20:40
	→ rnaveiras joined	20:41
	→ ropav joined	20:41
	→ r0bby_ joined	20:41
	← r0bby_ left	20:41
	→ r0bby_ joined	20:41
	→ mscook joined	20:41
	← rnaveiras left	20:41
	← ropav left	20:42
	← kriskropd left	20:42
	← robbyoconnor left	20:42
	→ kriskropd joined	20:42
	→ chessguy joined	20:43
	→ tbxyz joined	20:43
	← Manny left	20:43
	→ Manny joined	20:43
	→ DrShoggoth joined	20:44
	→ jas4711 joined	20:44
	← bug_sniper left	20:44
	← thedodd left	20:45
	→ shinnya joined	20:45
	→ HanClinto_ joined	20:45
	← Blaguvest left	20:45
	→ ropav joined	20:45
	gitinfo set mode: +v	20:45
Ankhers	Someone just made a commit to origin/master that broke the repo. How would I go about changing origin/master to what my local master looks like?	20:45
	→ bgerber joined	20:46
ojacobson	that is a terrible way to fix that	20:46
	→ nnyk_ joined	20:46
Ankhers	What is the suggested way to fix?	20:46
ojacobson	if you don't want to make everyone do a bunch of work in their clones, fix it normally and push yet more commits	20:46
	and leave the broken bits in history	20:46
tobiasvl	Ankhers: !revert	20:46
gitinfo	Ankhers: That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?	20:46
ojacobson	minimally, 'git revert <commit>' will back out the offending commit (assuming it's not a merge).	20:47
	by creating a new commit that exactly reverses it.	20:47
	← nnyk left	20:47
	← baweaver left	20:47
Ankhers	It was a merge. So the best option at this point is to just clean in manually?	20:47
	→ baweaver joined	20:47
tobiasvl	Ankhers: just for learning purposes, git DOES allow you to rewrite origin's master with your master with a !force_push	20:47
gitinfo	Ankhers: If you need to overwrite the history of a remote git repository (very bad idea, see !rewrite), you can do so with `git push -f`. Note the remote server may reject this. See man git-config and search for receive.denyNonFastForwards. Best practice is for upstream servers to denyNonFastForwards.	20:47
tobiasvl	Ankhers: but it's not recommended because it's a !rewrite of history	20:47
gitinfo	Ankhers: 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	20:47
	← Nizumzen left	20:48
	← kukuuu left	20:48
	← HanClinto__ left	20:48
tobiasvl	Ankhers: just revert the merge commit. something like `git revert -m 1 <commit>` will do it (where -m is the child that was the mainline before the merge)	20:48
Ankhers	Alright. I guess I will try and fix it than. Thanks for the tips.	20:48
	→ TititaTitutu joined	20:49
	→ fabiobik joined	20:49
	← TititaTitutu left	20:49
	→ thedodd joined	20:49
	→ upene joined	20:49
	→ mustmodify joined	20:50
	← blubberbop left	20:51
	← cads left	20:51
	→ nnyk joined	20:51
	→ evildmp joined	20:51
	← ropav left	20:52
	→ killtheliterate joined	20:52
	← AaronMT left	20:52
	→ ropav joined	20:53
	→ epifanio joined	20:53
	← Cheaterman1 left	20:53
	→ lsiv568 joined	20:53
	→ darrennnn joined	20:54
	→ cjwilburn joined	20:54
	← nnyk_ left	20:54
	← robertodecurnex left	20:55
darrennnn	hi #git, i am a small time web developer. i use shared hosting for my few clients. i want to integrate git into my workflow but i am not sure how because i would like to learn how to deploy to the server. my question is -- should i be looking into how to PUSH changes to my server, or should i look into how to set up my servers to PULL from the "master" branch for that project?	20:56
_ikke_	darrennnn: !deploy	20:56
gitinfo	darrennnn: 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:56
ojacobson	!deploy	20:56
darrennnn	i am going to use bitbucket as my private repo for my projects	20:56
	← nnyk left	20:56
	→ damccull joined	20:56
	→ nnyk joined	20:57
	← nnyk left	20:57
	← ropav left	20:57
	← lsiv568 left	20:57
fission6	how do i checkout a remote branch	20:58
darrennnn	_ikke_: ojacobson : thanks ill read. i guess this question is pretty common lol.	20:58
_ikke_	it is	20:58
	← tbxyz left	20:59
Seveas	fission6: git checkout remotename/branchname	20:59
	← mizu_no_oto left	20:59
_ikke_	That will leave you in a detached HEAD though	20:59
Seveas	indeed	20:59
fission6	thanks	20:59
	← zumba_addict left	20:59
Seveas	but my head doesn't feel very attached anyway :)	20:59
_ikke_	If you just do git checkout branchname, and there is no ambiguity, git will just create a branch on it though	21:00
	→ jargon joined	21:00
	← tesaf left	21:00
	← mustmodify left	21:00
	← d10n-work left	21:00
fission6	that seems towork oddly Seveas gives me a detached head	21:01
	← davividal left	21:01
grawity	that is normal when checking out remote-tracking branches.	21:02
	← livingstn left	21:02
	← King_Hual left	21:02
	→ pr0ton joined	21:04
fission6	hmmm	21:04
	→ LucasTT joined	21:04
	← mennea left	21:04
	← baweaver left	21:04
	→ mennea joined	21:05
	→ cads joined	21:05
	→ cjwilbur_ joined	21:05
_ikke_	Checking out anything except branches (refs/heads/foo), will leave you in a detached HEAD	21:05
Seveas	fission6: you can check out any sha/tag/ref, but only if it matches a local branch, will HEAD not be detached. So if you want an attached head, create a branch that matches (and possibly tracks) the remote one. e.g. git checkout -b local_branchname remotename/remote_branchname	21:05
	→ robarelli joined	21:05
fission6	will review	21:06
	→ ColKurtz joined	21:06
	→ hazeltree joined	21:06
	← milkohol left	21:06
darrennnn	can someone ELI5 what "export GIT_WORK_TREE=/deploy/dir" is	21:06
Seveas	in newer gits, git checkout branchname, will check if any remote/*/branchname exists and create a tracking branch for you if it does	21:06
fission6	so this is in a fab file to move some code over to a server, i kept getting merge commit editors popping up and i relized it was because if my server was on branch topic-A and i told it to pull topic-B, well I was merging! ideally i want to checkout a branch and then pull	21:07
Seveas	darrennnn: that doesn't parse...	21:07
	→ stevenvalladolid joined	21:07
	← hazeltree left	21:07
darrennnn	Seveas: sorry? i dont understand	21:07
_ikke_	fission6: Automatic pulling leads to pain	21:07
	← jerius left	21:08
Seveas	darrennnn: that's what I was saying :)	21:08
fission6	whts the best way to issue commands to say hey, i need you to checkout out branch-whatever and if you don't haveit get it from origin, then pull latest code, right now i have git checkout somebranch, and then git pull origin somebranch	21:08
	which is fine if the branch already exists and is being tracked ont he box	21:08
Seveas	fission6: !xy	21:08
gitinfo	fission6: Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...	21:08
	← mikehaas763 left	21:08
darrennnn	Seveas: .... it's in the "git as a deployment tool" guide that i was just sent.	21:08
_ikke_	darrennnn: It sets an environment variable, which gits read over override the work tree directory	21:08
	← cjwilburn left	21:09
	← jdrumheller left	21:09
	← cuppscakes left	21:09
	← cjwilbur_ left	21:10
	← robarelli left	21:10
	← pcypher left	21:10
darrennnn	_ikke_: so if my shared environment the folder lives at "~/www/git_tracked_folder" i should "export GIT_WORK_TREE=/www/git_tracked_folder" ?	21:10
	shared hosting environment	21:10
fission6	i want to make sure i am on a specific branch before i pull	21:11
	← jason237 left	21:11
fission6	when issuing remote commands using a fabfile	21:11
	→ Cheaterman1 joined	21:11
_ikke_	It should be the directory where the webserver looks	21:11
Seveas	automated pulling is not a good idea	21:11
_ikke_	git checkout <branch>	21:11
	← Mixologic left	21:11
Seveas	fission6: are you trying to !deploy?	21:11
gitinfo	fission6: 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	21:11
	→ jason237 joined	21:11
fission6	yes it is	21:12
	well its widly used, haha	21:12
Seveas	fission6: no it is not a good idea.	21:12
	← doitjay left	21:12
	→ hexagoxel joined	21:12
	← Not_Whatever left	21:12
fission6	how do you deploy your code then Seveas	21:12
	← aswen left	21:12
	← noxd left	21:12
_ikke_	I use capistrano	21:12
Seveas	definitely not with git pull. either git-deploy (at work) or git archive (for simpler things)	21:12
	→ pcypher joined	21:12
fission6	_ikke_: what do you do inside of capistranro your answer is pretty ambiguas	21:14
	→ zumba_addict joined	21:14
_ikke_	I use a plugin called railsless-deploy, but other than that, use the default strategy	21:15
darrennnn	ugh this shit is so complicated. i just don't understand it.	21:16
	sigh	21:16
	← gccostab_ left	21:16
	→ doitjay joined	21:16
	← danemacmillan left	21:16
	← ojacobson left	21:16
Seveas	darrennnn: then don't use git for deploying, but an actual deployment tool	21:16
_ikke_	fission6: It basically places the code in a timestamped directory, and then symlinks it to the webroot	21:16
darrennnn	Seveas: an actual deployment too is even MORE complicated	21:17
Seveas	well, that's what you get paid for :)	21:17
	← upene left	21:17
fission6	_ikke_: how does it place the code, thats sort of the whole point of my question	21:17
_ikke_	darrennnn: git archive, and extract it to your webdir	21:17
	← mscook left	21:18
fission6	rad	21:18
darrennnn	_ikke_: obviously i'm hopeless because i don't see what that gets me. the idea is to simply push a new update and have it work instantly. one step from my desktop.	21:19
	i might as well ftp up a zip	21:19
	← Ankhers left	21:20
_ikke_	darrennnn: If that works for you :-)	21:20
	← Droolio left	21:20
jrnieder	darrennnn: yep, git was not invented as a deployment tool	21:20
	it turns out different kinds of deployments have different requirements	21:20
	→ kballou joined	21:20
jrnieder	so some people use a package manager, some people use something like rsync, some people ftp up a zip :)	21:21
	← hebz0rl_ left	21:21
darrennnn	at the end of the day all i want to do is have a directory with simple html and css and what not and be able to push to it. i don't necessarily understand the "not a deployment tool" rally cry for my relatively simple needs.	21:22
	so yeah i get it, in over my head, obviously i should stick to ftping everything.	21:22
jrnieder	well, no, you should stick to rsyncing everything. :)	21:22
	← dccc left	21:22
jrnieder	it's like if you talk to some wrench afficionados and say it's doing a bad job of drilling a hole in the wall	21:22
	← DrShoggoth left	21:23
	← Mso150_u_n left	21:23
	← zumba_addict left	21:23
Seveas	jrnieder: but if you look at a wrench in just the right way, it does look like a drill!	21:23
	→ zumba_addict joined	21:24
darrennnn	nah i mean simple example i have clients 1 2 and 3 on their own hosting packages. i use a color-picker for all three sites that lives in a folder /color-picker/ in the root of each.	21:24
	← evildmp left	21:24
darrennnn	so when i update it, now i'm ftping to 3 sites. rather than having 3 sites pull the change.	21:25
	← pandeiro left	21:25
darrennnn	is that a crazy bad way to look at it?	21:25
_ikke_	fission6: capistrano uses git too. It fetches master, and then uses git reset --hard	21:25
fission6	what do you mean	21:25
_ikke_	fission6: Then it extracts those files to the timestamped dir	21:25
Seveas	darrennnn: no, but that's already different than your original deployment needs. And everybody's needs are different, so ther are different deployment tools.	21:25
fission6	isn't that using git to deploy	21:25
Seveas	Git is not one of them.	21:25
	fission6: it uses git to prepare the deploy, not to actually deploy.	21:26
	→ Mso150 joined	21:26
darrennnn	Seveas: it's not any different than my original deployment needs. it's exactly what i said above unless i misrepresented myself somehow unclearly.	21:26
fission6	why are peopel so against git being a dpeloyment tool, part of its value prob is distributing code right	21:26
_ikke_	fission6: No, it uses git to get the latest data. The deploy happens after it	21:26
fission6	how do you deploy the code	21:26
	how are you moving the code from one box to the other	21:26
Seveas	rsync	21:26
	→ zumba_ad_ joined	21:26
	← zumba_addict left	21:27
Seveas	hundreds of rsyncs to hundreds of boxes, coordinated with func	21:27
fission6	func?	21:27
Seveas	func	21:27
_ikke_	fission6: it's not the sync part that's the problem, it's the consquent deployment part	21:27
	→ martinklepsch joined	21:27
	← kukks left	21:27
Seveas	an obsolete RPC system from fedora. We'll be moving to salt.	21:27
_ikke_	git pull inside a webroot for example	21:27
	← hexagoxel left	21:27
	← zumba_ad_ left	21:27
	→ zumba_addict joined	21:28
fission6	^ what	21:28
	→ it0a_ joined	21:28
	→ palcu joined	21:29
_ikke_	fission6: That's what people try to do. Put a repository in the webroot, and then use git pull to update (or push from another repo)	21:29
	← it0a_ left	21:29
fission6	thats using git to deploy!	21:30
	_ikke_: i get that i am asking how you move code from one box to another	21:30
	your answers suck btw to all my questinos	21:30
	← irqq left	21:30
_ikke_	fission6: No need to be rude here	21:30
fission6	ok	21:30
	← tristanp left	21:31
_ikke_	In my case, I push my code to a repo on the server, and capistrano uses that to deploy it to the webroot	21:31
	← roaet left	21:31
	← it0a left	21:32
	← palcu left	21:32
_ikke_	They are two seperate steps	21:32
	← aard_ left	21:32
	← thedodd left	21:32
	← zumba_addict left	21:32
	→ palcu joined	21:32
darrennnn	so _ikke_ i dont understand what advantage or risk that prefvents as opposed to pushing to repo, and then pushing to a "deploy" branch that the server is on	21:32
	do you mind explaining that?	21:32
fission6	darrennnn: i dont think he understands the notion of using git to deploy	21:32
Seveas	mine has some more step: developer does git pull on staging server, tests, calls git-deploy to tag the release and then another tool to do the rsync and coordinated restart dance	21:33
	darrennnn: pushing doesn't update a working tree, so it doesn't deploy anything	21:33
darrennnn	fission6: respectfully, im sure he does i just am not connecting the dots and maybe you too	21:33
	← mennea left	21:34
	← pheaver left	21:34
_ikke_	Deploying commonly involves more then just updating files. Using just git to 'deployments' is bound to leave you in an inconsistent state (files that don't get deleted for example)	21:34
Seveas	darrennnn: you're trying to connect unconnectable dots. Version control and code deploy are two different things with different requirements. Use appropriate tools for each. git is appropriate for version control, not for deploying.	21:35
	← fabiobik left	21:35
darrennnn	Seveas: i just dont understand especially on a developer environment why in the world it would require developers to manually PULL a change to test it unless you wanted to test a branch.	21:35
	which... arent you doing that locally?	21:35
Seveas	_ikke_: also: server restarts, loadbalancer actions, schema changes... :)	21:35
thibaultcha	The git bot says to read this, I've read it one day and I think they make some good points. http://gitolite.com/deploy.html	21:35
	→ mennea joined	21:35
	→ d2dchat joined	21:35
	→ Mso150_l joined	21:35
_ikke_	Seveas: Indeed	21:36
darrennnn	Seveas: you're speaking in riddles. at the end of the day i want the files on my server to look like the files on my machine. (permission issues aside)	21:36
_ikke_	Things like cache breakers	21:36
	→ HanClinto__ joined	21:36
	→ evildmp joined	21:36
Seveas	darrennnn: that's a very limited view of what deploying is.	21:36
_ikke_	Seveas: though, common the reality on shared hosting	21:36
	← palcu left	21:37
	← nettoweb left	21:37
darrennnn	Seveas: that's my view from here. i dont need it for anything else. say i develop a wordpress theme or something simple. it lives in /wp-content/themes/my_git_tracked_theme/	21:37
	← FunkyAss left	21:37
	← Mso150 left	21:37
darrennnn	nothing more nothing less really.	21:37
	← roflik left	21:37
Seveas	well, if you use wordpress you have bigger issues :)	21:38
	ok, low blow, sorry.	21:38
jrnieder	darrennnn: I think what you want is reasonable	21:38
darrennnn	or lets say i'm working on something more complicated like a set of classes that i use for multiple sites. again, i want them all updated on 5 different client websites.	21:38
Seveas	darrennnn: then don't bother with deploying. Just git pull manually.	21:38
jrnieder	darrennnn: it's possible some day someone will teach "git push" to do that	21:38
	darrennnn: Johannes Schildelin wrote a rough patch to do it before	21:39
	darrennnn: the trouble is, there are cases where that does confusing things	21:39
Seveas	jrnieder: push --update-work-tree?	21:39
	← dgpalmer left	21:39
jrnieder	it was just 'push' into the checked out branch of a non-bare repository	21:39
Seveas	eww	21:39
	← HanClinto_ left	21:39
jrnieder	yeah, blocking the push is a better behavior	21:39
	I think this patch was before git knew to block the push	21:40
_ikke_	The problem is that you often have to deal with things like configuration files and cache files / assets / uploads, so the files on the server are almost never going to be exactly the same as you have them locally	21:40
	→ Hello_ joined	21:40
	→ baweaver joined	21:40
jrnieder	so, as a user, the basic task is to figure out what you want to happen during deployment	21:40
	→ mellernoia joined	21:40
jrnieder	then the usual building blocks for automating that are actually pretty straightforward	21:40
darrennnn	but _ikke_ isn't that handled in git by not modifying untracked files?	21:40
jrnieder	the hard part is figuring out what you want to happen (ordering, what to do with untracked files, etc etc)	21:40
_ikke_	darrennnn: What about files you have deleted?	21:41
jrnieder	as lots of people mentioned before, http://gitolite.com/deploy.html does an excellent job of explaining the building blocks	21:41
	← DARSCODE left	21:41
	← evildmp left	21:41
_ikke_	In your repo, that shouldn't be there anymore	21:41
jrnieder	unfortunately there's no way around just reading something like that, internalizing it, and making choices	21:41
	there's no one way to deploy	21:41
	→ dgpalmer joined	21:41
darrennnn	_ikke_: this may be due to unfamiliarity with git in general, but doesn't git know when you delete a tracked file? making it a different case than it being untracked?	21:41
jrnieder	in the case of local changes, detecting the local changes is not the hard part	21:42
	the hard part is figuring out what should then happen	21:42
	do you block deployment?	21:42
_ikke_	What my deploy process does is just basically a fresh checkout every time, and then symlink the things that you need to keep (config files, cache, etc)	21:43
	← mennea left	21:43
_ikke_	(checkout being a copy of all the files in a new dir)	21:43
	→ oojacoboo joined	21:43
darrennnn	what i don't understand from that guide is how the process actually works. is this set up automatically somehow, or is this manually controlled through a push on my end. am i executing git commands from my machine or sshing into the server and doing them. that's where my confusion with that gudes lies... but ill read it again.	21:43
	→ gccostabr joined	21:43
_ikke_	darrennnn: Most of the time, this is triggered in a git post-receive hook	21:44
	That has been put on the server	21:44
	← jeremyheiler left	21:44
Seveas	and in our case by hand	21:44
darrennnn	_ikke_: is a post-receive hook set up on the server, or the repo, or on my machine?	21:44
_ikke_	darrennnn: on the repo on the server	21:44
jrnieder	the server. see man githooks	21:44
gitinfo	the githooks manpage is available at http://jk.gs/githooks.html	21:44
darrennnn	oh okay you answered	21:44
	← iamjarvo left	21:44
_ikke_	Seveas: Yeah, my case too	21:45
	I'm calling it a day	21:45
	later	21:45
Seveas	enjoy your weekend!	21:45
darrennnn	_ikke_: thanks i do genuinely appreciate it	21:45
_ikke_	thanks	21:45
	→ pheaver joined	21:46
darrennnn	i know youre taking your time, all of you. i'm just dumb and dont know this stuff.	21:46
_ikke_	darrennnn: you're welcome. Sucess with deploying	21:46
	darrennnn: Not dumb, just inexperienced	21:46
	← SethM left	21:46
	→ zumba_addict joined	21:46
	← pr0ton left	21:47
cablop	to solve my issue...	21:47
	i cannot perform some rebase and merges properly...	21:47
	→ m0viefreak joined	21:48
cablop	should i globally set autocrlf = true, then reset hard my current heads, then merge and/or rebase?	21:48
	→ hmsimha_ joined	21:48
	→ evildmp joined	21:48
	← chessguy left	21:49
	← evildmp left	21:49
	← _Atom_ left	21:49
	→ [M7] joined	21:49
	→ ropav joined	21:50
	← n-st left	21:51
	→ ncthom91 joined	21:52
	→ SethM joined	21:52
	← ropav left	21:53
	→ nour joined	21:53
	→ ropav joined	21:54
	← killtheliterate left	21:54
	← Neozonz left	21:55
	→ Neozonz joined	21:55
	← mueslo left	21:55
	← joelrobichaud left	21:56
	→ evildmp joined	21:56
	→ mueslo joined	21:57
	← TheFuzzball left	21:57
	→ mizu_no_oto joined	21:58
	→ olspookishmagus joined	21:59
	← paul424 left	21:59
	→ nettoweb joined	21:59
	← nettoweb left	21:59
	→ nettoweb joined	22:00
	→ gfixler joined	22:00
Steve_Jobs	cablop: set it to false	22:00
	don't let scm manipulate your line endings	22:00
	rely on parameters to ignore them as differences	22:01
	let the editors on each platform handle them as needed	22:01
	→ pcypher_ joined	22:01
cablop	Steve_Jobs: i have the problem that a rebase is failing because of that! and i cannot pass parameters to the inner instructions	22:01
	← r0bby_ left	22:02
	→ killtheliterate joined	22:02
	← fission6 left	22:03
Steve_Jobs	cablop: why are you rebasing?	22:04
	← ropav left	22:04
Steve_Jobs	try adding this strategy: -s recursive -Xignore-space-at-eol	22:04
	← PaulCapestany left	22:05
Steve_Jobs	or this if that doesn't work: -Xignore-space-change	22:05
	← pcypher left	22:05
	← revyd left	22:05
	→ teran_ joined	22:05
Steve_Jobs	but this seems to be the modern way of doing things: -s recursive -X renormalize	22:06
	← treehug88 left	22:06
	← wakd left	22:06
	→ wakd joined	22:06
	→ PaulCapestany joined	22:07
Steve_Jobs	you could also touch all files making them have the same endings	22:07
	← teran left	22:07
Steve_Jobs	find . -exec touch {}\;	22:07
	← hmsimha_ left	22:07
	→ revyd joined	22:08
Steve_Jobs	but from then on don't rely on autocrlf=true. Set it to false and let the editors be configured to what they need	22:08
	← hagabaka left	22:08
	← zumba_addict left	22:09
	← sohail left	22:10
	← martinklepsch left	22:10
	← jenni_naiaretti left	22:11
	→ zumba_addict joined	22:11
	→ hagabaka joined	22:11
	→ booboy joined	22:12
	← mizu_no_oto left	22:14
	← Neozonz left	22:15
	← PinkSpecs left	22:16
	→ jenni_naiaretti joined	22:17
	← acharlieh left	22:18
	→ EminenceHC joined	22:18
	← Kicer86 left	22:20
	→ _Atom_ joined	22:20
	← Cheaterman1 left	22:21
	← pheaver left	22:21
	→ mizu_no_oto joined	22:22
	← mdel left	22:22
	← nettoweb left	22:22
	← EminenceHC left	22:22
	→ nettoweb joined	22:23
	← Quevin left	22:23
	← nettoweb left	22:23
	← naturally left	22:25
	→ nettoweb joined	22:26
	→ liamkeily joined	22:27
	← liamkeily left	22:28
	→ jfran joined	22:28
	→ liamkeily joined	22:28
	← kermit left	22:29
	← kevin-brown left	22:29
	→ kevin-brown joined	22:29
	→ kermit joined	22:30
	← mike_af left	22:30
	← sevenless left	22:32
	← nour left	22:32
	← _Atom_ left	22:32
	← d2dchat left	22:32
	→ pheaver joined	22:33
	← pcypher_ left	22:33
	← ockham left	22:34
	← listochkin left	22:35
	→ listochkin joined	22:36
	→ bezet joined	22:36
	→ Thorn joined	22:36
	← sqrrl left	22:36
	← darrennnn left	22:36
	← zumba_addict left	22:38
	← bezet left	22:40
	← listochkin left	22:40
	→ ropav joined	22:41
	→ sqrrl joined	22:41
	→ danemacmillan joined	22:42
	→ Neozonz joined	22:42
	← Neozonz left	22:42
	→ Neozonz joined	22:42
	→ eletuchy joined	22:42
	← ropav left	22:43
	→ Manny_ joined	22:43
	← Manny left	22:43
	→ doitjay_ joined	22:44
	← lun__ left	22:44
	← vire left	22:45
	← doitjay left	22:47
	→ toothrot joined	22:47
	→ Segfault_ joined	22:48
	← kpease left	22:48
	→ Geo joined	22:48
	→ endiruna joined	22:48
Geo	I'm looking to merge my develop branch into my master, and I'm noticing some people advise first merging master to develop, then back to master. What is the logic behind this?	22:49
	← doitjay_ left	22:49
	← SumDude left	22:50
	← msmith_ left	22:52
	→ afhammad joined	22:52
	Xack → spanner	22:52
	← jfran left	22:53
xender	Geo: doesn't look as a sensible workflow in general for me	22:54
	THere might be some specific use case	22:54
	← maestrojed left	22:55
	→ Malsasa joined	22:57
	← Neozonz left	22:57
	← tang^ left	22:58
	← evildmp left	23:00
	← smccarthy left	23:01
	→ cads2 joined	23:02
	→ gfg joined	23:02
	← jenni_naiaretti left	23:02
	← gfg left	23:02
	← WaReZ left	23:04
	→ tristanp joined	23:05
	← pheaver left	23:05
	→ ropav joined	23:05
	← jonmorehouse left	23:06
	→ miceiken joined	23:06
	→ evildmp joined	23:07
miceiken	What happens if I do git add and then not commit? Do I need to reset somehow?	23:07
	→ zumba_addict joined	23:07
	→ jfcaron joined	23:07
	← liamkeily left	23:07
	→ robarelli joined	23:07
	→ Quevin joined	23:07
	← kriks left	23:08
jfcaron	I have a local clone of a repo, and I made some changes, but now I want to also pull in more recent changes from upstream. How do I do that?/I don't know the proper terms to search for this.	23:08
	← a_le left	23:09
	← eletuchy left	23:10
	← ropav left	23:10
	→ eletuchy joined	23:10
	→ jonmorehouse joined	23:10
	→ ropav joined	23:10
	← epifanio left	23:11
	← shizzle left	23:11
	← eburcat left	23:11
	→ eburcat joined	23:12
	← robarelli left	23:13
	← evildmp left	23:14
	← ropav left	23:14
	→ evildmp joined	23:14
	← evildmp left	23:14
tobiasvl	miceiken: you don't have to do anything, no. what do you mean? the changes will be staged but not commited.	23:15
	→ evildmp joined	23:15
tobiasvl	jfcaron: !sync	23:15
gitinfo	jfcaron: [!fork_sync] You can read a nice guide on how to update your fork with the upstream repository here: https://help.github.com/articles/syncing-a-fork	23:15
	← eletuchy left	23:15
miceiken	how do i "unstage" them?	23:15
jfcaron	When I did "git clone", that's not the same as a fork, is it?	23:15
tobiasvl	jfcaron: or if you mean you just want to pull from origin, just pull. the changes from the upstream will be fast forward merged (unless there's a conflict)	23:16
	← killtheliterate left	23:16
tobiasvl	jfcaron: a "fork" is a #github concept. but no. a clone is not a github fork.	23:16
	← Hello_ left	23:16
tobiasvl	it can be considered a fork of the code, of course. git is distributed. your clone can diverge from the upstream and thus become a true fork of the source	23:16
	miceiken: !unstage	23:17
gitinfo	miceiken: To unstage a file from the index(in other words, to undo an accidental `git add foo/bar.txt`), use: git reset -- foo/bar.txt	23:17
miceiken	thanks	23:17
	← tristanp left	23:18
	← imkmf left	23:18
dgpalmer	trying to use the techniques in here….http://blogs.atlassian.com/2013/05/alternatives-to-git-submodule-git-subtree/	23:19
	← nonmadden left	23:19
dgpalmer	but i am getting this error when i try to update my subproject	23:19
	tangle001 $ git subtree pull --prefix docroot/sites/all/modules/custom/iga_album_release/ igaalbumrelease master --squash	23:19
	From https://bitbucket.org/interscoperecords/iga_album_release	23:19
	* branch master -> FETCH_HEAD	23:19
	fatal: entry not found in tree 2d6be611a194c4a01389c35ce2248ea5b054b3f6	23:19
	any ideas?	23:19
	→ EminenceHC joined	23:19
	← Sivil left	23:21
	→ ropav joined	23:21
	← refried_ left	23:22
	→ madewokherd joined	23:22
	→ jenni_naiaretti joined	23:23
	← logix812 left	23:24
	← EminenceHC left	23:24
	→ refried_ joined	23:25
	→ moritzs joined	23:27
	← danemacmillan left	23:28
	← ropav left	23:28
	→ ferreum_` joined	23:28
	→ pwnz0r joined	23:28
	→ kukks joined	23:29
	→ brandonw joined	23:30
	← ferreum` left	23:30
	→ ropav joined	23:31
	← xSmurf left	23:32
	← ferreum_` left	23:33
	← pwnz0r left	23:34
	← mizu_no_oto left	23:34
	← jottr left	23:35
	← HanClinto__ left	23:35
	← ropav left	23:36
	gitinfo set mode: +v	23:37
	→ ropav joined	23:37
ncthom91	hi all. Can anyone explain to me why git's hash algorithm is this: http://stackoverflow.com/a/552725?	23:37
	← jenni_naiaretti left	23:37
	← jgardella left	23:37
ncthom91	particularly, why "blob" and the filesize?	23:37
	and the null byte?	23:37
	→ jottr joined	23:37
	← ropav left	23:37
	→ ropav joined	23:37
	→ dccc joined	23:38
	← afhammad left	23:38
	← Dougie187 left	23:39
jrnieder	ncthom91: why not? ;-)	23:39
ncthom91	jrnieder does it decrease the chance of collision at all?	23:40
	not that that chance is very high to begin with...	23:40
	→ thesquib joined	23:40
	← ropav left	23:40
	→ tmcmahon joined	23:40
	← brandonw left	23:41
	→ brandonw joined	23:41
	→ eletuchy joined	23:42
	← ErKa left	23:42
	→ ropav joined	23:43
	← nfk left	23:44
	→ magic_ joined	23:45
	← ropav left	23:45
	← tincan left	23:46
	← Baluse left	23:46
	→ ferreum_` joined	23:47
	← anaran left	23:47
	← zumba_addict left	23:47
	→ zumba_addict joined	23:48
	→ ropav joined	23:48
	← cablop left	23:48
	← btanaka left	23:48
	→ Baluse joined	23:49
	← nettoweb left	23:51
	→ Mitchbones joined	23:51
	← ianbrandt left	23:51
	← ferreum_` left	23:52
	← ropav left	23:52
	→ ropav joined	23:54
	← kukks left	23:54
	→ NfNitLoop joined	23:54
	→ Neozonz\|Disc joined	23:55
	→ amikiri joined	23:55
NfNitLoop	Do I remember correctly that there's some git command you should (periodically?) run to optimize your git repo for serving via HTTP? I'm googling but not finding anything. Wondering if I'm losing my mind. :p	23:56
	← Quevin left	23:58
	← ropav left	23:59

Logs Search ←Prev date Next date→

Channels Documentation