IRCloggy #git 2014-11-19

Provider of IRC logs since 2005.

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

	2014-11-19
	offby1 sure loves him some "fixup"	00:02
	← ende___ left	00:02
	← akushner left	00:03
toothe	if I want to commit an entire directory's worth of changes, the first step would be 'git add .' correct?	00:03
	→ ende___ joined	00:03
offby1	yep	00:03
	← King_Hual` left	00:03
toothe	hm.., that complains.	00:03
offby1	So do I.	00:04
	← ncthom91 left	00:04
toothe	says I need to do maybe git --all or --ignore-removal.	00:04
offby1	♭♩ ♯♪ "I can't complain, but sometimes I still do" -- Joe Walsh ♫ ♬	00:04
	never heard of those :-\|	00:04
	!transcript	00:04
gitinfo	[!repro] 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%.	00:04
	→ tokik joined	00:05
	→ galaris joined	00:05
	← pmallya left	00:06
	← fairuz1 left	00:06
	→ alanwill joined	00:06
	← CheckDavid left	00:07
	← decompiled left	00:07
	→ ncthom91 joined	00:07
	→ thierryp joined	00:09
	→ mmitchell joined	00:10
toothe	I really like git now....	00:10
	→ krixxkraxx joined	00:10
	← galaris left	00:14
	→ mribeirodantas joined	00:14
	← thierryp left	00:14
	← mmitchell left	00:15
	← bracero left	00:15
	→ bracero joined	00:16
	← bracero left	00:16
	← okanck left	00:16
	← corni left	00:18
	→ checkItOut joined	00:19
	← m0viefreak left	00:19
	← maestrojed left	00:20
	← milli` left	00:20
	→ mikecmpbll joined	00:21
	→ milli` joined	00:21
	→ thierryp joined	00:21
	← WaReZ left	00:21
	← aspiers left	00:23
	→ solker joined	00:24
	← ciampix left	00:25
	← thierryp left	00:26
	→ hexagoxel_ joined	00:26
	← wagle left	00:26
	← checkit left	00:26
	→ og_wolf joined	00:27
Bilge	kadoban: it's clearer which revision the submodule is pointing at	00:28
	→ jb55_ joined	00:28
	← milli` left	00:28
	← hexagoxel left	00:29
	← solker left	00:29
	← netcarver left	00:30
	← thiago left	00:31
	← jb55 left	00:32
	← pheaver left	00:33
	→ thiago joined	00:35
	← Raverix left	00:35
	→ Raverix joined	00:36
	← philipandersen left	00:38
	→ asfdfdfd_ joined	00:39
	→ longneckbeard joined	00:39
	← mikecmpbll left	00:40
	→ CheckDavid joined	00:40
	← thiago left	00:41
	← russt left	00:42
	← checkItOut left	00:42
	← tyreld left	00:42
	→ darkbasic_ joined	00:43
	← darkbasic left	00:43
	← liamkeily left	00:44
	← endiruna left	00:44
	← ClarusCogitatio left	00:45
	→ wagle joined	00:46
	← s8321414 left	00:47
	← blackmesa left	00:47
	→ gargola joined	00:47
	→ J1G\|Anon126 joined	00:48
	← chrisshattuck left	00:49
	J1G\|Anon126 → Anon126	00:49
	→ mtscout6 joined	00:49
	→ darkbasic joined	00:49
	→ ClarusCogitatio joined	00:50
	→ _Atom_ joined	00:50
	← toothe left	00:50
	← darkbasic_ left	00:51
	Anon126 → J1G\|Anon126	00:51
	→ m0ltar joined	00:51
	jdav → jdav_gone	00:51
	← acharlieh left	00:52
	← jdav_gone left	00:52
	← mtscout6 left	00:52
	← ClarusCogitatio left	00:54
	→ ncthom91_ joined	00:55
	→ Lyqyd joined	00:55
	← ncthom91 left	00:55
	← og_wolf left	00:55
	→ mr_chris joined	00:56
	→ rchavik joined	00:56
	→ mikecmpbll joined	00:56
mr_chris	What's the proper way to loop through branches in a bash script?	00:57
	← mizu_no_oto left	00:57
	← mikecmpbll left	00:57
	← gregsmith left	00:57
	← meanderer left	00:57
	→ zumba_addict joined	00:57
	→ Cassiel joined	00:58
	← baweaver left	00:58
	← danemacmillan left	00:59
	← _Atom_ left	00:59
	← ManikM left	01:01
	→ ManikM joined	01:01
	→ bracero joined	01:04
	← Skapadapaduu left	01:04
	→ sumanto joined	01:04
	← ende___ left	01:04
	← harish left	01:04
	← sumanto left	01:05
mattcen	mr_chris: I'm not sure if there's a proper way. I have some pretty robust ways to do it	01:05
	mattcen goes hunting	01:05
	← bracero left	01:05
	→ thiago joined	01:06
	→ msmith_ joined	01:06
	→ bracero joined	01:06
	← bracero left	01:06
mr_chris	mattcen, Thanks. The goal is to loop through all branches and update a single file on them all.	01:06
	→ bracero_ joined	01:06
	← tokik left	01:06
mr_chris	Somehow "for remove it `git branch -r`" just feels wrong.	01:07
	*for remote	01:07
	← J1G\|Anon126 left	01:07
mattcen	That's because it is :)	01:07
	→ sohail joined	01:07
	→ Anon126 joined	01:07
	→ pheaver joined	01:07
mr_chris	At least my instincts are good.	01:08
	Anon126 → J1G\|Anon126	01:08
	← hexagoxel_ left	01:08
	→ _Atom_ joined	01:08
mattcen	Something like the following, which is untested:	01:09
	while read -r branch; do git checkout "${branch##/}"; sed -i 's/broken/fixed/' dodgyfile.txt; git add dodgyfile.txt; git commit -m "Fix broken thing"; done <(git branch -r \| sed 's/^..//; s/ ->.//; /HEAD/d')	01:09
	Let me know which parts, if any, you don't understand	01:09
	→ jb55 joined	01:09
mr_chris	OK. Checking it out.	01:09
	← longneckbeard left	01:09
	← buffal0 left	01:09
	→ jerius joined	01:09
	← jerius left	01:10
	← Mark_ left	01:10
	← mribeirodantas left	01:10
	→ mribeirodantas joined	01:11
	← thiago left	01:11
	→ mmitchell joined	01:11
	← jb55_ left	01:11
	← NBhosting left	01:12
	← dreiss left	01:14
mr_chris	mattcen, Makes sense. I only have one question about how the checkout there works. Just need a second to poke it some more before I ask.	01:14
	→ r0bby_ joined	01:14
	← imachuchu left	01:14
	← robustus left	01:14
	← robbyoconnor left	01:14
mattcen	mr_chris: keep in mind that if it looks wrong, it could be because it is; as I said, I didn't test it.	01:14
	→ ome joined	01:14
	← _Atom_ left	01:15
	→ mizu_no_oto joined	01:15
mattcen	Oh, you mean the "${branch##*/}" bit?	01:15
	← a_le left	01:15
	→ robustus joined	01:16
mr_chris	Yes.	01:16
	← mmitchell left	01:16
	← aidalgol left	01:16
	← edk left	01:17
	→ edk joined	01:17
mr_chris	done < <(git branch -r \| sed 's/^..//; s/ ->.*//; /HEAD/d')	01:17
	rather than	01:17
	done <(git branch -r \| sed 's/^..//; s/ ->.*//; /HEAD/d')	01:17
	← shinnya left	01:17
	→ daito joined	01:18
mr_chris	Ah, your doing string replacement.	01:18
	Stripping off everything before the slash	01:18
	That is better than what I was doing. Thanks mattcen.	01:19
mattcen	mr_chris: Ah, good catch on the missing <	01:19
mr_chris	So http://dpaste.com/0H5PGNH	01:20
	At it's most basic.	01:20
	→ Ankhers joined	01:20
	→ aidalgol joined	01:20
mr_chris	*its	01:21
	→ thierryp joined	01:21
	→ palcu joined	01:21
mr_chris	That begins to work but then I get "Your local changes to the following files would be overwritten by checkout" a few branches in. I guess that's another issue entirely.	01:21
	← booboy left	01:23
mattcen	Huh. Odd.	01:23
	→ baweaver joined	01:23
	→ henditan joined	01:23
mr_chris	I'm so pissed at the devs I support right now. No remote branch management whatsoever. We have over a thousand.	01:24
	← desposo left	01:24
mr_chris	One for every ticket they've worked on since we've started using git.	01:24
	→ solker joined	01:25
	← thierryp left	01:25
mattcen	mr_chris: Yuck. I have a clone of our repo that has a copy of all our branches (ever?), but the production version gets pruned semi-regularly	01:25
mr_chris	Ours gets pruned semi-never. I'm aiming to change that.	01:26
mattcen	Good luck!	01:26
	← palcu left	01:26
	→ ajustrun joined	01:27
	← ColdKeyboard left	01:27
	← pheaver left	01:27
mr_chris	Thanks again.	01:27
mattcen	No problem	01:27
	mr_chris: for reference, #bash could also probably have helped with this problem; that would help ensure good bash code :)	01:28
mr_chris	Ah. Good call.	01:28
	→ btree joined	01:29
	← mellernoia left	01:29
	← solker left	01:29
	→ Nechradile joined	01:30
	→ fairuz joined	01:30
	→ reaverb joined	01:30
	← lindenle left	01:31
	← btree left	01:32
	← Xiti left	01:32
	← mribeirodantas left	01:33
	← SjB_ left	01:33
	→ BSaboia_ joined	01:33
	← Ajarm left	01:33
	→ SjB_ joined	01:34
	→ Ajarm joined	01:34
	← muthukumar left	01:35
	→ Xiti joined	01:35
	→ markgrady joined	01:35
	→ meanderer joined	01:35
	→ a_le joined	01:36
	← SjB_ left	01:36
	← ascarter left	01:36
	← Ajarm left	01:36
	→ SjB_ joined	01:37
	→ lpmulligan joined	01:37
	← LucasKA_ left	01:37
	← sgen left	01:39
	← EminenceHC left	01:39
	← Takle left	01:39
	← lpmulligan left	01:40
	← n-st left	01:40
	← jb55 left	01:41
	← SjB_ left	01:43
	→ tier joined	01:43
	← alanwill left	01:43
	→ SjB_ joined	01:44
	← Nechradile left	01:44
	← mkopriva left	01:45
	← asfdfdfd_ left	01:45
	→ jb55 joined	01:48
	← SjB_ left	01:49
	→ tmcmahon joined	01:49
	← r0bby_ left	01:50
	→ sgen joined	01:51
	→ fds4345 joined	01:52
	→ dialeth joined	01:53
	→ alanwill joined	01:53
	→ jason237 joined	01:53
	← ncthom91_ left	01:53
	→ crelix joined	01:55
	← hahuang61 left	01:55
	← crelix left	01:56
	→ SjB_ joined	01:56
	← rchavik left	01:56
	→ LucasKA_ joined	01:56
	← tmcmahon left	01:57
fds4345	I hear you can have custom tree objects in GIT? How would it distinguish between a tree that references objects on the filesystem and a tree that doesnt?	01:59
	← Ankhers left	01:59
	← SjB_ left	01:59
	→ n-st joined	01:59
	← jongleberry left	02:00
	← kpease left	02:00
	→ SjB_ joined	02:00
	← SLY1986 left	02:00
	← kballou left	02:00
	→ crelix joined	02:00
	→ EminenceHC joined	02:01
	← msmith_ left	02:01
	← SjB_ left	02:01
	→ SjB_ joined	02:01
	← d3ngar left	02:02
	← baweaver left	02:02
	→ tgunr joined	02:02
	← uidzer0 left	02:02
	→ wjiang joined	02:03
	← SumDude left	02:03
	← Nijikokun left	02:03
	← in_deep_thought left	02:05
	← ajustrun left	02:05
	→ Nijikokun joined	02:06
	→ scriptThis joined	02:06
	→ muthukumar joined	02:07
	← jb55 left	02:08
	← EmmEight left	02:08
	→ jb55 joined	02:08
	← EminenceHC left	02:10
	← SjB_ left	02:10
	→ SjB_ joined	02:10
	← MattMaker left	02:12
	← anaran left	02:12
	← blubberbop left	02:12
	← markgrady left	02:12
	→ blubberbop joined	02:13
	← jb55 left	02:13
	→ reyha joined	02:14
	→ GoldenAngle joined	02:14
	→ tranzfuse joined	02:17
	← fustirge left	02:19
	← zacts left	02:20
	→ thierryp joined	02:21
	→ palcu joined	02:22
	← styly left	02:23
	→ n-st_ joined	02:24
	← n-st_ left	02:25
	→ n-st_ joined	02:25
	← mehem_ left	02:25
	→ solker joined	02:26
	← thierryp left	02:26
	← Sasazuka left	02:27
	→ mmitchell joined	02:27
	← palcu left	02:27
	← n-st left	02:28
	→ thiago joined	02:28
	← thiago left	02:30
	→ nnyk_ joined	02:30
	→ arup_r joined	02:30
	← solker left	02:30
	← arup_r left	02:31
	← joelm left	02:31
	→ watabou joined	02:31
	← mmitchell left	02:31
	← sohail left	02:31
	→ lindenle joined	02:32
	→ thiago joined	02:33
	→ ajustrun joined	02:34
	← BSaboia_ left	02:36
	← lindenle left	02:37
	← m0ltar left	02:38
	→ Takle joined	02:40
	→ Mark_ joined	02:41
	→ mmitchell joined	02:42
	→ smccarthy joined	02:43
	← fds4345 left	02:44
	→ gabedain joined	02:44
	← robustus left	02:44
	← gabedain left	02:44
	← Takle left	02:44
	→ robustus\|Off joined	02:46
	robustus\|Off → robustus	02:46
	→ sohail joined	02:47
	← ajustrun left	02:47
	Mercury_ → Mercury	02:50
	← tier left	02:50
	→ Goplat joined	02:51
	← daito left	02:51
	← Noldorin left	02:51
	→ dreiss joined	02:51
	→ ajustrun joined	02:52
	← mr_chris left	02:53
	← adamben left	02:54
	→ mr_chris joined	02:54
	← LucasKA_ left	02:55
	← ajustrun left	02:55
	→ LucasKA_ joined	02:55
	→ daito joined	02:55
	← GoldenAngle left	02:56
mr_chris	mattcen, Found one problem with your script.	02:56
	"${branch##*/}" assumes that no one put a / in the branch name.	02:56
	I've worked around it. Just FYI.	02:56
mattcen	mr_chris: Ah. Yes. Yes it does.	02:56
	← mr_chris left	02:56
	→ Ankhers joined	02:56
	→ arup_r joined	02:58
	→ uidzer0 joined	02:58
	← arup_r left	02:59
	← LucasKA_ left	03:01
	← ManikM left	03:01
	→ ManikM joined	03:01
	← johtso_ left	03:01
	→ harish_ joined	03:02
	→ milli` joined	03:02
	← Raverix left	03:02
	→ Raverix joined	03:03
	→ mr_chris joined	03:03
	bambams__ → bambams	03:03
	bambams → Guest45198	03:04
	← __main__ left	03:04
	Guest45198 → bambams__	03:05
	← amstan left	03:05
	→ weiyang joined	03:06
	→ LucasKA_ joined	03:06
	← darkbasic left	03:07
	→ darkbasic joined	03:07
mattcen	mr_chris: How did you work around it? Just switch to "${branch#remotes/origin/}" or similar?	03:09
	Or just git read of the second hash so it only strips a single path component; probably the most correct way to do it	03:10
	→ magic_ joined	03:10
mr_chris	mattcen, The ugly fast way because I want to go home.	03:11
	checkoutBranch=$(echo $branch \| sed "s/^origin\///")	03:11
mattcen	Ah. So the equivalent of "${branch#origin/}" :-)	03:11
	But going home is a good excuse!	03:11
mr_chris	Ah...	03:11
	→ johnny2600 joined	03:11
mr_chris	That would be much faster.	03:11
	Thanks.	03:11
mattcen	np	03:11
	← dreiss left	03:11
	← a_le left	03:12
mattcen	Parameter expansions are really handy, when you can understand their cryptic syntax!	03:12
	← mizu_no_oto left	03:13
	← luriv left	03:14
	→ __main__ joined	03:15
mr_chris	mattcen, They are. It's 10:14 PM here. Was just too tired to study into that further.	03:15
mattcen	mr_chris: Ouch, yeah, definitely a good time to be going home :). It's still 14:15 here, so my brain is in rather better condition than I think yours is :)	03:16
mr_chris	I just really don't want to deal with this in the morning.	03:16
mattcen	Best to get it done while it's fresh, huh?	03:17
	← Ankhers left	03:17
mr_chris	I'll never get any work done tomorrow otherwise. We have a vagrantFile and, as I stated earlier, terrible branch management. The devs are changing branches, updating an old version, and then bitching at me when vagrant stops working.	03:19
	← paulweb515 left	03:19
mr_chris	So I'm bandaiding it for tomorrow by updating that file in all branches.	03:19
	Until I figure out something better.	03:19
	← sgen left	03:20
	→ nkouevda joined	03:20
	→ LeMike joined	03:20
	→ thierryp joined	03:21
mattcen	mr_chris: I don't envy you.	03:22
	→ palcu joined	03:23
	→ zivester joined	03:24
	← crelix left	03:25
	← arnaud left	03:25
	→ crelix joined	03:26
	← thierryp left	03:26
	→ solker joined	03:26
	→ a_le joined	03:27
	← boombatower left	03:27
	← mmitchell left	03:27
	→ rchavik joined	03:28
	← palcu left	03:28
	← solker left	03:31
	→ CodeTroth joined	03:31
	← enitiz left	03:32
	→ mizu_no_oto joined	03:32
	→ enitiz joined	03:33
	← henditan left	03:36
	← awkwardusername left	03:36
	→ henditan joined	03:37
	← bracero_ left	03:38
	→ chrisshattuck joined	03:39
	→ Vasistha joined	03:39
	← LucasKA_ left	03:39
	← msonntag left	03:39
	Auv → PrincessAuv	03:40
Vasistha	I am trying to push to a github branch here: https://github.com/demerson3/fpGUI/tree/agg-bitbuf ... I am using the command, ``git push github tree/agg-bitbuf'' and getting an error, src refspec tree/agg-bitbuf does not match any.	03:40
	→ skorgon joined	03:41
	← skorgon left	03:41
	→ skorgon joined	03:41
	→ msonntag joined	03:41
	→ dreiss joined	03:45
	← FreezingCold left	03:45
J1G\|Anon126	Vasistha: You don't need the "tree" part in your command. That is only for Github	03:46
	``git push github agg-bitbuf'' should do it	03:47
	← mizu_no_oto left	03:49
	→ fatalhalt joined	03:49
Vasistha	J1G\|Anon126: I also tried that, but got the same error	03:50
	← CodeTroth left	03:51
	→ hahuang61 joined	03:51
	→ mizu_no_oto joined	03:51
J1G\|Anon126	what is the output of ``git remote -v''?	03:52
	← neunon left	03:52
Vasistha	J1G\|Anon126: http://paste.debian.net/132441/	03:54
	← tranzfuse left	03:54
	→ neunon joined	03:55
J1G\|Anon126	hm...	03:56
	It is the same error: "src refspec agg-bitbuf does not match any..."?	03:56
	Is that right?	03:57
	← adam12 left	03:57
	← eagles0513875_ left	03:58
Vasistha	J1G\|Anon126: yes.	03:59
	sorry, didn't see your message without the highlight	03:59
	→ FreezingCold joined	04:00
	→ adam- joined	04:00
J1G\|Anon126	Sorry, Vasistha	04:00
	→ ncd\|leeN joined	04:00
	→ EminenceHC joined	04:01
	→ MattMaker joined	04:01
	→ arnaud joined	04:01
Vasistha	J1G\|Anon126: oh! got it figured out. I had a note somewhere about how to do this. The local branch name is different, so I needed to specify both the local branch and the remote branch with a colon between them	04:01
	← hahuang61 left	04:01
J1G\|Anon126	Vasistha: Ah, there we are!	04:01
	← MattMaker left	04:01
	← zivester left	04:01
	← enitiz left	04:01
	← nb_bez___ left	04:02
	→ kcj joined	04:02
	→ enitiz joined	04:02
	→ akiva joined	04:03
	← variable left	04:04
	← leeN left	04:04
	→ AR45 joined	04:04
	→ subhojit777 joined	04:05
AR45	Say I wanted to set up my own private git server... how would I go about doing so?	04:05
	← sohail left	04:07
	← muthukumar left	04:07
	← daito left	04:08
	← EminenceHC left	04:09
	← Dougie187 left	04:10
	→ nephyrin joined	04:10
	← J1G\|Anon126 left	04:11
	← alanwill left	04:13
	→ dhilipsiva joined	04:14
	← dhilipsiva left	04:15
	← nnyk_ left	04:16
	→ maestrojed joined	04:17
	→ Drool joined	04:18
	← Droolio left	04:19
	→ punchagan joined	04:20
	→ thierryp joined	04:21
	← Consuela left	04:22
	← learner1 left	04:23
	→ learner1 joined	04:23
	→ kyb3r_ joined	04:24
	← reyha left	04:24
	→ Takle joined	04:25
	← bbloom left	04:25
	← thierryp left	04:26
	← aidalgol left	04:27
	← CheckDavid left	04:27
	→ Kulrak joined	04:27
	← Kulrak left	04:27
	→ Kulrak joined	04:27
	→ solker joined	04:27
	→ mmitchell joined	04:27
	← solker left	04:29
	→ solker joined	04:29
	← Takle left	04:29
	← teran left	04:31
	← ome left	04:31
	← causasui left	04:32
	→ bbloom joined	04:32
	→ causasui joined	04:32
	← akiva left	04:33
	← mmitchell left	04:33
	← solker left	04:33
	→ akiva joined	04:33
	← mizu_no_oto left	04:34
	← johnflux left	04:34
	→ thumpba joined	04:35
	← thumpba left	04:35
	→ thumpba joined	04:36
	→ tokik joined	04:39
	← ojacobson left	04:42
	→ eagles0513875 joined	04:43
	← Lyqyd left	04:43
	→ NoNMaDDeN joined	04:44
	→ styly joined	04:45
	→ mennea joined	04:45
	→ Lyqyd joined	04:46
	→ variable joined	04:46
	← smccarthy left	04:47
	← NaStYdoG left	04:49
	→ NaStYdoG joined	04:49
	← meanderer left	04:50
	→ alexh_ joined	04:52
	→ hahuang61 joined	04:54
	→ kriks joined	04:56
	→ saurabh joined	04:57
	saurabh → Guest9253	04:57
	← tinanoo left	04:57
	← akiva left	04:58
	→ ErKa joined	04:59
	→ tinanoo joined	04:59
	← kukks left	04:59
	→ faylite joined	05:00
	← crelix left	05:00
	← ManikM left	05:01
	→ ManikM joined	05:01
	→ r0bby_ joined	05:01
	→ daito joined	05:02
	→ akiva joined	05:02
	← Pyrogerg left	05:03
	→ tranzfuse joined	05:05
	→ iamjarvo joined	05:06
	→ booboy joined	05:08
	← tranzfuse left	05:10
	→ z8z joined	05:10
	← chrisshattuck left	05:11
	→ palcu joined	05:12
	← thumpba left	05:12
	→ Xethron joined	05:12
	← fatalhalt left	05:13
	→ jceb joined	05:14
	→ jstimm joined	05:15
	← jstimm left	05:15
	→ mennea_ joined	05:15
	← mennea left	05:16
	← smw left	05:16
	← diegoviola left	05:16
	→ EminenceHC joined	05:16
	← palcu left	05:17
	← TDJACR left	05:19
	→ jceb_ joined	05:20
	→ thierryp joined	05:21
	← EminenceHC left	05:21
	← n-st_ left	05:22
	← Lyqyd left	05:22
	→ irqq joined	05:23
	← johnny2600 left	05:25
	→ Lyqyd joined	05:25
	← thierryp left	05:25
	← jceb_ left	05:27
	← Xethron left	05:27
	→ jceb_ joined	05:28
	→ TDJACR joined	05:28
	→ solker joined	05:30
	→ Xethron joined	05:31
	← Xethron left	05:31
	→ Xethron joined	05:31
	→ teran joined	05:32
	← nephyrin left	05:32
	← Milk_weed left	05:32
	→ nephyrin joined	05:33
	← ManikM left	05:34
	← solker left	05:34
	← nephyrin left	05:34
	← jceb_ left	05:35
	← jceb left	05:35
	← nkouevda left	05:35
	→ nephyrin joined	05:35
Eugene	AR45 - that depends upon your needs. ssh:// access only, or a web GUI is the big question	05:35
	→ nkouevda joined	05:35
	← weiyang left	05:35
AR45	both	05:36
	gui preferably	05:36
Eugene	!host_gui, with !gitblit being my personal preference.	05:36
gitinfo	There are several options for self-hosting git repositories with a web GUI: !gitblit !gitlab !gitorious !rhode_code and !gerrit. Keep in mind that these all take far more work than a (non-GUI) !gitolite install.	05:36
	Gitblit is an open-source, multiplatform Git server written in Java, available both as a standalone and as a WAR file to be ran in other Java web servers. Though it's very easy to set up, it offers many features such as a neat web UI, sophisticated authentication options including LDAP, Groovy script support, a GUI-based management tool and upcoming, WIP features such as "tickets" (similar to pull requests).	05:36
Eugene	For non-GUI, !gitolite is the go-to	05:36
gitinfo	Gitolite is a tool to host git repos on a server. It features fine-grained access control, custom hooks, and can be installed without root. Download: https://github.com/sitaramc/gitolite Docs: http://gitolite.com/gitolite/	05:36
	← nkouevda left	05:36
	← teran left	05:36
	→ durre joined	05:39
	→ ManikM joined	05:40
	→ smithbone joined	05:40
	← smithbone_ left	05:40
	→ arup_r joined	05:42
	→ marthinal joined	05:42
	→ settermjd joined	05:45
	← durre left	05:45
	→ bq joined	05:45
	→ devoldmx joined	05:46
	→ Tommy[D]_ joined	05:49
	← mennea_ left	05:49
	→ weiyang joined	05:49
	← AR45 left	05:50
	← bq left	05:51
	← irqq left	05:52
	→ lindenle joined	05:52
	← Tommy[D] left	05:52
	→ irqq joined	05:53
	← reaverb left	05:53
	← wjiang left	05:54
	→ Consuela joined	05:55
	← ErKa left	05:56
	← MACscr left	05:56
	← lindenle left	05:57
	→ muthukumar joined	05:57
	← irqq left	05:58
milki	ya	05:59
	→ BlaXpirit joined	06:00
	← skoop left	06:01
	→ jceb joined	06:01
	→ EminenceHC joined	06:01
	← UmbraMalison left	06:02
	← z8z left	06:02
	→ skoop joined	06:03
	← arup_r left	06:03
	← weiyang left	06:03
	→ Polyatomic joined	06:05
	→ UmbraMalison joined	06:05
	→ arup_r joined	06:06
	→ thumpba joined	06:07
	→ thierryp joined	06:07
	← tgunr left	06:08
	← harish_ left	06:08
	← EminenceHC left	06:09
	← watabou left	06:09
	← eletuchy left	06:09
	← NoNMaDDeN left	06:09
	→ NoNMaDDeN joined	06:10
	← skoop left	06:10
	→ skoop joined	06:14
	→ Takle joined	06:14
	→ lacrymology joined	06:14
	← muthukumar left	06:14
lacrymology	how bad of an idea is to make my ~ a repository with .gitignore: * so I can version my dotfiles?	06:15
	→ eletuchy joined	06:15
lacrymology	it sounds terribly bad	06:15
milki	it is	06:15
	lacrymology: !dotfiles	06:15
gitinfo	lacrymology: There are various issues associated with keeping dot-files in git (permissions, avoiding having a .git in ~/ or /). One attempt to manage this is http://dotfiles.github.com/	06:15
	→ mmitchell joined	06:17
	→ weiyang joined	06:17
	→ EminenceHC joined	06:18
	→ The_Phoenix joined	06:18
	← listochkin left	06:18
	← hagabaka left	06:18
	← Takle left	06:19
	→ giusef joined	06:19
	→ hagabaka joined	06:21
	→ lindenle joined	06:21
	← kermit left	06:21
	← mmitchell left	06:22
	→ kermit joined	06:22
	← EminenceHC left	06:23
	→ Raging_Hog joined	06:25
Eugene	!vcsh is also of interest	06:25
gitinfo	https://github.com/RichiH/vcsh - Version Control System for $HOME - multiple Git repositories in $HOME -- abusing fake bare Git repositories for fun and profit	06:25
	← DonRichie left	06:25
The_Phoenix	How do I organize projects on GIT/GitHub? I'm trying to organize my college projects. I also have some additional projects I did. How do I go about doing Me/College/Class1/Project1, Me/Project2, Me/College/Class2/Project3 and so on? I want only contents of Project1, Project2, Project3,... to be repos.	06:26
HedgeMage	The_Phoenix: there's a github channel if that's what you're asking.	06:27
	→ DonRichie joined	06:27
	← thumpba left	06:28
	r0bby_ → robbyoconnor	06:28
	← robbyoconnor left	06:28
	← crumpler left	06:29
	← knownasilya left	06:29
	← gargola left	06:30
	→ solker joined	06:31
	← giusef left	06:31
	← iamjarvo left	06:31
	→ teran joined	06:33
	→ boombatower joined	06:33
	← boombatower left	06:33
	→ boombatower joined	06:33
	← polyzen left	06:34
	← Gamecubic left	06:35
	← solker left	06:35
	→ pantsman- joined	06:35
	→ sinequanon joined	06:37
	← teran left	06:38
	→ angelsl joined	06:38
	→ The_Phoenix1 joined	06:38
	← The_Phoenix left	06:39
	← smithbone left	06:39
	← dreiss left	06:39
	→ smithbone joined	06:39
	→ Silmarilion joined	06:40
	→ jmverges joined	06:40
	→ Novitsh_ joined	06:41
	← NoNMaDDeN left	06:42
	→ pppp2 joined	06:43
	→ markgrady joined	06:45
	→ jargon joined	06:46
	→ ThomasLocke joined	06:46
	→ ScioMin joined	06:46
	→ dhilipsiva joined	06:48
	← skorgon left	06:50
	→ jameshendrix joined	06:50
	→ Macaveli joined	06:51
	← jceb left	06:51
	← pantsman- left	06:52
	← dhilipsiva left	06:54
	→ nnyk_ joined	06:56
	← Xethron left	06:57
	→ PCatinean joined	06:58
	← lindenle left	06:58
	← TheErik left	06:59
	← krixxkraxx left	06:59
	→ Xethron joined	07:00
	→ mmitchell joined	07:00
	→ palcu joined	07:00
	← ManikM left	07:01
	→ ManikM joined	07:01
	← Bass10_ left	07:01
	→ ciampix joined	07:02
	← settermjd left	07:02
	← alexh_ left	07:02
	→ NoNMaDDeN joined	07:02
	→ settermjd joined	07:03
	← palcu left	07:05
	← mmitchell left	07:06
	→ mennea joined	07:07
	→ jagob joined	07:09
	→ mennea_ joined	07:12
	← settermjd left	07:12
	→ zoso joined	07:12
	→ FilipNortic joined	07:13
	← Consuela left	07:13
	→ nrsk joined	07:14
	← francisfish left	07:15
	→ Consuela joined	07:15
	← mennea left	07:15
	← The_Phoenix1 left	07:15
	← Lyqyd left	07:16
	→ The_Phoenix joined	07:17
	← ScioMin left	07:17
	← LeMike left	07:17
	← pppp2 left	07:17
	→ roelmonnens joined	07:18
	← Svetlana left	07:18
	→ clauswitt joined	07:18
	→ acolson joined	07:19
	→ awkwardusername joined	07:20
	→ freimatz joined	07:20
	← bgerber left	07:20
	→ barduck joined	07:20
	← darkbasic left	07:23
	→ EminenceHC joined	07:23
	→ darkbasic joined	07:23
	← jmverges left	07:23
	← The_Phoenix left	07:24
	← a_le left	07:24
	→ a_le joined	07:25
	→ bgerber joined	07:25
	→ dreiss joined	07:26
	← maestrojed left	07:26
	→ Xano joined	07:27
	← EminenceHC left	07:27
	← kadoban left	07:29
	← Cassiel left	07:31
	→ solker joined	07:31
	→ Gizburdt joined	07:34
	→ settermjd joined	07:34
	← solker left	07:36
	→ dsdeiz_ joined	07:38
	← dsdeiz left	07:39
	→ pppp2 joined	07:41
	→ jceb_ joined	07:41
	→ styly_ joined	07:42
	→ cbr_ joined	07:42
	← Xethron left	07:43
	← carlosr left	07:43
	← otter768 left	07:44
	→ CheckDavid joined	07:44
	→ HelperW joined	07:44
	← styly left	07:44
	← HelperW left	07:45
	→ The_Phoenix joined	07:45
	→ seschwar joined	07:45
	→ maestrojed joined	07:46
	→ mlechner joined	07:47
	→ Brain joined	07:48
	→ jnavila joined	07:50
	← Goplat left	07:51
	→ Xethron joined	07:51
	← Xethron left	07:51
	→ Xethron joined	07:51
	← CEnnis91 left	07:52
	← The_Phoenix left	07:52
	← hohum left	07:53
	→ LeMike joined	07:54
	→ Niharika joined	07:56
	→ rickardo1 joined	07:57
	← rickardo1 left	07:57
	→ King_Hual joined	07:57
	← nikita left	07:57
	→ hebz0rl joined	07:57
	← Xethron left	07:57
	← fairuz left	07:58
	→ Duikb00t joined	07:59
	→ vurma joined	07:59
	→ nikita joined	07:59
	→ palcu joined	08:00
	← palcu left	08:00
	→ hohum joined	08:00
	→ Xethron joined	08:00
	← markgrady left	08:01
	→ EminenceHC joined	08:01
	← scriptThis left	08:02
	→ mmitchell joined	08:02
	← settermjd left	08:02
	← Zifre_ left	08:02
	→ scriptThis joined	08:03
	→ mtakkman joined	08:03
	← cjwilburn left	08:03
	→ lb1a joined	08:03
	→ teran joined	08:04
	← nikita left	08:04
	← mmitchell left	08:07
	← mibofra left	08:07
	→ nikita joined	08:07
	→ regedit joined	08:07
	→ manuel_ joined	08:07
	← teran left	08:08
	→ bq joined	08:08
	← akiva left	08:08
	← blubberbop left	08:08
	← arnaud left	08:09
	← awkwardusername left	08:09
	← EminenceHC left	08:10
	→ eletuchy_ joined	08:10
	← nnyk_ left	08:12
	→ nnyk_ joined	08:12
	← eletuchy left	08:13
	← Xethron left	08:13
	← bq left	08:14
	← eagles0513875 left	08:14
	→ eagles0513875 joined	08:14
	← eagles0513875 left	08:14
	→ eagles0513875 joined	08:14
	← eletuchy_ left	08:15
	→ Xethron joined	08:16
	→ DaisyTheCow joined	08:16
	→ mibofra joined	08:16
	← Xano left	08:16
	← DaisyTheCow left	08:16
	← ManikM left	08:19
	← nikita left	08:19
	→ nnyk joined	08:21
	→ nikita joined	08:22
	← sinequanon left	08:23
	← nnyk_ left	08:23
	→ okanck joined	08:23
	→ gua_ould joined	08:24
	→ ManikM joined	08:24
	← ManikM left	08:24
	→ GGflags joined	08:26
	← skoop left	08:27
	→ skoop joined	08:27
	→ psoo joined	08:28
	→ gfixler joined	08:29
	→ virtualsue joined	08:29
	→ cjwilburn joined	08:32
	→ EminenceHC joined	08:32
	→ solker joined	08:32
	← joki left	08:32
	→ TomyWork joined	08:32
	← Xethron left	08:32
	→ JohnBat26 joined	08:33
	← nikita left	08:34
	→ joo-_ joined	08:34
	→ nikita joined	08:36
	← solker left	08:36
	← EminenceHC left	08:37
	→ eletuchy joined	08:38
	→ joki joined	08:39
	← thiago left	08:39
	→ fairuz joined	08:39
	← maestrojed left	08:40
	← henditan left	08:41
	→ Takle joined	08:42
	→ henditan joined	08:42
	← cjwilburn left	08:44
	← nikita left	08:45
	→ alorence joined	08:46
	← arup_r left	08:47
	→ nikita joined	08:47
	→ creep joined	08:48
creep	Hi peps... I don't get what is the idea behind branching and merging	08:49
	→ Cassiel joined	08:49
	← Kartagis left	08:49
osse	creep: being able to work in different things at the same time, or several people work in parallel	08:50
	if none if that applies to you the nyou don't need to worry about it	08:50
	← kyb3r_ left	08:51
	→ theForce joined	08:51
theForce	hi folks	08:51
	→ ayaz joined	08:51
theForce	i have a branch B, based off branch A, with lots of new files. how can i see only the changes for files that exist in A and B, but not the new files in B? git diff A B shows me both...	08:52
osse	theForce: git diff A...B	08:53
	→ AliRezaTaleghani joined	08:53
osse	oooh	08:53
	theForce: git diff --diff-filter=M A B	08:53
	→ Xano joined	08:53
theForce	osse: cool thx :-)	08:56
	← NoNMaDDeN left	08:56
	→ palcu joined	08:57
	→ imolorhe joined	08:57
osse	theForce: if A advances independently you might want A...B also	08:57
creep	osse: thanks for repling :), ok that is what I already heard in tuts so far, but take this as an example	08:57
	→ hgl joined	08:58
creep	i have a master branch with file x	08:58
	→ TheBrayn joined	08:58
TheBrayn	hi	08:58
creep	then I want to add some new thing to this file, and because of that I create a new branch called brach x	08:59
	so we keep on working an file x in diffrent branches, as resault we have 2 diffrent file x	09:00
	as we want to merge the 2 diffrent file x what happens	09:00
	← hahuang61 left	09:01
	← pppp2 left	09:01
	← dreiss left	09:01
osse	git will try to merge them. if it cannot then it will let you know. if you have edited seperated parts of the file so that your changes don't overlap then git will be able to do it just fine	09:01
	← enitiz left	09:01
	→ NoNMaDDeN joined	09:01
	→ MartialLaw joined	09:02
	← veebers left	09:02
MartialLaw	im pushing a project to git and when a collaberator opens it it updates files	09:02
creep	so before merge i need to discuss the code	09:03
	→ ldlework joined	09:03
ldlework	When I build git from source, I find that /usr/local/libexec/git-core takes up 700 mb!	09:04
	Is there anyway to build git with a reduced footprint?	09:04
	← nikita left	09:04
osse	ldlework: it doesn't	09:04
bremner	ldlework: probably you need to strip your binaries	09:04
	← XaT left	09:04
osse	ldlework: there are many many hard links.	09:04
	→ groolot joined	09:05
bremner	ldlework: mine is only 15M	09:05
ldlework	bremner: what does that mean	09:05
	each binary for me is 6.4M	09:05
	→ CustosL1men joined	09:05
osse	ldlework: it's all the same binary	09:05
ldlework	osse: doing ls -lah doesn't show them as links	09:06
	→ dimm joined	09:06
osse	ldlework: they are hard links	09:06
dimm	hello, All!	09:06
bremner	ldlework: what does "du -sh /usr/local/libexec/git-core" tell you?	09:06
osse	ldlework: does it say '111' next to many of them?	09:06
ldlework	730M	09:06
osse	ldlework: and their sizes are identical ?	09:06
bremner	ldlework: huh. That must be a non-GNU du	09:06
	→ nikita joined	09:06
ldlework	I wonder if it is because I'm inside of a Docker container on btrfs or something..?	09:06
	du (GNU coreutils) 8.13	09:07
osse	if it doesn't support hard links then yes I suppose	09:07
bremner	the main git binary is only 1.6M for me	09:08
dimm	have some trouble. commit-1 - place files to repo.... commit-2 delete files... now trying to re-create local repo 'git clone <url>' and then 'git reset --hard <commit's hash>'. Now i can see files in local repository, but how can i place files to remote repo to HEAD branch?	09:08
osse	bremner: yeah it's about 6 unstripped	09:08
	→ nfk joined	09:08
TheBrayn	I have accidentally added a commit (5 commits ago) to a branch which should really belong to another branch	09:08
	how can I move one commit to another branch?	09:08
osse	ldlework: if I run du -l I also get several 1000 MB	09:08
	ehh 100	09:08
BtbN	You can't without modifying history and breaking the repo for everyone else	09:09
TheBrayn	ok	09:09
osse	ldlework: can you show the output of ls -l of the dir ?	09:09
BtbN	If you haven't pushed it yet, feel free to just rebase it	09:09
osse	creep: not really. if the merge didn't go well, and you cannot fix it yourself, then yes you must discuss	09:09
bremner	BtbN: TheBrayn: you can cherry-pick it without disruption, it's deleting it from the original branch that messes up history	09:09
BtbN	Best you can do if you already pushed it is reverting it	09:10
	← joo-_ left	09:11
	← Nijikokun left	09:12
	→ joo-_ joined	09:14
	← Vile left	09:14
	← alorence left	09:15
	→ arup_r joined	09:15
	← barduck left	09:15
	← tinanoo left	09:15
	← tokik left	09:16
	→ blackmesa joined	09:16
	→ XaT joined	09:16
	← mlechner left	09:17
dimm	solved as: git reset --hard <hash>	09:17
	copy files to back folder	09:17
	git pull <---- this return to current version (empty repo)	09:18
	copy files from backup to local repo	09:18
	git add .	09:18
	→ forgottenleaf joined	09:18
dimm	git commit -a -m "test commit"	09:18
	← Drakevr left	09:18
	→ Drakevr joined	09:18
dimm	git push	09:19
	← forgottenleaf left	09:19
dimm	guyz, plase say is this wrong way?	09:19
	→ darkbasic_ joined	09:19
	→ martinklepsch joined	09:19
ldlework	So, doing export NO_INSTALL_HARDLINKS brought my disk usge down to 60M	09:20
	← darkbasic left	09:20
	← mtakkman left	09:20
ldlework	But its 1:30AM, no time to wonder why	09:20
	thanks	09:20
	← regedit left	09:20
	→ marcogmonteiro joined	09:21
	→ MACscr joined	09:22
	← MACscr left	09:22
	← lidaaa left	09:22
	→ MACscr joined	09:23
	← MACscr left	09:23
	→ shanee_ joined	09:23
	→ MACscr joined	09:23
shanee_	Hello. I'm trying to revert a commit and then when this causes a conflict I'd like to just keep the file as it was before and I'll just edit a line in myself (easier than doing the 100+ conflicts). Is there an way to do this?	09:24
osse	shanee_: git checkout <old commit> -- <file>	09:24
	→ mikecmpbll joined	09:24
	→ endiruna joined	09:25
shanee_	osse, yes. That works. :)	09:26
	Thanks. That was pretty simple really.	09:26
	→ mlechner joined	09:27
	→ teran joined	09:28
	← str left	09:28
	← henditan left	09:28
	→ anaran joined	09:28
	→ henditan joined	09:29
	→ irqq joined	09:29
	← groolot left	09:29
creep	osse: thanks ones more, I did the git school five minutes ago with the octocats :D so, they branch a master in which they delete file... when they merge branch a and master ... master becomes branch a	09:30
	can u say that ?	09:30
	→ liamkeily joined	09:30
osse	shanee_: note that it effectily reverts everything done to that file since <old commit>	09:31
	← darkbasic_ left	09:32
osse	creep: that will happen if branch a is "ahead" of master.	09:32
	creep: ie. if it's all just one line	09:32
	→ s8321414 joined	09:32
	→ solker joined	09:33
TheBrayn	bremner: since we are using stash with pull requests I could just create another branch and cherry pick everything I needed from the old one	09:33
creep	osse: ok nice ... let us think about in master and branch a are diffrent commit done, what happens then ? :)	09:34
	→ EminenceHC joined	09:34
	→ darkbasic joined	09:34
creep	osse: omg, I think git is a great way to get order in my chaos :D	09:34
osse	creep: you will get a merge commit	09:35
	← henditan left	09:35
	→ henditan joined	09:36
	→ Sceorem joined	09:36
	← liamkeily left	09:37
	← solker left	09:37
	→ francisfish joined	09:37
	→ liamkeily joined	09:37
	← liamkeily left	09:37
	← endiruna left	09:38
	→ drizztbsd joined	09:38
	← arup_r left	09:39
	← EminenceHC left	09:39
	→ User458764 joined	09:39
	→ lpax joined	09:40
	← francisfish left	09:40
User458764	Hi, for a weeks git doesn;t work correctly for example when I do 'git -v' I have a blank line, why goes wrong?	09:40
	← b100s left	09:40
shanee_	osse, yes. That's actually what I want. Thank you for the help. :)	09:40
osse	User458764: how does it go wrong?	09:41
lb1a	git -v is not a command	09:41
	→ arup_r joined	09:42
	→ alexO joined	09:42
User458764	osse oh git -v doesn't exists but I hope it returns me an error and I have no errors the problem happens too when I do a git push I wait and then nothing	09:42
	but all others commands seems to work	09:42
	← henditan left	09:43
osse	what does 'echo lol >&2' print ?	09:43
User458764	osse nothing	09:43
	← arup_r left	09:44
	→ henditan joined	09:44
osse	User458764: then you have somehow silenced stderr	09:44
	User458764: exec 2>/dev/tty and try again	09:44
	→ corni joined	09:44
	← corni left	09:44
	→ corni joined	09:44
	→ arup_r joined	09:44
	→ otter768 joined	09:44
User458764	osse the worse is sometimes like here I try to enter a command and then enter and the enter key does not work	09:45
	ok I understand I think it is related to my shell which is 'fish'	09:45
	← booboy left	09:45
	← CheckDavid left	09:47
	→ endiruna joined	09:48
	→ beautifulmind joined	09:48
User458764	osse damn it, I put this script in my 'fish' config and read the line 'Now I not receive any error messages from terminal' and did not pay attention but now I understand I understand what does it means ;)	09:48
	https://gist.github.com/eggegg/6077153	09:48
	→ sara-zahrani joined	09:49
	← otter768 left	09:49
	→ davidreis joined	09:49
	→ dialeth_ joined	09:49
	← dialeth left	09:49
	← sara-zahrani left	09:51
	→ DaisyTheCow joined	09:51
	← XaT left	09:51
	→ mmitchell joined	09:51
	← AliRezaTaleghani left	09:51
	← weiyang left	09:51
	→ netcarver joined	09:52
	← Niharika left	09:53
	→ GT joined	09:53
	→ AliRezaTaleghani joined	09:54
	← hgl left	09:54
	→ ecky--ptang-zoob joined	09:54
	→ hgl joined	09:54
	← mmitchell left	09:55
	← israelpattison left	09:57
	← joo-_ left	09:57
	→ joo-_ joined	09:58
	← Duikb00t left	09:58
	← NoNMaDDeN left	09:58
	→ NoNMaDDeN joined	09:58
	→ Solid1 joined	09:58
	← hgl left	09:59
	→ Xethron joined	09:59
	← Xethron left	09:59
	→ Xethron joined	09:59
	→ lindenle joined	09:59
	← virtualsue left	09:59
	→ Duikb00t joined	10:00
	→ EminenceHC joined	10:01
	← kcj left	10:01
	← corni left	10:01
	→ jcalonso joined	10:01
	← lindenle left	10:04
	→ vtunka joined	10:04
	← LeMike left	10:05
	← GT left	10:05
	→ achadwick joined	10:06
	← NoNMaDDeN left	10:06
	→ alorence joined	10:08
	→ sh4rm4 joined	10:08
	← Sleepy63 left	10:09
	→ Errorical joined	10:09
sh4rm4	is there a way to check in a symbolic link as a file ? (to kinda emulate a subproject)	10:09
	← EminenceHC left	10:09
	→ the_drow joined	10:09
	→ RaceCondition joined	10:10
BtbN	no	10:10
	→ GT joined	10:10
creep	osse: hey one more question from me. I like the way that people write good code and share them with others. But what about theres effort ? Take this. Somebody have a very very good idea and a bad person could simply clone the code am make some improvements	10:10
the_drow	How do I create a new branch from the current branch that contains all commits since this branch was created except one?	10:11
tobiasvl	creep: what makes the person bad?	10:11
creep	so the day comes he get creadit for the "stolen" code	10:11
	and what about the origin ?	10:11
tobiasvl	what license does the "stolen" code have?	10:11
	→ jnavila_ joined	10:11
	← jnavila left	10:12
tobiasvl	it's not stealing if it has a copyleft license	10:12
creep	It is open source code	10:12
tobiasvl	or is open source/free software	10:12
	well then it's not stealing	10:12
bremner	well, some licenses insist on giving credit	10:12
jast	if you publish your code in a prominent place, it's easy to see later on who was first :)	10:12
BtbN	"Open Source" can mean a lot.	10:12
creep	but he could use it for a own produkt	10:12
BtbN	If it's GPL, forking and enhancing is absolutely intended and encouraged	10:12
creep	lets take git and github	10:12
osse	creep: the bad person has three choices 3) Contribute his changes back to the original repository. in that case he only gets credit for what he has done IF it gets accepted 2) Fork the whole prject and convince others to use his fork 3) Hack the original hoster of the project (effectively impossble)	10:12
creep	github is making millions based on git	10:13
	← Raverix left	10:13
BtbN	Yes, so?	10:13
	→ MoSal joined	10:14
	→ Raverix joined	10:14
creep	so if i invented git I want some of the githubs cake	10:14
bremner	but you didn't	10:14
creep	yes	10:14
osse	creep: then you should licence it differently	10:14
tobiasvl	then you wouldn't have given git such a permissible license	10:14
creep	so why doing a great tool like git	10:14
	← Cope left	10:14
tobiasvl	the creators of git have allowed github to do exactly what they do	10:14
	it's allowed	10:14
	it's not stealing	10:14
MoSal	Is there a way to view cached and non-cached changes with git diff?	10:14
creep	someone creat a produkt upon this base	10:14
BtbN	They didn't explicitly allow it to github	10:14
osse	MoSal: git diff and git diff --cached	10:14
BtbN	It's just the GPL	10:14
MoSal	osse: I meant at the same time?	10:15
	→ neary joined	10:15
osse	MoSal: git diff HEAD	10:15
creep	Don't get me wrong .. I love the people working on free code	10:15
MoSal	osse: thanks.	10:16
	← Raverix left	10:17
	→ Raverix joined	10:17
	→ galaris joined	10:17
creep	Hey I got a good example of history ^	10:17
BtbN	Millions and millions of people use Linux, even in proprietary devices and software solutions.	10:17
creep	there is Steve jobs, bill gates and linus torvald	10:17
osse	and theo de raadt	10:18
	← Gizburdt left	10:18
BtbN	github is one of the primary reasons git got as popular as it is now. They are contributing a lot back by that alone.	10:18
bremner	and bob the builder	10:18
creep	linus is open source and very poor compare to the others	10:19
	→ listochkin joined	10:19
creep	bill gates is the thief and the richest	10:19
bremner	creep: why do _you_ care? linus doesn't seem to. Also, what does this have to do with git?	10:19
BtbN	Because money. Everything else doesn't matter.	10:20
	If someone isn't maximizing his profit, he must be crazy.	10:20
bremner	creep: this discussion is not going to go anywhere useful. How about we stick to tecnical stuff here, and you go to #fsf if you want to debate the sanity of free software?	10:20
creep	BtbN: sadly but true, so you agree	10:21
	ok	10:21
BtbN	No, i don't. I think your way of thinking is toxic.	10:21
	← seschwar left	10:21
	→ Sleepy63 joined	10:21
	← MoSal left	10:21
	→ cjwilburn joined	10:22
	→ seschwar joined	10:22
	← zanchoPansa left	10:22
osse	BtbN: toxic? not poisonous?	10:23
	or venomous?	10:23
creep	I think it is a serious discussion	10:23
bremner	not for long.	10:23
	ChanServ set mode: +o	10:24
	← dimm left	10:24
	← listochkin left	10:24
	← boombatower left	10:25
	→ scorphus joined	10:26
	← scorphus left	10:26
	→ scorphus joined	10:26
	→ Gizburdt joined	10:27
	← govg left	10:27
	← cjwilburn left	10:27
	→ israelpattison joined	10:27
	→ hgl joined	10:27
	osse imagines bremner flexing is irc muscles in the mirror	10:27
	← RaceCondition left	10:27
	hgl → Guest76331	10:28
	bremner grunts	10:28
	← cxz left	10:28
	← fr33domlover left	10:29
	← mennea_ left	10:31
canton7	reading the backlog, that's a weird argument. "Let's say I decided to write some code, and make it available for free. I willingly released it under a license which allows other people to make money from it. Now someone else is making money from it. This upsets me"	10:31
bremner	please don't feed the (possibly accidental) troll	10:31
canton7	my bad - I assumed you'd kicked him already from the opness	10:32
bremner	nah. I got distracted by my reflection in the mirror	10:32
canton7	:P	10:33
	I wonder if I can deop someone who has every right to be an pop...	10:33
	ChanServ set mode: -o	10:34
canton7	:D	10:34
	→ solker joined	10:34
	ChanServ set mode: +o	10:34
canton7	*be an op	10:34
	← daito left	10:35
	→ RaceCondition joined	10:35
	← Gizburdt left	10:36
	→ uku joined	10:38
	← martinklepsch left	10:38
	← solker left	10:38
	→ EminenceHC joined	10:38
	→ martinklepsch joined	10:39
uku	is it possible to download the commit objects manually somehow using some lower level commands? say I get the hash of the remote repo using ls-remote and want to download only that commit object?	10:40
	→ asfdfdfd joined	10:40
	ChanServ set mode: -o	10:40
bremner	uku: iirc, you can only fetch refs.	10:41
	← imolorhe left	10:41
	→ Gizburdt joined	10:42
jast	correct... to avoid people being able to download objects that have been removed from the history, etc.	10:42
creep	bremner: i am new to technical things. because i am interessed. i don't get why u call me troll. i think that discussion legal, but i also respect the opposit. so if u want me to talk only about git i do so. but i wanted to hear some "informatic experts" oppinion. so sorry for that :)	10:43
	← EminenceHC left	10:43
creep	So as git i did a branch and wanted to merge :)	10:44
uku	what about just the tree objects from HEAD?	10:45
	basically I'm looking for something similar to svn ls	10:45
	without the wasteful git clone	10:45
canton7	look at man git clone --depth and man git ls-remote	10:46
gitinfo	the git-clone manpage is available at http://jk.gs/git-clone.html	10:46
	the git-ls-remote manpage is available at http://jk.gs/git-ls-remote.html	10:46
	→ Malsasa joined	10:46
uku	i know about both of them	10:46
	← D-Boy left	10:46
canton7	so, in what way does 'git clone --depth 1' not solve your problem?	10:46
	ah, you just want the tree, not the actual objects?	10:47
	→ fairuz1 joined	10:47
uku	yes, just the directory structure	10:47
	→ virtualsue joined	10:47
jast	there's git archive with --remote for fetching trees from the server (including the files), but it needs to be enabled on the server	10:47
uku	i want to know if the tree contains a certain file for example	10:47
	→ darkbasic_ joined	10:47
jast	what you want is usually only available via web interfaces	10:47
	← St_Marx left	10:48
	← darkbasic left	10:48
uku	canton7, another problem is that I would like to have change log, depth 1 give only the last commit message	10:48
jast	canton7: sure you can deop people, but if done for the wrong reasons it could earn you an extended vacation outside #git :}	10:49
uku	it is unfortunate that git does not provide log and ls command for remote use	10:49
	→ davividal joined	10:49
	← fairuz left	10:50
	← learner1 left	10:50
canton7	sure - I'm nice, honest :)	10:50
uku	but I guess starting with the HEAD wouldn't work in either case, because it would not include references to children, only to parents	10:50
	→ learner1 joined	10:50
uku	so using that it would be not possible to traverse the commits	10:51
	be*	10:51
jast	well, if you've got a branch checked out, there are no descendants of HEAD on that branch :)	10:51
	there are only ancestors	10:51
ohcibi	has anyone managed to configure gpg-agent on os x to be used with git? such that one does not has to enter the password for every single commit?	10:53
	→ St_Marx joined	10:53
uku	but in principle something that downloaded the trees but not the blobs themselves would be really nice	10:53
	it should be possible in principle as per the git specification, I think	10:54
	→ NoNMaDDeN joined	10:54
	→ david24365 joined	10:55
	← RaceCondition left	10:56
	→ seg_fault joined	10:57
	→ fr33domlover joined	10:57
	→ mennea joined	10:57
	← ecky--ptang-zoob left	10:59
	→ ecky--ptang-zoob joined	10:59
	→ rickardo1 joined	11:00
rickardo1	Should the stash be deleted after git stash apply Stash{id} ?	11:00
canton7	you'd have to disable a lot of repository integrity stuff...	11:00
	rickardo1, no. that's the difference between apply and pop	11:00
rickardo1	canton7: ok, ty	11:01
	→ francisfish joined	11:01
	→ mellernoia joined	11:01
	→ cjwilburn joined	11:03
	→ D-Boy joined	11:03
	← neary left	11:03
	→ groolot joined	11:04
	← clauswitt left	11:04
	← david24365 left	11:05
	← Xethron left	11:05
	← palcu left	11:05
	→ palcu joined	11:06
	← mennea left	11:06
	→ Xethron joined	11:06
	← Xano left	11:07
	← nrsk left	11:07
	→ ManikM joined	11:07
	→ hexagoxel joined	11:08
	→ arnaud__ joined	11:10
	← Polyatomic left	11:10
	← palcu left	11:10
	← jameshendrix left	11:12
	→ harish_ joined	11:13
	← mellernoia left	11:14
	← arnaud__ left	11:14
	← Errorical left	11:15
	→ basiclaser_ joined	11:15
	→ Errorical joined	11:16
	← Errorical left	11:16
	→ Errorical joined	11:16
	→ mtakkman joined	11:16
	← NightMonkey left	11:16
	← cjwilburn left	11:17
	→ doev joined	11:17
	← Gizburdt left	11:17
	← teran left	11:18
	← freimatz left	11:18
	← mtakkman left	11:19
	← deciph3r left	11:19
	→ The_Phoenix joined	11:19
	← blackmesa left	11:20
	→ johnflux joined	11:20
	← johnflux left	11:20
	→ johnflux joined	11:20
	→ deciph3r joined	11:20
	← groolot left	11:22
	→ paulweb515 joined	11:22
	← fairuz1 left	11:23
	→ petersr joined	11:23
	← deciph3r left	11:24
	→ NightMonkey joined	11:24
	← petersr left	11:25
	→ tvw joined	11:25
	→ clauswitt joined	11:26
	← rickardo1 left	11:26
	→ deciph3r joined	11:26
	← paulweb515 left	11:27
	→ shebbi joined	11:30
shebbi	hi, is the routine to backup straight after a commit?	11:30
	using backup software	11:30
	→ Trudko joined	11:31
shebbi	as i know you shouldnt use git for backup	11:31
	← Raverix left	11:32
	→ Raverix joined	11:32
	→ Lekensteyn joined	11:32
	← seg_fault left	11:33
	← fr33domlover left	11:33
	← henditan left	11:33
Lekensteyn	Heya, is it possible to do an out-of-tree build of git? make -F /path/to/git/Makefile complains about a file it cannot find	11:33
	← Takle left	11:33
	→ solker joined	11:34
	→ Gizburdt joined	11:35
	→ teran joined	11:36
	← Malsasa left	11:36
	→ blackmesa joined	11:36
	← chiemseesurfer left	11:37
	→ chiemseesurfer joined	11:38
	← solker left	11:39
	→ RaceCondition joined	11:40
	← teran left	11:40
	← CustosL1men left	11:40
	← RaceCondition left	11:40
	← arup_r left	11:41
	→ paulweb515 joined	11:42
	→ dEPy joined	11:42
	← Duikb00t left	11:42
	→ roelmonn_ joined	11:43
	← Sceorem left	11:43
	→ mennea joined	11:44
	→ darkbasic joined	11:44
	← M-ou-se left	11:45
	← roelmonnens left	11:45
	← darkbasic_ left	11:45
	→ otter768 joined	11:45
	→ arup_r joined	11:49
	← otter768 left	11:50
	→ boushi joined	11:51
	→ EminenceHC joined	11:52
	← a_le left	11:52
	→ palcu joined	11:52
Jupelius	How can I fast-forward a branch to same state as master without getting any messages to the commit log?	11:53
	← RichardJ left	11:53
moritz	Jupelius: why would you want to do that?	11:53
	← endiruna left	11:54
moritz	Jupelius: it's possible, but would make further merges more awkward (and it wouldn't be a fast-forward in the git sense)	11:54
	(for example with git merge --squash master, which would install just one commit)	11:54
Jupelius	I just want my local branch to be up-to-date	11:54
	→ freimatz joined	11:55
osse	Jupelius: fast-forwarding doesn't create any extra messages	11:55
moritz	Jupelius: then do a simple merge, and ignore the commits	11:55
	← gv left	11:55
	→ fr33domlover joined	11:55
	→ niro joined	11:55
moritz	Jupelius: and a for a proper (not fast-forward) merge, git log --first-parent won't show the commits from master	11:56
	← Vivekananda_y510 left	11:56
	→ roelmonnens joined	11:57
Jupelius	Or should I rebase if I want to publish this branch afterwards (and merge it to the master) without any additional commits	11:57
	← EminenceHC left	11:57
	← Errorical left	11:57
osse	rebase is probably what you want	11:58
	← roelmonn_ left	11:58
	→ M-ou-se joined	11:59
	→ gv joined	12:00
	→ paul424 joined	12:00
	→ EminenceHC joined	12:01
	← fr33domlover left	12:01
	← Macaveli left	12:02
	← weyer left	12:03
	→ Errorical joined	12:04
	← blackmesa left	12:06
	→ adamben joined	12:09
	← adamben left	12:09
	→ adamben joined	12:09
	← EminenceHC left	12:10
	→ RaceCondition joined	12:11
	Guest76331 → hgl	12:12
	← martinklepsch left	12:12
	← hgl left	12:12
	→ hgl joined	12:12
	→ Macaveli joined	12:12
	→ NosBit joined	12:13
	← NosBit left	12:13
	→ NosBit joined	12:13
	→ m0ltar joined	12:13
	← heftig left	12:14
	← Gitzilla left	12:14
	→ endiruna joined	12:14
	← Macaveli left	12:15
	→ DrSkyLizard joined	12:16
	→ str joined	12:16
	→ teran joined	12:17
	← dsdeiz_ left	12:17
	→ Macaveli joined	12:18
	→ m0viefreak joined	12:18
	→ jottr joined	12:18
	→ Duikb00t joined	12:19
	← ap0c left	12:19
	← heroux left	12:19
	→ mizu_no_oto joined	12:20
	→ heroux joined	12:20
	→ weyer joined	12:20
shebbi	hi, is the routine to backup straight after a commit?	12:22
Lekensteyn	shebbi: pushing the changes to a remote repository? Not necessarily	12:23
	← ecky--ptang-zoob left	12:23
	→ Takle joined	12:24
	→ ecky--ptang-zoob joined	12:24
	← hgl left	12:24
	← drocsid left	12:24
	← RaceCondition left	12:24
	← Guest9253 left	12:24
	→ a_le joined	12:25
	← Duikb00t left	12:25
	← Takle left	12:25
	→ destiny joined	12:26
	← destiny left	12:26
	← creep left	12:27
	→ mtakkman joined	12:29
	← alexO left	12:29
	→ booboy joined	12:30
	← ecky--ptang-zoob left	12:30
	← netj left	12:31
	→ ecky--ptang-zoob joined	12:31
	→ netj joined	12:31
	→ drocsid joined	12:31
	→ Sceorem joined	12:32
	← linduxed left	12:33
	→ RaceCondition joined	12:34
	← m0ltar left	12:34
	→ heftig joined	12:35
	→ solker joined	12:35
	→ Takle joined	12:35
	→ cjwilburn joined	12:35
	← ecky--ptang-zoob left	12:36
	→ linduxed joined	12:36
	→ Viata joined	12:37
	← rjc left	12:37
	→ livingstn joined	12:38
	→ jonatasnona joined	12:38
	→ SHLV joined	12:39
	← magic_ left	12:39
	← solker left	12:39
	→ rjc joined	12:41
	← Viata left	12:42
	← eletuchy left	12:43
	→ eletuchy joined	12:43
	→ scottpgallagher joined	12:46
	→ fairuz joined	12:47
	← eletuchy left	12:48
	→ johtso_ joined	12:48
	→ rob_w__ joined	12:49
	← beautifulmind left	12:49
	→ beautifulmind joined	12:49
	→ andrew__ joined	12:50
	← andrew__ left	12:51
	→ andrew__ joined	12:51
	← andrew__ left	12:51
	← cjwilburn left	12:51
	← netj left	12:51
	← NoNMaDDeN left	12:51
	→ netj joined	12:51
	→ andrew__ joined	12:51
	← andrew__ left	12:52
	→ andrew__ joined	12:52
	← andrew__ left	12:52
	→ andrew__ joined	12:53
	← andrew__ left	12:53
	→ andrew__ joined	12:53
	← andrew__ left	12:54
	← ayaz left	12:54
shebbi	Lekensteyn: not pushing. just commiting changes on a dev machine.	12:54
	→ andrew__ joined	12:54
	← andrew__ left	12:54
	← RaceCondition left	12:55
	→ andrew__ joined	12:55
	← andrew__ left	12:55
	→ andrew__ joined	12:56
	← andrew__ left	12:56
	→ hje841 joined	12:56
	→ andrew__ joined	12:56
	→ bracero joined	12:57
	→ nrsk joined	12:57
	← mtakkman left	12:58
hje841	I want to create a pull-requestion with 'git request-pull <start> https://github.com/my_own_github/project/ master'. What should I call <start>? I don't recall naming anything there	12:58
	← Gizburdt left	12:59
	→ Gizburdt joined	13:00
	← Sceorem left	13:00
tobiasvl	git request-pull is not the same as a github pull request	13:00
	→ EminenceHC joined	13:00
tobiasvl	if that's what you mean	13:00
	hje841: man git request-pull	13:00
gitinfo	hje841: the git-request-pull manpage is available at http://jk.gs/git-request-pull.html	13:00
	← bracero left	13:01
	← netj left	13:01
	→ netj joined	13:01
	← Takle left	13:02
hje841	tobiasvl, I see. I have been reading that manpage, and it suggests a v1.0 or something. but I didn't specify it when I dit 'git clone..'	13:02
tobiasvl	hmm?	13:03
	→ chrisgeo joined	13:03
	→ iamjarvo joined	13:03
	← EminenceHC left	13:05
	← subhojit777 left	13:06
	← ManikM left	13:06
hje841	now I'm confused. I did the 'git push', shouldn't I create a pull request from my local terminal to make my github page able to get my latest changes?	13:06
	→ ManikM joined	13:06
	→ blubberbop joined	13:06
tobiasvl	hje841: no idea what you're asking. where did you push? to github? did you push to a fork? if so, you create a pull request on the web interface of github.com	13:07
	→ Takle joined	13:08
	← jcalonso left	13:08
	← andrew__ left	13:09
hje841	tobiasvl, I pushed from my local copy to github. and I believe I pushed to the master. I have no forks on this project. but I see it in the webinterface now, thanks	13:10
tobiasvl	ok, cool	13:10
	I think #github might be better for questions like this btw	13:11
	→ m0ltar joined	13:11
	bremner thinks so too, but has never actually seen a question answered on github.	13:11
	→ Error404NotFound joined	13:11
tobiasvl	oh it's pretty active	13:11
bremner	ok, I must just be unlucky	13:11
	→ groolot joined	13:12
	→ mtakkman joined	13:12
	→ liamkeily joined	13:12
tobiasvl	well, I see you're not there now, but there's been lots of activity today	13:12
	← styly_ left	13:12
	→ aspiers joined	13:13
hje841	ahh.. thanks. I didn't think of that channel. :)	13:13
	→ hcc23 joined	13:14
	→ styly joined	13:14
	← Takle left	13:14
	→ styly_ joined	13:14
	← styly left	13:14
	← styly_ left	13:14
	→ styly joined	13:15
hje841	apparently if you push to the master branch, you can't create a pull request. I guess I just learned something about git(hub) today...	13:16
osse	I'ev created pul lrequests from one master to another before	13:17
	→ sburgess joined	13:18
	→ sburgess_ joined	13:18
hje841	I just push'ed my changes from my local master to the master on github, and the 'create pull request' button is not active	13:18
	← scottpgallagher left	13:18
tobiasvl	hje841: but you also said "I have no forks on this project"	13:18
	is your project a fork?	13:18
	→ scottpgallagher joined	13:18
osse	hje841: pull requests are from one repo to another. if it's all the same repo then it doesn't have any meaning	13:18
tobiasvl	if not, there's no repo to request a pull in	13:18
	→ scampbell joined	13:19
	→ martinklepsch joined	13:19
	← palcu left	13:19
	← blubberbop left	13:19
hje841	tobiasvl, my project is not a fork. I'm just keeping a mirror on github	13:19
	← beautifulmind left	13:19
tobiasvl	then you can't make any pull requests	13:19
	→ sohail joined	13:20
tobiasvl	a pull request is a request to the upstream, asking to pull from a fork	13:20
	← anaran left	13:22
	→ booboy_ joined	13:22
	→ lsiv568 joined	13:22
	← zumba_addict left	13:23
	→ zumba_addict joined	13:23
	→ palcu joined	13:23
	← doev left	13:23
	→ petersr joined	13:24
hje841	I see. so in case I want to make changes to a project - not my own - I fork it, commit locally, and then create a pull request when I'm done?	13:24
tobiasvl	yes	13:24
	→ EminenceHC joined	13:24
tobiasvl	https://help.github.com/articles/using-pull-requests/	13:24
	→ Takle joined	13:25
	→ Segfault_ joined	13:25
hje841	got it, thanks :)	13:25
	← nikita left	13:25
	→ neary joined	13:25
	→ numdig joined	13:26
	← mennea left	13:27
	→ nikita joined	13:27
	← zumba_addict left	13:27
	← The_Phoenix left	13:28
	← palcu left	13:28
	→ mmitchell joined	13:28
	← booboy left	13:29
	→ NoNMaDDeN joined	13:29
	← EminenceHC left	13:29
	← hje841 left	13:29
	→ dsdeiz joined	13:31
	→ checkItOut joined	13:31
	← sohail left	13:31
	← mmitchell left	13:33
	← booboy_ left	13:33
	→ palcu joined	13:33
	→ roelmonn_ joined	13:33
	→ booboy joined	13:33
	→ koderok joined	13:34
	← roelmonnens left	13:34
	← shebbi left	13:34
	→ palcu_ joined	13:35
	← lseb left	13:36
	→ solker joined	13:36
	→ sohail joined	13:36
	← palcu left	13:37
	→ d10n-work joined	13:38
	← pigeon left	13:39
	← galaris left	13:40
	→ pigeon joined	13:40
	← solker left	13:41
	← aspiers left	13:42
	→ danemacmillan joined	13:44
	→ otter768 joined	13:46
	→ denete joined	13:47
	← checkItOut left	13:47
	→ mellernoia joined	13:47
	← mtakkman left	13:48
	→ cjwilburn joined	13:48
	→ mennea joined	13:49
	→ lseb joined	13:49
	← DrSkyLizard left	13:50
	← otter768 left	13:51
	→ smccarthy joined	13:51
jottr	Hi all.	13:51
	← liamkeily left	13:51
jottr	I am in a repository that uses git flow workflow. Let's say I am on feature/foo and would like to sync with changes that have been commited to develop, and then go on working on feature/foo. What is the "correct" way of achieving this? A simple merge from develop to feature/foo? A rebase? I don't want to merge my changes of my branch to develop since that branch is not feature complete yet.	13:53
	← s8321414 left	13:54
grawity	merging from develop should be fine, I think	13:54
	→ s8321414 joined	13:55
	→ The_Phoenix joined	13:55
tobiasvl	fast-forward merge from develop	13:55
jottr	k thx	13:56
tobiasvl	jottr: http://git-scm.com/book/en/v2/Git-Branching-Rebasing	13:56
	→ bracero joined	13:57
	← St_Marx left	13:59
	→ listochkin joined	13:59
	→ meanderer joined	14:00
	← cjwilburn left	14:00
	← markelite left	14:00
	→ thumpba joined	14:00
	← nikita left	14:00
	→ EminenceHC joined	14:01
	→ tristanp joined	14:01
	← virtualsue left	14:01
	← bracero left	14:02
	→ nikita joined	14:03
	← listochkin left	14:03
	→ cjwilburn joined	14:03
	→ liamkeily joined	14:04
	← netj left	14:04
	→ netj joined	14:05
	→ Neozonz joined	14:05
	← Neozonz left	14:05
	→ Neozonz joined	14:05
	← sarri left	14:05
	← wieshka left	14:05
	→ sarri joined	14:07
	→ chrisshattuck joined	14:08
	← lpax left	14:09
	→ DrSkyLizard joined	14:09
	drizztbsd → timothy	14:09
	← EminenceHC left	14:09
	→ aspiers joined	14:09
	→ tranzfuse joined	14:10
	→ nurey joined	14:10
	← cjwilburn left	14:11
	→ tier joined	14:12
	← Gizburdt left	14:12
	→ kurkale6ka joined	14:12
	← Neozonz left	14:12
	→ Neozonz joined	14:12
	← Neozonz left	14:12
	→ Neozonz joined	14:12
	← chrisshattuck left	14:13
	→ irqq_ joined	14:13
	→ eletuchy joined	14:13
	→ marklite joined	14:14
	← Raverix left	14:14
	← StefanLehmann left	14:16
	← irqq left	14:17
	irqq_ → irqq	14:17
	← nurey left	14:17
	← eletuchy left	14:18
	← arup_r left	14:19
	← mizu_no_oto left	14:20
	← joo-_ left	14:21
	→ zivester joined	14:21
	→ listochkin joined	14:22
	← bahar left	14:22
	→ bahar joined	14:22
	→ seg_fault joined	14:23
	← s8321414 left	14:24
	→ jerematic_work joined	14:24
	← dsdeiz left	14:24
	→ msmith joined	14:24
	→ devoldmx3 joined	14:24
	← msmith left	14:24
	→ msmith joined	14:25
	→ HelperW joined	14:25
	← iamjarvo left	14:25
	← neary left	14:26
	→ neary joined	14:26
	Stummi_ → Stummi	14:26
	← devoldmx left	14:27
	← booboy left	14:27
	→ EminenceHC joined	14:29
	→ buffal0 joined	14:30
	→ tesaf joined	14:30
	← thierryp left	14:31
	→ cannonball joined	14:32
	→ Milk_weed joined	14:33
	← EminenceHC left	14:34
	→ endiruna1 joined	14:34
	→ subhojit777 joined	14:34
	← endiruna left	14:35
	→ virtualsue joined	14:35
	← weyer left	14:35
	← Milk_weed left	14:36
	→ solker joined	14:37
	→ weyer joined	14:37
	← thumpba left	14:37
	→ akiva joined	14:37
	→ iamjarvo joined	14:38
	→ ghostlines joined	14:38
	bambams__ → bambams	14:38
	← bambams left	14:39
	→ bambams joined	14:39
	← faylite left	14:39
	→ IrishPrime joined	14:39
	← Raging_Hog left	14:39
	← paul424 left	14:40
	← zoso left	14:40
	← solker left	14:41
	→ tinanoo joined	14:42
	→ thierryp joined	14:42
	→ LeMike joined	14:43
	→ anaran joined	14:43
	← pushbell7-home left	14:43
	→ cjwilburn joined	14:43
	← anaran left	14:44
	← devoldmx3 left	14:44
	→ mizu_no_oto joined	14:44
	→ lpax joined	14:44
	→ mtscout6 joined	14:45
	→ jerius joined	14:45
	→ Gizburdt joined	14:46
	← NoNMaDDeN left	14:46
	→ mewm joined	14:46
	→ tgunr joined	14:48
	→ Dougie187 joined	14:49
	← darkbasic left	14:50
	→ dreiss joined	14:50
	→ darkbasic joined	14:50
	← jerius left	14:51
	→ ruukasuu joined	14:51
	→ anaran joined	14:53
	→ joo-_ joined	14:53
	→ jerius joined	14:53
	← Takle left	14:53
	→ cvanball joined	14:54
	→ EminenceHC joined	14:55
	← ruukasuu left	14:55
	← ruukasu left	14:55
	← rchavik left	14:56
	→ ruukasu joined	14:56
	→ barduck joined	14:57
	← mizu_no_oto left	14:58
	→ bracero joined	14:58
	→ enitiz joined	14:58
	← diegoaguilar left	14:59
	→ lindenle joined	14:59
	→ forgottenleaf joined	14:59
	← EminenceHC left	15:00
	→ nickpresta joined	15:00
	← cjwilburn left	15:00
	→ Aune joined	15:01
	← forgottenleaf left	15:01
	→ plasticboy joined	15:01
	← m0viefreak left	15:01
	→ Takle joined	15:01
	→ skorgon joined	15:02
	← skorgon left	15:02
	→ skorgon joined	15:02
	← nikita left	15:02
	← clauswitt left	15:02
	→ RaceCondition joined	15:02
	← enitiz left	15:03
	← bracero left	15:03
	→ NoNMaDDeN joined	15:03
	→ thedodd joined	15:03
	→ cjwilburn joined	15:03
	← lindenle left	15:04
	← buffal0 left	15:04
	→ zumba_addict joined	15:04
	→ nikita joined	15:04
	→ buffal0 joined	15:04
	← scriptThis left	15:05
	→ mmitchell joined	15:05
	← netcarver left	15:05
	← ManikM left	15:06
	→ ManikM joined	15:06
	← JohnBat26 left	15:06
	← listochkin left	15:07
	← sburgess_ left	15:08
	→ listochkin joined	15:08
	← Errorical left	15:08
	← sburgess left	15:08
	← tristanp left	15:08
	← SHLV left	15:09
	→ tristanp joined	15:09
	→ tang^ joined	15:10
	→ AaronMT joined	15:11
	→ polyzen joined	15:11
	← GT left	15:11
	→ creep joined	15:11
	← palcu_ left	15:11
	→ BlaXpirit-UA joined	15:12
	→ maestrojed joined	15:12
	← cjwilburn left	15:12
	← boushi left	15:12
	← lsiv568 left	15:13
	← zivester left	15:13
	← jonatasnona left	15:14
	→ enitiz joined	15:15
	← BlaXpirit left	15:15
	→ renegade8164 joined	15:16
	→ kadoban joined	15:16
	← buffal0 left	15:16
	→ belac joined	15:16
	→ buffal0 joined	15:16
	→ palcu joined	15:17
	← rob_w__ left	15:18
	← DrSkyLizard left	15:18
	← s00pcan left	15:18
	← dreiss left	15:19
	→ luriv joined	15:19
	→ CustosLimen joined	15:20
belac	hello, can someone help me understand my "This branch is 3 commits ahead, 1 commit behind master"? the commits ahead is expected. but i cannot figure out what commit is behind.	15:20
	→ skylite joined	15:20
	→ leen^\| joined	15:20
	← nickpresta left	15:20
	← ncd\|leeN left	15:20
	→ s00pcan joined	15:21
canton7	belac, !lol	15:21
gitinfo	belac: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	15:21
	← cbr_ left	15:21
	→ lindenle joined	15:21
	← zumba_addict left	15:21
	→ CKyle joined	15:21
	← Macaveli left	15:21
	→ zumba_addict joined	15:22
	→ cbr_ joined	15:22
	→ Macaveli joined	15:22
	→ thumpba joined	15:22
	→ cjwilburn joined	15:23
	→ zumba_ad_ joined	15:23
belac	canton7 can you (or the bot) pretend like i barely know how to use git and explain?	15:23
	← zumba_addict left	15:23
canton7	run the command the bot gave you	15:23
	(or run 'gitk --all' if you've got gitk - installed by default with git bash)	15:23
	that'll give you a graph of all of your branches	15:23
osse	belac: git log <the other branch> and the first commit you'll see is that one	15:23
	→ sburgess_ joined	15:23
	→ sburgess joined	15:23
	← groolot left	15:23
	→ callmeDarwin joined	15:23
	← jagob left	15:24
	← denete left	15:24
	← listochkin left	15:24
	→ upene joined	15:25
	← Consuela left	15:25
	← thumpba left	15:25
	→ upene1 joined	15:26
	← upene left	15:26
	→ quitte joined	15:26
	← lpax left	15:26
	→ acharlieh joined	15:26
	→ msmith_ joined	15:26
	← Macaveli left	15:27
	→ marscher joined	15:27
belac	canton7: thx for gitk... that's fancy	15:27
	git log shows the same commit as the latest commit in both branches	15:27
	or the same operation i guess	15:28
	i merged a hotfix branch into master and then into development	15:28
	← zumba_ad_ left	15:28
	→ zumba_addict joined	15:28
	← akiva left	15:29
	← timothy left	15:29
quitte	Hi. I don't quite understand how I'm supposed to use branches. https://github.com/quitte/openwrt/commits/sunxi-mtd This looks like I was upstream and I pulled from openwrt. But that's backwards, isn't it? How can I track openwrt and keep my own changes at the top of the commits?	15:29
	← msmith left	15:30
quitte	If I were to create a new branch in sync with upstream I could cherry pick from mine. But then in the end I'll have a lot of outdated branches	15:31
	→ jiskiras joined	15:32
	→ styly_ joined	15:33
	← zumba_addict left	15:33
	→ zumba_addict joined	15:33
	← zumba_addict left	15:33
	→ zumba_addict joined	15:34
	← styly left	15:34
	← Takle left	15:34
lb1a	quitte, track is easy, just add the remote repo and fetch regularly. keep your stuff compatible = merge the upstream branch regularly. keep your commits on top of the upstream branch, rebase your stuff regularly on top of the upstream branch	15:34
	← joo-_ left	15:34
	→ Takle joined	15:34
	← zumba_addict left	15:34
	→ zumba_addict joined	15:35
	← Takle left	15:35
	← enitiz left	15:36
	→ pmallya joined	15:37
quitte	lb1a: oh. merge ist different than I thought. I shouldn't have made assumptions. I didn't merge in 2 months. Any idea how I can rebase all my changes now?	15:37
	→ solker joined	15:37
	← Trudko left	15:38
	→ shinnya joined	15:38
	← zumba_addict left	15:39
	→ lpax joined	15:39
lb1a	quitte, without knowing your current status, i'd say "git rebase upstream/master"	15:39
	→ zumba_addict joined	15:39
	→ joo-_ joined	15:40
lb1a	quitte, if you need more info give me more info about your status :D	15:40
	← sohail left	15:40
	← francisfish left	15:41
	→ akiva joined	15:41
	← palcu left	15:41
	→ jagob joined	15:42
	← solker left	15:42
	← anaran left	15:43
	← zumba_addict left	15:43
	→ listochkin joined	15:43
	→ zumba_addict joined	15:44
	→ anaran joined	15:44
	← scampbell left	15:44
	→ Takle joined	15:44
	← Sleepy63 left	15:44
	→ crose joined	15:44
	← buffal0 left	15:44
	→ buffal0 joined	15:45
	← the_drow left	15:45
	← HelperW left	15:45
quitte	lb1a: I just tried rebase openwrt/master. this looks good. but i solved a conflict with checkout --theirs. now of course it tells me something about there not being any changes	15:46
	→ zumba_ad_ joined	15:46
	← zumba_addict left	15:46
quitte	which is fine since there is another change that i stashed that will ultimately make more sense	15:47
	← uku left	15:47
quitte	but i'm a little worried to just use rebase --skip. How can I tell what exactly it is going to ski?	15:47
	← jottr left	15:47
	→ otter768 joined	15:47
	← cjwilburn left	15:47
	→ jottr joined	15:48
	→ booboy joined	15:49
	→ mizu_no_oto joined	15:50
	→ SumDude joined	15:51
	← a_le left	15:52
	← otter768 left	15:52
	→ Zupoman joined	15:52
	→ joelm joined	15:52
	← darkbasic left	15:52
	→ cjwilburn joined	15:52
	→ zumba_addict joined	15:53
	→ steele joined	15:53
	→ kirin` joined	15:53
	← zumba_ad_ left	15:53
	← nikita left	15:54
	← msmith_ left	15:54
	→ darkbasic joined	15:54
	→ AR45 joined	15:54
	→ msmith_ joined	15:54
	← thedodd left	15:55
	→ nikita joined	15:56
	← numdig left	15:56
	← TomyWork left	15:57
	→ Sleepy63 joined	15:57
	→ blackmesa joined	15:57
	← zumba_addict left	15:57
	← acolson left	15:59
	Solid1 → Solid1_afk	15:59
	→ bracero joined	15:59
	→ a_le joined	15:59
	← acharlieh left	15:59
	← Silmarilion left	16:00
	← roelmonn_ left	16:00
	→ twoface88 joined	16:00
	← FilipNortic left	16:00
	← bracero left	16:01
	→ bracero_ joined	16:01
	→ EminenceHC joined	16:01
	→ Milkweed joined	16:01
	← mennea left	16:01
	← akiva left	16:02
	← EminenceHC left	16:02
	→ EminenceHC joined	16:02
	→ Kicer86 joined	16:02
	→ Sasazuka joined	16:02
	← twoface88 left	16:02
	→ eletuchy joined	16:02
	→ twoface88 joined	16:03
lb1a	quitte, as you can see from man git rebase the skip option will skip the current patch it's rebasing	16:03
gitinfo	quitte: the git-rebase manpage is available at http://jk.gs/git-rebase.html	16:03
lb1a	quitte, think of rebase as an automated series of "git cherry-pick" and it will just skip one of those (in cases of conflicts the patch that causes the conflict)	16:04
	← cjwilburn left	16:04
	→ lsiv568 joined	16:04
quitte	lb1a: thanks. I already went ahead. it seems to have mostly worked okay. except for the commit named my first rebase. no idea what happened there. but I think I'll revert that anyways	16:04
lb1a	quitte, if you want more control over what rebase does, try experimenting with the interactive version of rebase (git rebase -i)	16:04
	← twoface88 left	16:05
lb1a	quitte, the good thing about rebase, if you commited everything before starting a rebase ( which is pretty likely since rebase will complain about a dirty workdir) you can always go back in case something goes wrong ;)	16:05
	← bracero_ left	16:05
quitte	I think at that point I should have used rebase --continue instead of commit	16:05
lb1a	yes after solving a conflict a --continue would be the right way	16:06
quitte	lb1a: what about the data on github. did i rewrite history?	16:06
	← JSharpe left	16:06
	→ twoface88 joined	16:06
	→ JSharpe joined	16:07
	← eletuchy left	16:07
lb1a	quitte, if you rebased stuff, which was already public (e.g. on github) and you push the rebased stuff again, you'll have to force that and yes, that would be rewriting history	16:07
	← osfe left	16:07
quitte	i did not have to force anything to get it in the current state	16:07
belac	canton7: can you tell me what i'm looking for in gitk to tell me what commit i have in master but not in development branch?	16:07
	← mewm left	16:07
canton7	belac, sure, pastie the output of 'git log --graph --oneline --decorate --all' (which shows the same thing), and I'll point out what's what	16:08
	→ DrSkyLizard joined	16:08
	→ acharlieh joined	16:08
	→ cjwilburn joined	16:10
	← a_le left	16:10
	← RaceCondition left	16:10
	→ a_le joined	16:10
	→ Liulantao joined	16:11
	← creep left	16:11
belac	canton7: thanks http://pastie.org/private/ddf9iz9esr0ot7gi27qbxa	16:11
osse	belac: don't worry. I'll let you know if I see that canton7 is lying to you	16:11
	← mlechner left	16:11
	→ forgottenleaf joined	16:12
belac	osse: thx. the delay in posting was bc i had to remember how the internet works	16:12
	← jargon left	16:13
	← Liulantao left	16:13
	← Gizburdt left	16:15
	← NoNMaDDeN left	16:15
canton7	ok. development's at 603ddc4, and master's at c71c30e. You can see they share a common ancestor of e98207c. Therefore master has a single merge commit which development does not have (c71c30e), and development has a single merge commit which master does not have (603ddc4). 603ddc4 merges in 99d1cb0 and c869a2d, both of which are therefore referenced by development but not by master	16:15
	→ NoNMaDDeN joined	16:15
	→ buffffal00 joined	16:15
	→ akiva joined	16:16
canton7	master's merge commit (c71c30e) only merges together e98207c and bb9c2a5, both of which are referenced by development	16:16
	← ThomasLocke left	16:16
	← Vinnie_win left	16:16
	← buffal0 left	16:16
	← renegade8164 left	16:16
	← forgottenleaf left	16:16
	← anaran left	16:17
	→ philipandersen joined	16:17
	→ ayaka joined	16:17
	→ anaran joined	16:17
	→ Vinnie_win joined	16:17
	→ Alex_____ joined	16:18
ayaka	I have a problem with rebase -i using edit, from the manual, I know I know I could split big commit into small one, but how to do that	16:18
	← maestrojed left	16:18
	→ ecky--ptang-zoob joined	16:18
	← Alex_____ left	16:19
belac	canton7: thx. still trying to process what you're saying (i'm slow, sorry). was this caused because i merged a branch into master first and then merged the same branch into development. was the correct thing to do to merge the branch into master and then merge master into development?	16:19
	→ Alex_____ joined	16:20
osse	ayaka: mark the commit you want to split for editing. when you get there, git reset HEAD~; then make as many commits as you want, then git rebase --continue	16:20
	← koderok left	16:20
	→ mtakkman joined	16:20
	→ imkmf joined	16:21
	← Alex_____ left	16:21
	→ Alex_____ joined	16:21
ayaka	osse, thank you	16:21
	→ yosito joined	16:22
	← Alex_____ left	16:22
	← anaran left	16:23
	← DrSkyLizard left	16:24
	→ anaran joined	16:24
	← cbr_ left	16:24
	← adamben left	16:25
	← EminenceHC left	16:25
	← anaran left	16:25
	← vurma left	16:26
	← cjwilburn left	16:26
	→ anaran joined	16:26
	← anaran left	16:27
	← lb1a left	16:27
	→ anaran joined	16:28
	← kermit left	16:29
	← Brain left	16:29
	← crose left	16:30
	→ kermit joined	16:31
	← skorgon left	16:31
	← upene1 left	16:31
	← gua_ould left	16:31
	→ bracero joined	16:31
	→ crose joined	16:32
	→ zumba_addict joined	16:32
	← aspiers left	16:32
	← Sasazuka left	16:34
	← thierryp left	16:34
	← The_Phoenix left	16:35
	← ayaka left	16:35
	← mmitchell left	16:35
	← callmeDarwin left	16:35
	→ mmitchell joined	16:35
	→ Gamecubic joined	16:36
	→ zanchoPansa joined	16:37
	→ callmeDarwin joined	16:37
	← seg_fault left	16:37
	→ MTecknology joined	16:37
	→ tier_ joined	16:37
	→ duplex joined	16:37
	→ pheaver joined	16:38
MTecknology	In hooks/post-receive, is it possible to figure out which branch was changed?	16:38
	→ solker joined	16:38
	← shinnya left	16:38
grawity	`man githooks`: it gets the list of all changed refs as stdin.	16:39
gitinfo	the githooks manpage is available at http://jk.gs/githooks.html	16:39
	← bracero left	16:39
	→ Rixius joined	16:40
	← jceb_ left	16:40
	← tier left	16:41
MTecknology	grawity: thanks :D	16:41
	← imkmf left	16:41
	← alorence left	16:42
	← solker left	16:43
mwoodson	anyone know how to tell when a commit was merged into a branch?	16:43
	→ cjwilburn joined	16:44
	← Xethron left	16:44
	→ shinnya joined	16:45
	→ govg joined	16:47
KevinMGranger	Unless there was a merge commit created, it's not really feasible to figure that out	16:47
	← gfixler left	16:47
	← listochkin left	16:48
	→ nurey joined	16:48
	← blackmesa left	16:49
	← cjwilburn left	16:49
	← nioncode left	16:49
	→ jonatasnona joined	16:50
	→ listochkin joined	16:50
	→ cjwilburn joined	16:51
	→ nioncode joined	16:52
	← LeMike left	16:53
	→ blackmesa joined	16:54
	→ smw joined	16:54
	→ thiago_ joined	16:55
	→ EminenceHC joined	16:55
	← shinnya left	16:56
	← yosito left	16:56
	← m0ltar left	16:56
	← callmeDarwin left	16:57
	← ghostlines left	16:57
	→ thiago__ joined	16:58
	thiago__ → thiago	16:58
	← Error404NotFound left	16:58
	→ RaceCondition joined	16:58
	→ Macaveli joined	16:59
	← mtakkman left	17:00
	→ Noldorin joined	17:00
	← Gamecubic left	17:00
	→ thierryp joined	17:00
	→ KnightsOfNi joined	17:01
	→ osfe joined	17:01
	← Sleepy63 left	17:01
	← blackmesa left	17:01
	← Takle left	17:01
	← thiago_ left	17:01
	← jnavila_ left	17:01
	→ shinnya joined	17:02
	← Neozonz left	17:02
	→ Neozonz joined	17:02
	→ kpease joined	17:03
	← ecky--ptang-zoob left	17:04
	→ Takle joined	17:05
	→ ajustrun joined	17:05
	← ManikM left	17:06
	→ ManikM joined	17:06
	→ tyreld joined	17:07
	→ tanath joined	17:07
	→ daito joined	17:07
	← Macaveli left	17:07
	← martinklepsch left	17:08
	→ mennea joined	17:08
	→ Gamecubic joined	17:08
	← pmallya left	17:08
	← mennea left	17:09
	→ CheckDavid joined	17:09
	← hebz0rl left	17:10
	← learner1 left	17:10
	→ mennea joined	17:11
	← ciampix left	17:11
	→ Sasazuka joined	17:11
	→ m0ltar joined	17:11
	← daito left	17:11
	→ DevAntoine joined	17:12
DevAntoine	hi	17:12
	← mennea left	17:12
DevAntoine	I've donne a commit -amend, which is not pushed, and I'd like to undo this amend, is it possible?	17:12
canton7	look at the reflog	17:13
	→ pmallya_ joined	17:13
	→ mennea joined	17:14
	← Noldorin left	17:15
DevAntoine	canton7: first time I use reflog, here is what matters to me:	17:15
	a68ff10 HEAD@{0}: commit (amend): Added invalid inputs coloration	17:15
	I want to revert that	17:15
canton7	and the entry before that?	17:15
	→ mkjackson joined	17:15
mkjackson	hey folks, so I was wondering... is the index file little more than the tree file that will be associated with the next commit?	17:16
canton7	it is a bit more, yeah	17:16
	think about merge conflicts	17:16
	← joeyDB left	17:16
canton7	and it's got a ton of caching to easily determine files which have changed	17:16
DevAntoine	canton7: the entry before that is a271929 HEAD@{1}: commit: Added invalid inputs coloration which I wanna keep	17:16
	→ jceb joined	17:17
mkjackson	OK, so there's some more functionality there but if I explained it to folks as such it's essentially that	17:17
canton7	that's the commit you want to go back to?	17:17
	← kriks left	17:17
canton7	mkjackson, it's a superset of that, yeah	17:17
mkjackson	canton7: thanks!	17:17
	← tvw left	17:17
canton7	DevAntoine, that's the commit you want to go back to?	17:17
mkjackson	also, how does git know what changes are in a directory so quick? is there an underlying process running?	17:18
	→ eletuchy joined	17:18
canton7	honestly, I don't know. there's no background process, but I think some smart caching of things like inode numbers, filetimes, hashes, etc, happens	17:18
mkjackson	makes sense	17:18
DevAntoine	canton7: yep	17:18
	← Aune left	17:18
	← govg left	17:18
canton7	DevAntoine, reset --hard to that commit, then	17:18
	← marscher left	17:19
DevAntoine	canton7: even if my amend hasn't been pushed?	17:19
someplace	git is coded well, in a decent language :)	17:19
	→ Aune joined	17:19
canton7	DevAntoine, only if your ament hasn't been pushed	17:19
	*amend	17:19
mkjackson	and finally, does git (3 way/common) merge get tripped up by whitespace changes? in other words, would git merge just as well if tabs were converted to spaces as well?	17:19
	← KnightsOfNi left	17:19
	→ imkmf joined	17:19
	← imkmf left	17:20
	← lacrymology left	17:20
mkjackson	I've inadvertently become the git evangelist at my new job and it's amazing how technical people become when questioning the validity of a tech they don't even understand how to use	17:20
	→ LucasKA_ joined	17:20
	→ Noldorin joined	17:20
mkjackson	IE I don't know how branches are useful but let me give you an edge-case (white-space stuff) to pour over	17:21
	← Takle left	17:21
DevAntoine	canton7: thanks	17:21
	→ desposo joined	17:21
	→ tbxyz joined	17:22
canton7	mkjackson, there are languages where whitespaces are significant. If both sides of the merge change whitespace in different ways, you'll get a conflict by default	17:22
	← eletuchy left	17:22
	← ajustrun left	17:22
canton7	(there are merge options to control this: see man git merge)	17:22
gitinfo	the git-merge manpage is available at http://jk.gs/git-merge.html	17:22
mkjackson	canton7: gotcha, so defer to ignore-white-space option in merge	17:23
	→ joeyDB joined	17:23
mkjackson	and generally encourage teams to get a standard and stick to it	17:23
canton7	I mean, if you're changing whitespace lots all over the place, you've got other problems	17:23
mkjackson	(so done trying to see people argue about that kind of stuff in this day and age)	17:23
	← lsiv568 left	17:24
	→ imachuchu joined	17:24
mkjackson	tell me about it, it's just minutia that is prevalent when parties want to drag their feet but want to look smart while doing so	17:24
	:-/	17:24
	→ imkmf_ joined	17:25
	→ joeyDB_ joined	17:25
	→ mbildner joined	17:25
mkjackson	"it's not like I don't think it's a good fit and a great tech, I just think we need to talk out all the issues first"	17:25
	:-P	17:25
	← joeyDB left	17:25
mkjackson	thanks again for all the assistance	17:25
	→ arnaud__ joined	17:25
	→ mennea_ joined	17:25
	← DevAntoine left	17:25
	← mennea_ left	17:27
	→ kukks joined	17:27
	← kukks left	17:27
	→ kukks joined	17:27
	← mennea left	17:27
	← arnaud__ left	17:27
	→ mennea joined	17:27
	→ Pyrogerg joined	17:28
	← MartialLaw left	17:29
	→ ajustrun joined	17:30
	← mennea left	17:30
	← mkjackson left	17:30
	→ jottr_ joined	17:31
	→ nour joined	17:31
	← jottr left	17:31
	← freimatz left	17:32
	← hegge left	17:32
	→ strk joined	17:33
	← cjwilburn left	17:34
	→ solker joined	17:34
	→ sohail joined	17:34
	← mikecmpbll left	17:34
	← thiago left	17:34
	→ kriks joined	17:34
	← osfe left	17:35
	← liamkeily left	17:35
	→ blubberbop joined	17:35
	→ thedodd joined	17:36
	← RaceCondition left	17:36
	← a_le left	17:37
	← wrouesnel left	17:37
	→ mihaicris joined	17:38
	→ ascarter joined	17:39
	← iamjarvo left	17:39
	→ in_deep_thought joined	17:39
	→ palcu joined	17:40
	→ Vivekananda_y510 joined	17:41
	→ ecky--ptang-zoob joined	17:41
	← ajustrun left	17:42
	→ hahuang61 joined	17:42
	→ Errorical joined	17:42
	→ cjwilburn joined	17:44
	← Neozonz left	17:44
	→ Neozonz joined	17:44
	← Neozonz left	17:44
	→ Neozonz joined	17:44
	→ ajustrun joined	17:45
	→ RichardJ joined	17:46
	→ checkit joined	17:46
	← achadwick left	17:47
	← Novitsh_ left	17:47
	→ otter768 joined	17:48
	→ EvilPenguin joined	17:48
	← cjwilburn left	17:49
	← ajustrun left	17:50
	→ alanwill joined	17:50
	→ learner joined	17:50
	← mizu_no_oto left	17:50
	← virtualsue left	17:50
	→ msmith__ joined	17:52
	← psoo left	17:52
	→ tranzfus_ joined	17:52
	← jiskiras left	17:53
	← otter768 left	17:53
	← pmallya_ left	17:54
	→ pmallya joined	17:54
	← kurkale6ka left	17:55
	← jottr_ left	17:55
	← msmith_ left	17:55
	→ paulweb5151 joined	17:56
	→ Junior joined	17:56
	→ jottr_ joined	17:56
	← tranzfuse left	17:56
	→ ajustrun joined	17:56
	← paulweb515 left	17:57
	← lpax left	17:58
	→ Bruno_ joined	17:58
	← ecky--ptang-zoob left	17:58
	→ a_le joined	17:59
	→ mizu_no_oto joined	17:59
	← thedodd left	17:59
	← seschwar left	17:59
	← BSaboia left	17:59
	→ MattMaker joined	18:00
	→ mmitchel_ joined	18:00
	← mmitchell left	18:00
	→ axl_ joined	18:01
	→ iamjarvo joined	18:01
	← iamjarvo left	18:02
linduxed	is there some way to have the commit message editors that pop up during git-rebase ALWAYS have --verbose?	18:02
	→ iamjarvo joined	18:02
linduxed	i want a diff in the editor at all time	18:02
	*times	18:02
	← joeyDB_ left	18:02
	← iamjarvo left	18:02
	→ joeyDB_ joined	18:03
	→ iamjarvo joined	18:03
	→ osfe joined	18:03
	→ cjwilburn joined	18:04
	→ knownasilya joined	18:05
avar	No, this is a feature you'd need to implement	18:05
	→ NBhosting joined	18:07
	← msmith__ left	18:07
	→ msmith_ joined	18:08
	→ looper joined	18:08
	← tristanp left	18:08
	← okanck left	18:09
	→ LeMike joined	18:10
	→ lsiv568 joined	18:10
	→ Vampire0 joined	18:11
	→ tristanp joined	18:11
	← abec0 left	18:12
	← niro left	18:12
	→ denete joined	18:12
	→ dp joined	18:12
	← tharkun left	18:13
	→ tharkun joined	18:14
	← luksaur left	18:14
	← AR45 left	18:15
	→ thiago_ joined	18:15
	← vtunka left	18:16
	← weyer left	18:16
	← iamjarvo left	18:16
	← ManikM left	18:16
	→ tranzfuse joined	18:17
	← petersr left	18:18
	→ luksaur joined	18:18
	← irqq left	18:19
	→ weyer joined	18:19
	← cjwilburn left	18:19
	→ __TheDodd__ joined	18:20
	← tranzfus_ left	18:20
	→ iamjarvo joined	18:22
	← mmitchel_ left	18:23
	→ jacksparrow007 joined	18:23
	← weyer left	18:24
	→ styly joined	18:24
	moritz would simply have a second terminal open with a git diff --staged	18:24
	→ cjwilburn joined	18:24
	→ otter768 joined	18:25
	→ pcypher joined	18:25
	← akiva left	18:25
	← belac left	18:25
	← teran left	18:26
	← Aune left	18:26
	← styly_ left	18:26
	→ michelangelo joined	18:27
	→ ecky--ptang-zoob joined	18:27
	→ jiskiras joined	18:27
	← strk left	18:28
	→ mmitchell joined	18:28
	→ maestrojed joined	18:29
	← cjwilburn left	18:29
	← User458764 left	18:30
	← donmichelangelo left	18:30
	→ vdv joined	18:31
	→ strk joined	18:31
strk	can git-svn clone with a depth ?	18:31
	← vdv left	18:31
strk	I'd like some history but don't need the full one	18:31
	← __TheDodd__ left	18:34
	← subhojit777 left	18:34
	← osfe left	18:35
	← jonatasnona left	18:36
	← nour left	18:39
	→ vurma joined	18:39
	→ KnightsOfNi joined	18:40
	← lsiv568 left	18:40
	→ weyer joined	18:41
	← nnyk left	18:41
	← KnightsOfNi left	18:41
	← dialeth_ left	18:41
	→ cjwilburn joined	18:41
	→ atmosx joined	18:41
	→ arnaud__ joined	18:41
	← denete left	18:41
	→ baweaver joined	18:43
	→ carlosr joined	18:43
	← ecky--ptang-zoob left	18:43
	← Sasazuka left	18:43
	→ Oebele joined	18:43
	← cvanball left	18:43
	→ lsiv568 joined	18:44
	← GGflags left	18:45
	← arnaud__ left	18:46
	← cjwilburn left	18:46
	← mbildner left	18:46
	← pcypher left	18:47
	← vlad003 left	18:47
Seveas	strk: no	18:47
sybariten	oh hai	18:49
	can someone point me in the right direction for a better DL link than the first link here? http://markashleybell.com/portable-git-windows-setting-home-environment-variable.html	18:49
	← nurey left	18:50
sybariten	which is rather dead	18:50
	→ ecky--ptang-zoob joined	18:50
Seveas	sybariten: msysgit is now 'git for windows' and it lives at http://msysgit.github.io/	18:52
	← Pyrogerg left	18:52
	← ecky--ptang-zoob left	18:52
	← neary left	18:52
	→ Jonuz joined	18:52
sybariten	Seveas: yeah but i got an exe in my lap immediately without any questions.... thats not what i was looking for	18:52
	thiago_ → thiago	18:53
	→ scriptThis joined	18:54
	← scriptThis left	18:54
	→ Nijikokun joined	18:54
	→ scriptThis joined	18:55
	→ pcypher joined	18:55
	→ Sasazuka joined	18:55
	← davidreis left	18:56
	← jiskiras left	18:56
	→ cjwilburn joined	18:56
	→ denete joined	18:56
	→ jiskiras joined	18:56
	→ obozhdi joined	18:57
	→ dreiss joined	18:57
	← obozhdi left	18:57
	→ ecky--ptang-zoob joined	18:57
	→ obozhdi joined	18:57
	→ jiskiras_ joined	18:58
	← jiskiras left	18:58
	← obozhdi left	18:59
	→ obozhdi joined	18:59
	← obozhdi left	19:00
	← Gamecubic left	19:00
	→ obozhdi joined	19:01
	← cjwilburn left	19:01
	→ kpease_ joined	19:01
	← basiclaser_ left	19:01
Seveas	sybariten: I've never used 'portable git', but that article is 4 years old. Maybe the 'portable' part got merged with git for windows proper and is now an install option?	19:02
	← jiskiras_ left	19:02
	← obozhdi left	19:02
	→ Gamecubic joined	19:02
	← pheaver left	19:02
	← angelsl left	19:03
	→ osfe joined	19:03
	→ chrisshattuck joined	19:03
	← EvilPenguin left	19:03
	← kpease left	19:04
	→ thedodd joined	19:05
	← dEPy left	19:05
sybariten	Seveas: i think i gfound it ... :) https://github.com/msysgit/msysgit/releases some of the .7z files there will be fine	19:05
	← pmallya left	19:06
	→ eletuchy joined	19:07
	← NoNMaDDeN left	19:07
	→ Shusshu joined	19:07
	→ xlinkz0 joined	19:07
	→ Ngt joined	19:07
	→ jonatasnona joined	19:08
	→ NoNMaDDeN joined	19:08
Seveas	sybariten: ah, so that's where they hide them these days :)	19:08
	→ jiskiras joined	19:09
	← Shusshu left	19:09
sybariten	yep	19:09
	→ martinklepsch joined	19:09
sybariten	now, however i am at complete loss	19:09
	→ e66 joined	19:09
	← nephyrin left	19:10
sybariten	or, thats not the expression, but i am a bit perplexed as to what to do. I started out with git in the hope of actually only using it as a versioning system for program configurations.	19:10
	→ nephyrin joined	19:10
	← solker left	19:11
	← eletuchy left	19:11
sybariten	and i am as unsure about the terminology as the technology. I run a private server, and i know that i have managed to perform a successful ... init, and commit, i suppose, i did that from work, of a small folder	19:11
	← lsiv568 left	19:11
	→ lsiv568 joined	19:12
	← jason237 left	19:12
sybariten	now that i want to "check out" the same folder at home, whats the command that i want to use? git doesnt, from this fresh install, know about my private server ofcourse	19:12
	← darkbasic left	19:12
	→ enitiz joined	19:13
	→ darkbasic joined	19:13
Seveas	if you did an init and commit, you won't have created a bare repository. Which means that you can clone this repository (git clone), but pushing new commits into it is not advisable.	19:13
	→ jb55 joined	19:13
	→ pmallya_ joined	19:13
	→ veebers joined	19:13
Seveas	sybariten: I would advise you to reed the first few chapters of 'pro git' to get a hang of the basics	19:14
sybariten	ok will do	19:14
PerlJam	sybariten: and read them too ;)	19:14
Seveas	PerlJam :P	19:14
sybariten	i have access to lynda.com too btw, which seems promising (educational site which prolly has some git courses)	19:15
Seveas	What does perl jam taste like? onions?	19:15
PerlJam	garlic! :)	19:15
	→ solker joined	19:15
Seveas	heh	19:16
	good for keeping support vampires out :)	19:16
	→ pheaver joined	19:16
sybariten	you say i "wont have created a bare repository".... could you just elaborate on this? (i have a rough copy of my bash history from when i did that, btw, so i can see what i did). What other ways could i have done this?	19:16
	→ mbildner joined	19:16
	← veebers left	19:16
	→ corni joined	19:16
	← israelpattison left	19:16
Seveas	sybariten: what you have done may be enough, depends on whether you need to push from your desktop to the server or not	19:17
sybariten	i would need to push (can i say upload?) from both places yeah, thats the whole idea for my setup.	19:18
	→ jumamni joined	19:19
sybariten	well, not really adding a lot of new files after a while, but something like my "putty" settings, or .emacs, will change/improve both at work and at home. And i want to have one ultimate version	19:19
Seveas	you can say upload, but it's best to stick with standard git terminology :)	19:19
	← martinklepsch left	19:19
sybariten	heh, i suppose	19:19
Seveas	then create a bare repository next to the one you created, and push from the non-bare into the bare one	19:20
	→ martinklepsch joined	19:20
Seveas	that way the bare one becomes the central one, and you can clone it in as many places as you want and push/pull from all these places	19:20
sybariten	whoa	19:21
	now this obviously requires new ways of thinking	19:21
Seveas	read the pro git book (it's a free e-book), it'll become clear :)	19:21
sybariten	ok	19:21
	→ israelpattison joined	19:21
	← tbxyz left	19:21
	← tristanp left	19:22
	← baweaver left	19:23
	→ Gavrisimo joined	19:23
	← ajustrun left	19:24
	→ Macaveli joined	19:24
	→ ajustrun joined	19:25
	→ basiclaser_ joined	19:25
	→ settermjd joined	19:25
	→ aspiers joined	19:26
	→ virtualsue joined	19:26
	→ aidalgol joined	19:27
	→ hegge joined	19:27
	← nrsk left	19:28
	→ WaReZ joined	19:30
	← thierryp left	19:30
	→ govg joined	19:31
	← dp left	19:35
	← pheaver left	19:35
	→ ghostlines joined	19:35
	← osfe left	19:35
	← hexagoxel left	19:35
	← in_deep_thought left	19:36
	→ bracero joined	19:36
	→ ehynds joined	19:36
	→ cjwilburn joined	19:37
	← jonatasnona left	19:38
	→ Viata joined	19:38
	← e66 left	19:38
	← sohail left	19:39
	→ akiva joined	19:40
	← akiva left	19:40
	← m0ltar left	19:40
	→ akiva joined	19:40
	← akiva left	19:40
	← scriptThis left	19:40
	→ congruent joined	19:41
	→ akiva joined	19:41
	kpease_ → kpease	19:41
	← luksaur left	19:42
	← scottpgallagher left	19:42
	← ascarter left	19:42
	→ thiago_ joined	19:42
	→ KnightsOfNi joined	19:42
congruent	I've made my homepage into a repo.. I work on my machine at home and then push the changes to my server. Only, at home I include a meta-refresh so that I can watch my site change as I write. Is there a way to strip this out whenever I push to my server?	19:42
	→ in_deep_thought joined	19:43
_ikke_	congruent: No, you'd have to rewrite your commits	19:43
	← ecky--ptang-zoob left	19:43
	kpease → kpease_	19:43
_ikke_	Use a runtime flag to decide whether to meta-refresh, and use a not-comitted config file to set that flag	19:44
congruent	_ikke_: 'runtime flag'? (I will read things)	19:44
	_ikke_: I was looking at githooks.	19:45
	→ jonatasnona joined	19:45
_ikke_	Don't treat this as a git problem, it's not	19:45
	← denete left	19:45
	← thiago left	19:46
congruent	_ikke_: talkin to me? confused	19:46
	→ pheaver joined	19:47
	→ baweaver joined	19:47
	← cjwilburn left	19:47
_ikke_	congruent: this is inherently a deployment problem, and git is not built to be a deploy tool. Just add some sort of setting that tells you what environment it is (prod, test, dev). The file containing this setting should not be added tot git.	19:48
congruent	_ikke_: But that creates a security problem.	19:48
_ikke_	congruent: Then you can change this file for each environment	19:48
tobiasvl	has nobody said !deploy yet	19:48
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	19:48
	← solker left	19:48
tobiasvl	jumamni is a query spammer btw	19:48
	ChanServ set mode: +o	19:48
	_ikke_ kicked jumamni (Stop spamming!)	19:49
	→ sohail joined	19:49
	→ jumamni joined	19:49
	_ikke_ set mode: -o	19:49
	→ geomyidae_ joined	19:49
congruent	ahh, so this, what I want, is a "deployment" system :)	19:49
	→ cjwilburn joined	19:49
_ikke_	congruent: Yeah, a deployment system helps deploying code to a specific environment	19:49
	→ cvanball joined	19:49
congruent	_ikke_: When you say "just" add, what are you saying specifically?	19:50
_ikke_	congruent: I don't know what kind of project it is, but you should be able to add a settings file or something like that	19:50
	← geomyidae_ left	19:50
	→ geomyidae_ joined	19:50
_ikke_	A configuration file	19:50
congruent	_ikke_: Excuse, to be read by what?	19:51
	kpease_ → kpease	19:51
	← baweaver left	19:52
_ikke_	congruent: What kind of project are you talking about?	19:52
congruent	_ikke_: My personal webpage.	19:52
_ikke_	Is it just html?	19:53
	← Vasistha left	19:53
	→ m8 joined	19:53
congruent	_ikke_: Right now, yes. Future, PHP, js.	19:54
	← imkmf_ left	19:54
	← crose left	19:54
	← Macaveli left	19:54
	← cjwilburn left	19:54
congruent	_ikke_: pm you my url?	19:54
_ikke_	sure, but doesn't really matter	19:54
	← jonatasnona left	19:55
	→ mribeirodantas joined	19:56
	← mibofra left	19:56
	→ mibofra joined	19:56
	← luriv left	19:57
	→ cjwilburn joined	19:58
	← bbloom left	19:58
	← SumDude left	19:58
	← thedodd left	19:58
	→ imkmf joined	19:58
	← mizu_no_oto left	19:59
	→ bbloom joined	19:59
	→ liamkeily joined	19:59
	→ crose joined	19:59
	→ tristanp joined	20:00
	← thiago_ left	20:01
_ikke_	If it's just static html, that makes it a bit harder. You could use javascript and look at the domain for example to determine whether to refresh or not	20:01
	→ thiago joined	20:01
	← kpease left	20:01
	→ thierryp joined	20:02
	← cjwilburn left	20:02
	→ osfe joined	20:03
congruent	_ikke_: That feels like leaving the door open. But I could do a little crypto.. I could store the hash of the URL.	20:03
	← CKyle left	20:03
	→ LucasKA joined	20:03
	→ Gavrisimooo joined	20:04
	→ ascarter joined	20:04
_ikke_	Why? Does it matter if anyone could spoof the domain and cause your website to autorefresh?	20:04
	← LucasKA_ left	20:04
congruent	_ikke_: Yea, that's a just add water DoS	20:05
	→ SumDude joined	20:05
	← EminenceHC left	20:05
	← enitiz left	20:05
_ikke_	There are lots easier and better ways to dos you	20:05
	Unless you can force anyone else to autorefresh	20:05
	→ EvilPenguin joined	20:06
	← thierryp left	20:06
	← Gavrisimo left	20:06
_ikke_	Which would require your to spoof their dns	20:07
	← KnightsOfNi left	20:08
	← vurma left	20:08
	← atmosx left	20:08
	→ KnightsOfNi joined	20:08
	→ thierryp joined	20:09
	→ thedodd joined	20:09
	← mihaicris left	20:10
	← learner left	20:10
	← Viata left	20:13
	→ kcm1700_ joined	20:13
	→ baweaver joined	20:13
	→ mizu_no_oto joined	20:13
	← monty left	20:13
Ngt	hi! When you clone a local bare repository, do you necessarily get another bare repo or can you get one with a working directory?	20:13
_ikke_	Ngt: The latter. Unless you tell git create a bare repository (clone --bare), it will create a non-bare one	20:14
	← baweaver left	20:14
	→ punchaga` joined	20:14
	← punchaga` left	20:14
	← Sasazuka left	20:15
	→ baweaver joined	20:15
	→ Sasazuka joined	20:15
	← kcm1700 left	20:15
	← jiskiras left	20:16
	→ monty joined	20:16
	→ jiskiras joined	20:16
Ngt	That's what I thought too. When I clone my remote bare repo on my local machine using ssh, I get a clone with a working tree. But when I connect on my server and try to clone this same bare repo I get an empty folder containing only a .git folder.	20:17
	← MTecknology left	20:17
_ikke_	Ngt: If it contains a .git folder, it's not a bare repository	20:17
	← kcm1700_ left	20:17
	← punchagan left	20:17
tobiasvl	_ikke_: uh... isn't that the other way around?	20:18
	a bare repo _only_ contains .git?	20:18
	→ kcm1700 joined	20:18
_ikke_	No, a bare repository is the .git directory	20:18
tobiasvl	ah. yes.	20:18
	← LucasKA left	20:19
	→ thafreak joined	20:19
	→ enitiz joined	20:19
thafreak	say I want to preserve a git repo, archive it if you will	20:19
Ngt	_ikke_: yeah but if that's the case I should get all the other files along side the .git or that's not the case	20:19
markmarkmark	thafreak: man git archive	20:20
gitinfo	thafreak: the git-archive manpage is available at http://jk.gs/git-archive.html	20:20
_ikke_	Ngt: Do you get any message when cloning the repository?	20:20
	markmarkmark: That doesn't archive a repository	20:20
Eugene	thafreak - do you mean a !backup or a copy of the tree in a given state?	20:20
gitinfo	thafreak: 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	20:20
thafreak	i saw that, but it doesn't sound like it preserves history	20:20
_ikke_	nope	20:20
	thafreak: Just tar the repository directory	20:21
thafreak	so, I'm looking for the equivalent of svn's dump	20:21
_ikke_	thafreak: There is no need, you already have the complete repo	20:21
thafreak	some sort of format that I could restore later in the future if needed	20:21
Eugene	`git clone` will give you a new repo with the entirety of the history	20:21
canton7	sounds like someone's record broke	20:21
thafreak	so just tar up a cloned repo?	20:21
	ChanServ set mode: +o	20:21
_ikke_	thafreak: sure	20:22
	Eugene set mode: +b	20:22
	Eugene kicked jumamni (Spam spam spam spam)	20:22
_ikke_	Hmm, forgot to ban it	20:22
thafreak	is there any guarantee that future versions will be able to read it?	20:22
	→ s3a joined	20:22
_ikke_	thafreak: git is very conservative regarding repo format	20:22
thafreak	what about bundles?	20:22
Eugene	thafreak - if git ever does change its repo format again(unlikely) you can 100% expect an upgrade path to be available	20:22
_ikke_	bundles are packfiles	20:22
Eugene	Just take a tarball of a !bare repo and you're golden.	20:23
gitinfo	an explanation of bare and non-bare repositories (and why pushing to a non-bare one causes problems) can be found here: http://bare-vs-nonbare.gitrecipes.de/	20:23
	← WaReZ left	20:23
	→ irqq joined	20:23
	Eugene changed the topic to: Welcome to #git, the place for git help and missing commands \| Current stable version: 2.1.3 \| Start here: http://jk.gs/git \| Getting "cannot send to channel"? /msg gitinfo .voice \| Knock knock. Who's there? Git. Git-who? Sorry, 'who' is not a git command - did you mean 'show'?	20:23
	Eugene kicked Eugene (Excess silliness)	20:23
thafreak	alright, thanks for the info...I wanted to hear it from experts before I archived some of these old repos	20:23
	→ LucasKA joined	20:23
	→ Eugene joined	20:23
_ikke_	Eugene: lol?	20:23
	← kriks left	20:24
	← jiskiras left	20:24
s3a	I'm so confused about how to deal with branches. I get in theory that branches are used for working on code that is incomplete/unstable prior to merging the changes in a certain non-master branch into master, but someone created a master branch and I don't know how to pull it and NOT merge it to master. Could someone please help me?	20:24
	→ jiskiras joined	20:24
Eugene	s3a - you want to do `git fetch`, not `git pull`. !pull	20:24
gitinfo	s3a: pull=fetch+merge (or with flags/config also fetch+rebase). It is thus not the opposite of push in any sense. A good article that explains the difference between fetch and pull: http://longair.net/blog/2009/04/16/git-fetch-and-merge/	20:24
s3a	someone created a non-master branch*(	20:24
	→ Rastus_Vernon joined	20:24
	← Oebele left	20:24
Ngt	_ikke_: I run git clone -v /path/to/repo.git/ test-deploy . The only thing I get as a message is :	20:24
	"Cloning into 'test-deploy'...	20:24
	done."	20:24
	The test-deploy folder is created but it has only a .git folder in it.	20:24
_ikke_	s3a: Note that master is in no-way special	20:25
Eugene	Ngt - are you cloning an empty repo?	20:25
s3a	Eugene, that helps. so is it git fetch url_i_usually_pull?	20:25
	_ikke_, in other words it's the default name that can be changed?	20:25
	← tier_ left	20:25
_ikke_	s3a: correct	20:25
Eugene	s3a - `git fetch <remote-name>`; see `git remote`; it's usually 'origin'. You can also just do `git fetch` if there's only one named remote.	20:25
	→ tier joined	20:26
	→ MarkyC joined	20:26
s3a	_ikke_, alright. thanks for confirming, but i tend to prefer using defaults at least at first.	20:26
Ngt	Eugene: Nope, it is the repo I use every day to work on and when I clone it from my local machine I get a clone with a working tree and all the files.	20:26
	→ nnyk joined	20:26
Eugene	s3a - when you fetch, it brings down all changes to other branches, and stores them under "remote branches"(see `git branch -vva`, there'll be a few named origin/). You can visuallize what's going on with branching & merging with a command like !lol	20:26
gitinfo	s3a: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	20:26
s3a	Eugene, wait, that's information overload for me	20:28
	the branch is called	20:28
	RoughDraft	20:28
Eugene	s3a - that means you're learning ;-)	20:28
	← congruent left	20:28
s3a	lol, i like to learn one thing at a time tho	20:28
	what's remote name?	20:28
_ikke_	s3a: A remote is a shortcut to a url	20:28
Seveas	something that looks remotely like a name :)	20:29
	← strk left	20:29
Eugene	It's the name of the "remote" that's been defined. If you ran `git clone <someurl>`, then git stores a shortcut to <someurl> as 'origin', the default remote name.	20:29
	This way you don't need to type it out every time you want to fetch / push	20:29
	→ ascarter_ joined	20:29
s3a	o u mean the url?	20:29
	i just used the history command to copy paste it	20:29
	→ WaReZ joined	20:29
_ikke_	You don't need to do that	20:29
Eugene	We're saying that the url is saved for you, as "origin"	20:30
Ngt	it is pretty much like an alias IIRC	20:30
s3a	ok so instead of git pull the_url, i can just say git pull origin?	20:30
Ngt	yes	20:30
s3a	fatal: 'origin' does not appear to be a git repository	20:30
	← duplex left	20:30
s3a	for git pull origin	20:31
	← ajustrun left	20:31
s3a	o wait	20:31
	i need to do git fetch the_url first?	20:31
	→ duplex joined	20:31
	← paulweb5151 left	20:31
	→ ajustrun joined	20:31
_ikke_	no	20:32
	← in_deep_thought left	20:32
	← Vivekananda_y510 left	20:32
s3a	o :(	20:32
_ikke_	s3a: type in: git remote show	20:32
s3a	no output (other than a new line)	20:32
_ikke_	ok	20:32
	git remote add origin <url>	20:32
	(you can choose any other name for origin)	20:32
s3a	o i c	20:32
	← ascarter left	20:32
s3a	so if i did git remote add <url> then it would default to origin?	20:32
_ikke_	You have to provide a name	20:33
	← osfe left	20:33
	→ n-st joined	20:33
_ikke_	origin is created default when you clone, but same as with master, in no way special	20:33
s3a	o so it's a convention and not a default?	20:33
	→ dusted joined	20:33
	→ kpease joined	20:33
	← listochkin left	20:33
s3a	wait what's the difference between clone and pull	20:33
	→ congruent joined	20:33
Eugene	clone gets EVERYTHING and makes a new repo.	20:34
	fetch brings down updates from a remote/URL	20:34
	← heroux left	20:34
Eugene	pull does a fetch, then merges the branch that you named.	20:34
s3a	so what's an example of something fetch would omit?	20:34
Eugene	Usually you want to use fetch, then examine(via log), then merge. A lot of guides recommend just doing pull	20:34
	→ jason237 joined	20:34
Eugene	It's taking a photocopy vs reshuffling the papers together, sight-unseen	20:35
	← sh4rm4 left	20:35
	← ghostlines left	20:35
Eugene	You want to look at it before you merge it in to what you've been doing	20:35
	← ascarter_ left	20:35
_ikke_	s3a: you clone a repository only once	20:35
	→ heroux joined	20:36
dusted	I have a bare repo which I need to bring to the same state as another bare repo (which is on github), if I do git remote show origin, I see only the branches that were on the remote at the time I cloned it, doing fetch does not change this.. But if I do a new clone, the branches are there.. Any way to avoid downloading everything every time I need to update it?	20:36
_ikke_	s3a: when you don't have the repository yet	20:36
	← garo left	20:36
	→ Rinma joined	20:36
s3a	_ikke_, so would init followed by git pull do the same thing as clone?	20:37
	← enitiz left	20:37
Eugene	dusted - you want to sync a given bare repo with another one?	20:38
_ikke_	s3a: roughly this: git init; git remote add origin <url>; git fetch origin; git checkout -b master origin/master	20:38
dusted	Eugene, yes	20:38
	I've done several searched, and experimented with several methods, but so far I've had little luck	20:38
	← joo-_ left	20:38
Eugene	dusted - `git fetch <remote> +refs/heads/:refs/heads/` will pull down ALL branches and make them th exact same	20:38
dusted	that one I have not tried yet	20:39
Eugene	(and possibly toss out anything that was "ahead" on the local bare repo)	20:39
s3a	_ikke_, alright. and	20:39
	git pull <my shortcut> says	20:39
Ngt	If git clone was bothered by user permissions would it yield some messages? I mean if someone already had a problem with permissions when using git clone, did he get errors messages printed?	20:39
s3a	_ikke_, http://pastebin.com/v431dpsG	20:39
Eugene	dusted - do you want to maintain this mirror on an ongoing basis, too?	20:40
	→ russt joined	20:40
_ikke_	s3a: git pull is fetch + merge. Because you did not specify a branch, git does not know what branch to merge.	20:40
dusted	Eugene, excellent, that did the trick! I don't need to, as when we have finished testing the internal setup, we're going to make the github one read-only, but I am still interested in hearing how it would be done	20:41
s3a	o and i don't want any merging so	20:41
	← weyer left	20:41
	← LucasKA left	20:41
Rinma	A friendly hello to everyone :) I have a little problem and hope some of you know a solution. I have a private gitlab server and now i want to push my project to gitlab and some of the folders should push only once and they shouldn't be tracked in the index because they change localy by every person but should never change on the server because i need this folders clean for the build server.	20:41
Eugene	dusted - man git-config; remote.<branch>.fetch, you would set it to the +refs/ value above	20:41
gitinfo	dusted: the git-config manpage is available at http://jk.gs/git-config.html	20:41
s3a	_ikke_, git fetch <my shortcut> will download both branches?	20:41
_ikke_	s3a: Yes, it will fetch all branches	20:41
	← MattMaker left	20:41
Eugene	dusted - basically what you're saying is "take all branches(or heads) on the remote, and force the local side to be the same thing"	20:41
	← YoungFrog left	20:42
	→ ghostlines joined	20:42
Eugene	dusted - the /normal/ fetchspec(what this is called) uses refs/remotes/<remote-name>/* namespace, with the idea being that you'll have multiple remotes. That isn't the case here, so voodoo is required.	20:42
dusted	Eugene, exactly what I need, thank you! And sorry for asking such trivial question, somehow my google-fu has failed me	20:43
Eugene	dusted - if you want a lot more info, man git-fetch and there's a section on it	20:43
gitinfo	dusted: the git-fetch manpage is available at http://jk.gs/git-fetch.html	20:43
Eugene	No problemo at all	20:43
	→ hexagoxel joined	20:43
Ngt	Rinma: Isn't it a job for .gitignore?	20:43
	← davividal left	20:44
	→ LucasKA joined	20:44
	← jiskiras left	20:44
	→ diegoviola joined	20:45
	→ jiskiras joined	20:45
s3a	_ikke_, so, sorry if i'm repeating myself, git pull makes all non-master branches be merged into the master branch, right?	20:46
Rinma	i have a gitignore file but when i use it before i can not add the files and when i add them they will not ignore any longer	20:46
	← CustosLimen left	20:46
	← jiskiras left	20:46
	← pmallya_ left	20:47
_ikke_	s3a: no	20:47
s3a	_ikke_, so what does it do involving merging?	20:48
_ikke_	s3a: it fetches all branches, but merges only one branch into the current branch	20:48
Ngt	Rinma: You have a folder in your application architecture that you want to be commited for everyone but to remain empty? Is it what you want to do?	20:48
s3a	_ikke_, how does it know which branch to merge into the current branch?	20:48
_ikke_	s3a: Each branch can have an upstream branch configured	20:49
	That's what git uses	20:49
	→ solker joined	20:49
	← cvanball left	20:49
	→ Gizburdt joined	20:50
_ikke_	git branch --set-upstream-to origin/master master; for example sets the upstream branch for master to origin/master	20:50
s3a	_ikke_, what is an upstream branch?	20:50
Ngt	I don't understand. I'm connected on my server. If I go to my /home and create a bare repo then clone it, add a file to this clone, push it onto the bare and then clone again that bare, the second clone get the file I added in the first clone. However when I try to clone my existing bare which is somewhere else on the server I only get a clone containing .git folder.	20:51
	→ ascarter joined	20:51
Ngt	I thought it could be permissions problems, I tried running the command with sudo. It didn't change anything.	20:51
	→ sh4rm4 joined	20:52
	← LucasKA left	20:52
	→ jiskiras joined	20:52
	→ eletuchy joined	20:52
	← jiskiras left	20:52
_ikke_	s3a: It's the mapping between a remote branch and a local branch	20:52
bremner	Ngt: what do you get if you run "git ls-files" in the "existing bare repo"	20:53
	← solker left	20:53
	Solid1_afk → Solid1	20:54
Rinma	-.- do you know that when you writing an answer to a question and suddenly you are thinking that you are the dumbest person in the whole world.... this happens me to often... gitignore is the right answer and i only have to use it right... but thanks for the help :D	20:54
s3a	_ikke_, before i get my mind back into what we're talking about, could you tell me how to undo the changes i did to the code (no changes in git) in the rough draft?	20:54
	← sh4rm4 left	20:54
s3a	git checkout doesn't work anumore	20:54
	→ jottr joined	20:54
_ikke_	s3a: did you git add those files?	20:54
	→ jiskiras joined	20:55
s3a	_ikke_, i assume they are already git added bcuz i fetch the RoughDraft branch which is the branch i'm talking about from the github server	20:55
	← jiskiras left	20:55
s3a	fetched*	20:55
	← martinklepsch left	20:55
_ikke_	s3a: what does git status say?	20:55
	← glebihan left	20:56
Ngt	Rinma: First time I was able to help someone on this channel. I'm happy it was the answer! Don't worry it happens to all of us (at least me).	20:56
s3a	_ikke_, wait something weird happened. git status said some stuff then i ran it again shortly after and it says nothing	20:56
	→ enitiz joined	20:56
s3a	o nvm	20:56
	it says stuff	20:56
	i'll paste it. 2 secs	20:56
	→ MattMaker joined	20:57
	← jottr_ left	20:57
	← eletuchy left	20:57
	→ jiskiras joined	20:57
	← jiskiras left	20:57
	→ listochkin joined	20:57
s3a	don't worry about the eclipse "nonsense" being tracked.: http://pastebin.com/9sswJwCp	20:58
	_ikke_,	20:58
Ngt	bremner: "git ls-files" returns nothing. I guess it should show something if it was full, right?	20:58
	← akiva left	20:58
	← lsiv568 left	20:58
	→ jiskiras joined	20:58
s3a	Ngt, git ls-files should tell u which files are being tracked/are git added	20:58
	→ glebihan joined	20:58
bremner	Ngt: right. maybe try "git log"	20:58
	→ sh4rm4 joined	20:59
	← thafreak left	20:59
_ikke_	And which file you try to restore?	20:59
	DesktopUserInterface ?	20:59
s3a	_ikke_, every single one in the RoughDraft branch	20:59
	i just ran "git checkout" without the quotes	20:59
	← baweaver left	20:59
s3a	it works if i do git git checkout <one file at a time>	21:00
	_ikke_,	21:00
_ikke_	yes	21:00
s3a	yes what?	21:00
_ikke_	that's how it suppose to work	21:00
Ngt	oh my god ... I'm so stupid. When you clone your repo does it clone only master or all the branches?	21:00
_ikke_	git checkout without any arguments does nothing	21:00
	Ngt: all branches	21:00
s3a	_ikke_, wait so do i remember incorrectly that git checkout undid everything?	21:00
	→ CEnnis91 joined	21:01
s3a	(that is without specifying a file)	21:01
	← PCatinean left	21:01
_ikke_	s3a: "git checkout ." (with the dot)	21:01
	← acharlieh left	21:02
s3a	_ikke_, that undoes everything "only" in the current branch or all branches?	21:02
	→ cvanball joined	21:03
_ikke_	s3a: Only in your work tree	21:03
	← ehynds left	21:03
	← Gizburdt left	21:03
s3a	work tree means current branch or subbranch of that branch? (am i saying nonsense?)	21:03
	→ osfe joined	21:03
s3a	_ikke_,	21:03
_ikke_	s3a: The files you are working on	21:03
	→ m0ltar joined	21:03
_ikke_	All the files that you are currently seeing in your repository	21:04
s3a	so, for example, if i edit a file, don't commit, switch branch, edit a file, don't commit, then do git checkout ., everything from all branches will be undone?	21:04
	_ikke_,	21:04
_ikke_	yes	21:04
	because uncomitted changes don't belong to any branch	21:04
	← ghostlines left	21:05
	← cworth left	21:05
Ngt	_ikke_: The fact is that I have several branches on my bare repo. Master is empty but dev is not. However when I clone the bare repo and I do a git branch it only shows *master.	21:05
	← kai3x5 left	21:05
	→ kai3x5 joined	21:05
	gitinfo set mode: +v	21:06
_ikke_	Ngt: try git branch -r	21:06
s3a	_ikke_, that makes sense. :)	21:06
	→ baweaver joined	21:06
	→ lidaaa joined	21:07
	← jiskiras left	21:07
	→ ghostlines joined	21:07
	→ jiskiras joined	21:07
	← govg left	21:07
	← ghostlines left	21:07
	← jiskiras left	21:07
	← sfr^ left	21:07
	→ sfr^ joined	21:07
	→ touya joined	21:07
	→ cworth joined	21:07
	→ ghostlines joined	21:08
s3a	_ikke_, ok, about what we were saying earlier	21:08
	with git pull	21:08
	what is merged to current directory again?	21:08
	← baweaver left	21:08
s3a	it involved "upstream branch" stuff i think	21:08
	← Rinma left	21:09
	→ jiskiras joined	21:09
	→ EminenceHC joined	21:10
	→ acharlieh joined	21:10
Ngt	_ikke_: Yeah that was it. Thank you. I thought that when do "git branch" it shows all the branch.	21:10
s3a	o, i could just go into a branch using git checkout RoughDraft and then do git merge master and that would merge master into RoughtDraft, right?	21:10
	_ikke_,	21:10
Ngt	bremner: thank you for your answer.	21:10
_ikke_	s3a: correct, but that's master how it's in it's current state	21:10
	→ buffal0 joined	21:11
bremner	Ngt: welcome	21:11
s3a	_ikke_, ur emphasis is meaning what? uncommited changes are excluded?	21:11
touya	hello, people.. i have a rather meta-like question, no specific problem	21:11
	what's the reason behind the idea that git status doesn't give any information whether your commits are pushed or not? i assume it's because status only looks at the local tree by design	21:11
	it's rather awkward to check that though, either by doing "git diff --stat <remote>" or "git checkout --dry-run"	21:11
	← mbildner left	21:12
	→ StefanLehmann joined	21:13
	← cworth left	21:13
s3a	touya, i'm not good with git but there is a way to make linux have shortcuts for long commands	21:14
	← buffffal00 left	21:14
touya	well, yes i am aware of that	21:14
	i was just wondering in general	21:14
_ikke_	s3a: Yes, but also changes you have fetched	21:14
s3a	touya, o, i'm useless for the rest. sorry :(	21:14
Ngt	Alright it is getting pretty late here (France), so I'm heading out. Have a good day/evening and see you next time ;)	21:15
	← Ngt left	21:15
	← Sasazuka left	21:16
	← Junior left	21:16
	→ weyer joined	21:16
	← jds left	21:16
	← jacksparrow007 left	21:16
	← enitiz left	21:16
	← thierryp left	21:17
	→ cworth joined	21:17
s3a	_ikke_, you mean changes i have yet to fetch?	21:17
	← ghostlines left	21:17
	← jceb left	21:18
	← aspiers left	21:18
	→ Sasazuka joined	21:18
	→ govg joined	21:19
	→ baweaver joined	21:20
	→ Brain joined	21:21
	← weyer left	21:21
	→ boughry joined	21:21
	→ solker joined	21:22
	← KnightsOfNi left	21:22
	→ lsiv568 joined	21:22
	→ mkoskar joined	21:23
s3a	_ikke_, ok, i lost track of the time, and i'm going to be late somewhere. thank you for your help, you helped a lot. c u later	21:24
	← cvanball left	21:24
	← s3a left	21:24
boughry	Hi. I have a question about git rebase. Iâm having trouble getting it to work the way I expect. In a nutshell, I have a tracked branch A, to which I apply a series of commits B through Z. I do a force update on A (call it Aâ), and want to rebase B..Z on top of A. However, after the force update on A, the Aâ hash no longer corresponds to the A hash, which means that the new branch canât properly do a rebase of B..Z ontop of Aâ	21:24
	Is there a way to inform git that A and A’ are the same for the purposes of the rebase?	21:24
	→ cjwilburn joined	21:24
	→ bambanx joined	21:24
bambanx	for ignore this folder what of all is correct : /.sass-cache/ , .sass-cache/ , /.sass-cache/* ..	21:25
boughry	bambanx: In a general sense, when i’m not sure which wildcard is correct, I add it to .gitcorrect and then use `git gui` to see if I got the desired effect.	21:25
bambanx	dont like gui	21:26
boughry	Your choise.	21:26
	Use git diff instead.	21:26
	← govg left	21:26
boughry	git gui makes it a whole lot easier to see this kind of stuff, IMHO, but that’s an individual choice.	21:26
	← LeMike left	21:27
boughry	For your particular question, I can’t tell you that the latter two won’t work, but the first works fine for me.	21:27
	← settermjd left	21:27
	← IrishPrime left	21:27
	← liamkeily left	21:28
bambanx	i downloaded smartgit	21:28
	not used yet	21:28
	← chrisgeo left	21:29
	→ enitiz joined	21:29
boughry	Never used it. I like git gui because it’s accessible from the command line and works on all OS platforms.	21:30
	← lsiv568 left	21:30
	→ settermjd joined	21:31
	→ buffffal00 joined	21:32
	← settermjd left	21:33
	← buffffal00 left	21:33
	→ ap0c joined	21:33
	← osfe left	21:35
	→ ScioMin joined	21:35
	← buffal0 left	21:35
	← jb55 left	21:35
	→ digitalextremist joined	21:35
	→ kballou joined	21:35
	← anaran left	21:35
	→ Vivekananda_y510 joined	21:35
	→ tvw joined	21:36
	← kukks left	21:37
	→ govg joined	21:37
	→ mlechner joined	21:38
	→ jb55 joined	21:39
	← mlechner left	21:40
	→ adamben joined	21:40
	← netj left	21:40
	← kpease left	21:41
	← digitalextremist left	21:41
	← uber left	21:41
	→ netj joined	21:41
	→ dabockster joined	21:42
	→ Takle joined	21:42
	← MarkyC left	21:42
	→ CKyle joined	21:42
	→ ghostlines joined	21:43
	← ghostlines left	21:43
	→ cyphase joined	21:43
	← cyphase left	21:43
	→ uber joined	21:44
	← uber left	21:44
	→ uber joined	21:44
	← uber left	21:44
	→ uber joined	21:45
	← uber left	21:45
	→ uber joined	21:45
	← uber left	21:45
	→ uber joined	21:46
	← uber left	21:46
	xnrand → nsfw	21:46
	→ uber joined	21:46
	← uber left	21:46
	→ cyphase joined	21:46
	← cyphase left	21:46
	→ cyphase joined	21:46
	→ devoldmx joined	21:47
	→ in_deep_thought joined	21:47
	→ uber joined	21:47
	← uber left	21:47
bambanx	i added /.sass-cache/ in gitignore , when i run this git status --ignored dont show me nothing looks like is not working	21:47
	→ Gizburdt joined	21:47
	← nnyk left	21:48
	→ uber joined	21:48
	← uber left	21:48
	→ btree joined	21:48
Nugget	`tig` is a nice alternative to a gui viewer	21:48
	← baweaver left	21:48
	→ uber joined	21:48
NosBit	bambanx: what git status shows you?	21:48
Nugget	https://github.com/jonas/tig	21:48
	→ cvanball joined	21:49
	→ lsiv568 joined	21:49
NosBit	bambanx: maybe /.sass-cache/ is tracked? git wont ignore tracked files	21:49
bambanx	NosBit, http://pastebin.com/y6VxUwiH	21:50
	→ brucelee joined	21:50
brucelee	my branch and 'origin/master' have diverged' and have 18 and 120 different commits each, respectively.	21:50
	it says use 'git pull' to merge the remote branch into yours	21:50
	how do i reverse the changes if i git pull and it wrecks my branch	21:51
bambanx	NosBit, looks like is tracking it folder?	21:51
brucelee	is there 1 command where i can just 'undo' the git pull	21:51
NosBit	no	21:51
	→ thierryp joined	21:51
_ikke_	brucelee: git reset --hard HEAD^`	21:51
	brucelee: git reset --hard HEAD^1	21:51
bambanx	NosBit, is ignoring it?	21:51
NosBit	no it doesnt	21:51
	how your gitignore looks like?	21:51
	← Errorical left	21:52
	→ paul424 joined	21:52
	← Gizburdt left	21:52
bambanx	the only stuff on my ignore is /.sass-cache/	21:52
	→ Gizburdt joined	21:52
	→ ghostlines joined	21:53
NosBit	it should work	21:53
bambanx	what do you mean	21:54
	← Kicer86 left	21:54
	← sburgess_ left	21:54
	← sburgess left	21:54
bambanx	u said is not ignoring it	21:54
	→ fekz joined	21:54
NosBit	yeah weird...	21:54
	→ dm7freek joined	21:55
bambanx	i ran git log and it show me: fatal:bad default revision 'HEAD'	21:56
	← thierryp left	21:56
	→ Pyrogerg joined	21:56
	← Gizburdt left	21:57
dm7freek	I have a set of scripts I use to control the configuration of my machines. There is a template script and a script for each machine (built using the template). Whenever I update the template, I want the same code in the machine-specific scripts to be updated. Describe the best way to do this w git please.	21:57
	Bonus: make it so that i can pull only the relevant machine-specific script to a given host.	21:58
	← tesaf left	21:59
dm7freek	I'm guessing a branch for each script and a branch for the template then every template update has to be merged with all the other branches or something like that?	21:59
	→ liamkeily joined	21:59
	→ pcypher_ joined	22:00
	← dabockster left	22:00
	← tier left	22:01
	← basiclaser_ left	22:01
	→ martinklepsch joined	22:02
	→ osfe joined	22:03
bambanx	how i can remove a repository in the same folder	22:03
	← pcypher left	22:04
	← ghostlines left	22:04
	← m0ltar left	22:06
	← Dougie187 left	22:06
bambanx	NosBit, i think i added all files before create ignore file lol	22:06
	← listochkin left	22:06
fekz	eh, I did a git diff and now I'm stuck seeing the differences. How do I get out?	22:06
soerenb	q	22:07
	ctrl+c	22:07
NosBit	bambanx: do "git reset"	22:07
	→ MLM joined	22:07
	← dannixon left	22:07
soerenb	though the correct answer depends on the pager you use	22:07
	ajustrun → ajustrun\|away	22:07
fekz	That should be in the documentation, lol	22:07
soerenb	well, git calls an external pager	22:08
dm7freek	fekz: it's in the pager's docs	22:08
fekz	I'm using Git Bash for windows	22:08
	wouldn't hurt to put a pro tip in the documentation	22:08
	→ eletuchy joined	22:08
	→ listochkin joined	22:08
soerenb	not git's problem if you don't know what pager you use and how to use it	22:09
bambanx	NosBit, looks like now is working ok ignoring .sass-cache http://pastebin.com/DpSqM6X3	22:09
	→ denete joined	22:09
	← denete left	22:09
	→ denete joined	22:10
	→ jemendja joined	22:10
jemendja	hi	22:10
	→ buffal0 joined	22:10
	→ note joined	22:10
	→ LucasKA joined	22:10
	← lsiv568 left	22:11
	→ m0ltar joined	22:11
dm7freek	anyone have any ideas about mah Q?	22:11
	← sohail left	22:12
	→ fairuz1 joined	22:12
	← barduck left	22:12
bambanx	thanks men NosBit	22:12
	← fairuz1 left	22:12
	→ fairuz1 joined	22:13
	← mizu_no_oto left	22:13
	← eletuchy left	22:13
	← EvilDMP left	22:13
	← jemendja left	22:14
	← fairuz left	22:15
	← m8 left	22:17
	→ s8321414 joined	22:17
	← zumba_addict left	22:18
	← fairuz1 left	22:18
	→ zumba_addict joined	22:18
	→ mizu_no_oto joined	22:18
	→ Dreadnaught joined	22:19
	← Dreadnaught left	22:19
	→ Dreadnaught joined	22:19
	← irqq left	22:19
	← tristanp left	22:19
brucelee	anyone know how to deal with "error: unable to delete 'mybranch': remote ref does not exist	22:20
	→ FunkyAss joined	22:20
brucelee	my goal is to push 'mybranch' to git	22:20
NosBit	what u do?	22:21
	→ thierryp joined	22:21
	→ kukks joined	22:21
	← kukks left	22:21
	→ kukks joined	22:21
soerenb	add '-u' to the push command to create the branch on the remote	22:21
	← Neozonz left	22:21
NosBit	he is probably doign "git push origin :mybranch"	22:21
	→ Neozonz joined	22:22
	← Neozonz left	22:22
	→ Neozonz joined	22:22
NosBit	am i right?	22:22
	→ thierryp_ joined	22:22
	→ brtekb joined	22:22
	← zumba_addict left	22:23
	→ kushal3 joined	22:23
	← adamben left	22:23
	note → n0te	22:23
	→ adamben joined	22:23
	→ blackmesa joined	22:24
NosBit	brucelee	22:24
	← pcypher_ left	22:25
	→ dsdeiz joined	22:25
	← thierryp left	22:26
	← crose left	22:26
	← boughry left	22:26
	← thierryp_ left	22:27
	→ eletuchy joined	22:27
	← brtekb left	22:27
	← netj left	22:27
	→ netj joined	22:28
	← Neozonz left	22:28
	← rasto left	22:28
	→ rasto joined	22:28
	← Rhonda left	22:28
	← FunkyAss left	22:31
	← ascarter left	22:31
	→ fairuz1 joined	22:31
	← jiskiras left	22:32
	touya → akira	22:34
	→ paulweb515 joined	22:35
	← osfe left	22:35
	→ Rhonda joined	22:35
	← jason237 left	22:36
	→ faylite joined	22:37
	→ mytec joined	22:37
	← mizu_no_oto left	22:37
	→ asturel joined	22:38
	← livingstn left	22:38
asturel	hi, if i havent pushed yet, is there a way to change my email in commits?	22:39
kadoban	asturel: filter-branch has an option for that I believe	22:39
	→ spookley joined	22:39
Rhonda	I usually did it with rebase -i and commit --amend --author="..."	22:39
	→ safinaskar joined	22:40
	→ jiskiras joined	22:40
kadoban	Wouldn't that require manually doing it for every commit?	22:40
NosBit	well if the guy has like 1 commit best option is git commit -amend	22:41
	← eletuchy left	22:41
asturel	its only 4-5	22:41
	but i cant amend only the last commit, can i other?	22:41
	→ tubaman joined	22:41
	← d10n-work left	22:41
	→ pcypher joined	22:42
asturel	there's no dry-run in filter brnch?	22:42
kadoban	Don't think so	22:43
bremner	asturel: use git commit --amend instead	22:45
	→ ciurkut joined	22:47
Rhonda	If it's only 4-5, the "for every commit" shouldn't be issue bothering you. :)	22:47
brucelee	NosBit: sorry was afk	22:47
	NosBit: but yeah	22:47
	NosBit: thats what i was doing, but i also did it without the ":", i did git push origin mybranch as well	22:47
	same thing	22:47
asturel	git filter-branch --env-filter '[ "$GIT_COMMITTER_EMAIL" = "xy" ] && GIT_COMMITTER_EMAIL="yx"' HEAD	22:48
	what i'm doing wrong?	22:48
NosBit	brucelee: "git push origin mybranch" should work the ":" before mybranch means delete remote	22:48
asturel	Rhonda but can i ammend a commit which isnt the latest?	22:48
	→ teran joined	22:49
asturel	i have to rebase first (?)	22:49
brucelee	NosBit: it says "your branch and origin/master" have diverged, and have 8 and 1 different commit each, respectively	22:49
	i have to do a git pull before i can do anything right?	22:49
	yah i did a git pull --rebase, so now it says "your branch is ahead of 'origin/master' by 8 commits	22:51
	→ BSaboia joined	22:51
	← kermit left	22:51
brucelee	then i just did a git push origin mybranch	22:51
	and it didnt work, same error message	22:51
	^ NosBit	22:51
	← thedodd left	22:51
osse	brucelee: "mybranch"? Is that different from master?	22:52
	→ _Atom_ joined	22:52
osse	brucelee: if you're explicit and write "git push origin mybranch" then git will try to push to the "mybranch" branch on the other side	22:52
	← _Atom_ left	22:52
brucelee	'mybranch' doesnt exist on github	22:53
	i branched off master, and created 'mybranch', and now im trying to create a new branch on github	22:53
	then my peers will peer review it or what not, and then merge it with master on github	22:53
asturel	oh nice, rebase ++ amend worked like a charm	22:53
brucelee	but im stuck on the step where i push 'mybranch' to github	22:54
osse	brucelee: hmm, what's the error again? I just joined the convo	22:54
	← btree left	22:54
brucelee	it says error: src refspec mybranch does not match any.	22:55
	← cvanball left	22:55
	← bdavenport left	22:55
brucelee	then error: failed to push some refs to 'git@github.com:<my>/<repo.git>'	22:55
	→ nour joined	22:55
	← Gavrisimooo left	22:56
	← BlaXpirit-UA left	22:56
osse	brucelee: so "mybranch" doesn't even exist locally?	22:56
	→ bdavenport joined	22:57
	← nfk left	22:59
	← safinaskar left	22:59
	← jerius left	22:59
	← synfinatic left	23:00
	← netj left	23:00
	→ synfinatic joined	23:00
	→ netj joined	23:00
	→ safinaskar joined	23:00
brucelee	osse: mybranch doesnt exist locally actually	23:01
	locally its called 'localbranch'	23:01
osse	brucelee: git push origin localbranch:mybranch	23:01
brucelee	but when i put it on github, i want the branch to be called 'mybranch'	23:01
	ahh	23:01
	osse: thanks!	23:01
	let me try that	23:01
Rhonda	asturel: That's why I mentioned rebase -i in the first place indeed.	23:02
asturel	i wasnt familiar with rebase :/	23:02
	← Pyrogerg left	23:02
	← denete left	23:02
osse	brucelee: git push remote source:destination	23:02
	brucelee: git push remote foo is shorthand for git push remote foo:foo	23:02
	← geomyidae_ left	23:02
joeyDB_	what's a good git program that helps with resolving conflicts?	23:02
brucelee	osse: thanks!	23:02
	osse: youre awesome :D	23:03
osse	indeed I am	23:03
	→ Pyrogerg joined	23:03
	→ Vile joined	23:03
	Solid1 → Solid1_afk	23:03
asturel	btw, tags like a 'milestone' ? so it just 'mark' a commit with a tag?	23:04
	← ciurkut left	23:05
	→ jacksparrow007 joined	23:05
osse	yup	23:05
	→ obozhdi joined	23:05
osse	you can use tags for anything you want, but the most common use case is to mark which commit corresponds to a releaesed version of something	23:06
	eg. you have the tags v1.0 v1.1 and so on	23:06
asturel	yeah my plan is that	23:06
	just never used tags before :D	23:06
	← obozhdi left	23:06
	← tranzfuse left	23:07
	← kukks left	23:07
	← danemacmillan left	23:08
	→ obozhdi joined	23:08
brucelee	osse: i was doing git rebase, and i thought git rebase --skip would resolve my conflicts	23:08
	so i basically skipped everything	23:08
	← kevinb left	23:08
brucelee	how do i revert back to a previous state before all the git rebase --skips	23:08
	?	23:08
osse	git rebase --abort	23:09
brucelee	i already completed the entire git rebase process though	23:09
	and then i thought everything was fine, then i did a git pull	23:09
	after that, looking at my code, the file doesnt even exist :/	23:09
	so now i realize i foobarred everything	23:09
	← obozhdi left	23:09
kadoban	brucelee: Check the reflog and do a hard reset to whatever state you want to go back to	23:09
	← jacksparrow007 left	23:09
asturel	btw, can i rebase a commit which is before a merge ?	23:10
	rebase + amend	23:10
osse	brucelee: if those are the exact steps you did then git reset --hard branchname@{2} should fix it up	23:10
	brucelee: git reflog branchname to confirm	23:10
	← lidaaa left	23:10
	← pcypher left	23:10
asturel	like if i do a git pull and it merge with my branch, can i still amend my commit if i didnt push?	23:10
	or thats not recommended	23:11
	→ zumba_addict joined	23:12
	← acharlieh left	23:12
	→ kukks joined	23:13
sjmikem	are egit questions verboten in here? Asked in #eclipse and got no answer	23:13
	→ kushal2 joined	23:14
	← Pyrogerg left	23:14
	← WaReZ left	23:14
	← tchan left	23:14
kadoban	sjmikem: Nobody seems to be much sticklers for what's off topic here, but then again questions about other tools rarely get answers that I've seen.	23:15
	→ kevinb joined	23:16
sjmikem	Basically I'm trying to figure out why "show annotations" is working in one project, but not another project...	23:16
	← Zupoman left	23:16
	← brandonw left	23:17
	← Dreadnaught left	23:17
	→ baweaver joined	23:17
	← kushal3 left	23:17
	→ ams_ joined	23:20
	← mtscout6 left	23:20
	→ brandonw joined	23:21
ams_	If I add a subtree (`git remote add st user@host/repo.git`, `git subtree add --prefix st master --squash) to myproject is it possible for me to checkout another branch from the original repo?	23:21
	← fairuz1 left	23:21
	→ thierryp joined	23:21
	→ veebers joined	23:21
	← Vivekananda_y510 left	23:22
	→ m0viefreak joined	23:23
	← aidalgol left	23:23
	→ ManikM joined	23:23
	← sh4rm4 left	23:25
	← devoldmx left	23:25
	→ Radivarig joined	23:25
	→ Dreadnaught joined	23:25
	← Dreadnaught left	23:25
	→ Dreadnaught joined	23:25
ams_	/msg gitinfo .voice	23:26
	gitinfo set mode: +v	23:26
	→ kermit joined	23:26
	← thierryp left	23:26
	→ SumDude_ joined	23:27
	→ rezrov joined	23:27
	← jiskiras left	23:28
	← mr_chris left	23:29
	← AaronMT left	23:30
	← SumDude left	23:30
	← zumba_addict left	23:30
	→ zumba_addict joined	23:31
	→ tchan joined	23:31
	gitinfo set mode: +v	23:33
	← m0ltar left	23:36
	← bracero left	23:37
	← ManikM left	23:37
	→ Nijikoku_ joined	23:38
	← Nijikoku_ left	23:38
	→ lidaaa joined	23:39
	→ Nijikoku_ joined	23:39
	→ zumba_ad_ joined	23:39
	← Nijikokun left	23:39
	→ Nijikokun joined	23:40
	← enitiz left	23:40
	← zumba_addict left	23:40
	→ bracero_ joined	23:40
	← msmith_ left	23:41
	← steele left	23:42
	→ atmosx joined	23:42
	← Nijikoku_ left	23:43
	→ fatalhalt joined	23:44
	← solker left	23:46
	← Nijikokun left	23:46
	→ eletuchy joined	23:47
	← faylite left	23:47
	→ faylite joined	23:48
	← virtualsue left	23:48
	→ tokik joined	23:50
	← hcc23 left	23:51
	→ dialeth_ joined	23:52
	← eletuchy left	23:52
	→ solker joined	23:54
	← buffal0 left	23:54
	→ Gitzilla joined	23:55
	← styly left	23:55
	→ buffal0 joined	23:55
	← baweaver left	23:56
	← zumba_ad_ left	23:56
	→ zumba_addict joined	23:57
	← SparkTheFerret left	23:57
	→ Raverix joined	23:58
Raverix	Hello, I've got a weird scenario, I just inherited a project, no source control.	23:58
	→ laurentide joined	23:58
Raverix	I've initialized a new git repository on production, and committed all the files to it.	23:58
	→ styly joined	23:58
	→ jgardella joined	23:58
	← tang^ left	23:59
Raverix	I now need to set up a repo on stage... and somehow figure out how to map all the files (which should hopefully be in sync?) to the repo on production.	23:59
	← knownasilya left	23:59
Raverix	I'm considering, pulling the repo to a separate folder, and copying the .git folder to the existing files.	23:59
	← styly left	23:59
Raverix	And allowing git status to let me know the state of the stage server.	23:59

Logs Search ←Prev date Next date→

Channels Documentation