IRCloggy #git 2014-11-11

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-11
	zzz_AR45 → AR45	00:01
	← pcypher left	00:06
	→ pcypher joined	00:06
	← Vivekananda_y510 left	00:06
	→ Reskp joined	00:07
	← cmosguy left	00:09
	→ cmosguy joined	00:09
	→ _cmosguy_ joined	00:10
	→ m0ltar joined	00:10
	→ shinnya joined	00:11
	← d10n-work left	00:11
	← centrx left	00:12
	← cmosguy left	00:14
	← _cmosguy_ left	00:14
	← JosephFerano left	00:15
	→ in_deep_thought joined	00:16
	← pcypher left	00:16
	→ tozhu joined	00:17
	← endiruna left	00:17
	→ pcypher joined	00:20
	→ moritzs joined	00:20
	→ centrx joined	00:21
	← rewire left	00:22
	← steele_ left	00:22
	← ezioadf left	00:22
	← fairuz left	00:22
	→ ezioadf joined	00:22
	← iamjarvo left	00:24
	← t0th_-_ left	00:24
	← Sasazuka left	00:24
	→ toothrot joined	00:25
	→ mribeirodantas joined	00:25
	← chrisgeo left	00:25
	← Nijikokun left	00:25
	← ropav left	00:25
	→ Nijikokun joined	00:25
	→ ropav joined	00:26
	← AR45 left	00:26
	← wanders_ left	00:27
	← pcypher left	00:27
	→ pcypher joined	00:28
	← b1nar1 left	00:28
	← ropav left	00:28
	← freeman42 left	00:28
	→ zzz_AR45 joined	00:28
	→ wanders joined	00:28
	← amikiri left	00:30
	→ ropav joined	00:30
	← ropav left	00:30
	← astrofog left	00:30
	→ EminenceHC joined	00:30
	← s8321414 left	00:30
	→ ropav joined	00:30
	→ Sasazuka joined	00:31
	← piccata left	00:31
	→ mitzip_ joined	00:31
	→ piccata joined	00:33
	← sjmikem left	00:33
	← hexagoxel left	00:34
	← EminenceHC left	00:35
	→ hexagoxel joined	00:35
	← joelm left	00:35
	→ thiago joined	00:36
	→ joelm joined	00:36
	← ropav left	00:37
	→ ropav joined	00:37
	→ palcu joined	00:38
	→ michael3 joined	00:38
	← joelm left	00:41
	← michael3 left	00:41
	→ joelm joined	00:41
	→ amikiri joined	00:41
	→ AR45 joined	00:42
	← palcu left	00:43
	→ Pyrogerg joined	00:43
	← MarkyC left	00:45
	→ livingstn joined	00:46
	← AR45 left	00:46
	→ AR45 joined	00:47
	← AR45 left	00:49
	← Pyrogerg left	00:49
	← a_le left	00:50
	→ Lyqyd joined	00:50
	→ a_le joined	00:51
	→ AR45 joined	00:51
	← daedeloth left	00:52
	← Reskp left	00:52
	← ropav left	00:52
	→ sjmikem joined	00:57
	→ Reskp joined	00:58
	← desposo left	00:58
	→ hyperair joined	00:59
	← fstd left	01:00
	→ sohail` joined	01:00
	→ imkmf joined	01:00
	← pcypher left	01:00
	→ fstd joined	01:00
	→ t0th_-_ joined	01:01
	← alvaro_o left	01:01
	← Nevik left	01:02
	→ CKyle joined	01:02
	← dimm left	01:02
	← imkmf_ left	01:03
	→ weiyang joined	01:06
	← hahuang61 left	01:06
	→ motaka3 joined	01:06
	→ sctskw joined	01:06
motaka3	hello I did git check out 6546546 and now when I do git log, I see that two of my commits are not there. how can I find them ?	01:07
	→ danemacmillan joined	01:08
milki	uh	01:08
	where are they supposed to be?	01:08
	← in_deep_thought left	01:08
milki	why do you expect them to be somewhere?	01:08
	maybe they are on the floor	01:08
	← imkmf left	01:10
	← booboy left	01:10
	→ knownasilya joined	01:10
	← CKyle left	01:10
	← shinnya left	01:10
	→ imkmf joined	01:10
	← vpl left	01:11
	← sctskw left	01:11
	→ JosephFerano joined	01:11
	→ CKyle joined	01:12
	→ vpl joined	01:12
	→ hgl joined	01:12
	→ disabled_ joined	01:15
	← hexagoxel left	01:16
	← vpl left	01:17
	← Reskp left	01:17
	← Consuela left	01:17
	← a_le left	01:18
	← moritzs left	01:18
	← sdfvsfgvsdf left	01:19
	← motaka3 left	01:20
	← itmustbejj left	01:21
	← joelm left	01:22
	→ tokik joined	01:22
	← robustus\|Off left	01:23
	← listochkin left	01:23
	→ robustus\|Off joined	01:25
	robustus\|Off → robustus	01:25
	← ManikM left	01:25
	→ ManikM joined	01:25
thomas	test	01:26
	← imkmf left	01:29
	← Norrin left	01:30
	← dreiss left	01:30
	← connix left	01:30
	→ APerson_ joined	01:31
	→ EminenceHC joined	01:32
Steve_Jobs	I did git push -u my-branch:steve-branch	01:32
	I would think that git push would by default change steve-branch, but it's not	01:33
	← baweaver left	01:34
	→ Norrin joined	01:34
Steve_Jobs	what do I need to do for the remote-to-local mapping work both ways? I don't want to write git push my-branch:steve-branch all the time.	01:34
	← t0th_-_ left	01:34
	← User458764 left	01:35
	← EminenceHC left	01:36
	← Nikoli left	01:37
	→ baweaver joined	01:37
	← danemacmillan left	01:39
	→ Nikoli joined	01:39
	→ ehmatthes joined	01:40
	→ moritzs joined	01:40
dzho	Steve_Jobs: I'm not sure if this is what you want: http://git-scm.com/book/en/v2/Git-Branching-Remote-Branches#Tracking-Branches	01:43
	→ akushner_ joined	01:43
	→ fairuz joined	01:44
	← fairuz left	01:45
	→ fairuz joined	01:45
	← jb55 left	01:45
	→ otter768 joined	01:45
	← maestrojed left	01:46
	→ tranzfuse joined	01:46
	← thiago left	01:47
	← akushner left	01:47
	← mikecmpbll left	01:48
	← akushner_ left	01:48
	→ Reskp joined	01:48
	← davispuh left	01:48
	→ qbjc joined	01:49
	← fairuz left	01:49
	→ dsdeiz_ joined	01:49
	→ fairuz joined	01:50
	← dsdeiz left	01:51
	← mehdi left	01:52
	← pilif left	01:52
	← Reskp left	01:52
	← Neozonz left	01:52
	← sohail` left	01:53
	→ Manny_ joined	01:53
	→ ahmetalpbalkan_ joined	01:53
	→ Ziber_ joined	01:53
Steve_Jobs	dzho: I found it: git config --global push.default upstream	01:53
	thank you anyway	01:53
	sjmikem → sjmikem_	01:54
	→ sohail` joined	01:54
	← flipp left	01:54
	← breiti left	01:54
	← i_ron left	01:54
	→ mehdi joined	01:54
	→ flipp joined	01:54
	→ i_ron joined	01:54
	→ Fifty5Plus_ joined	01:54
	→ wxg4irc joined	01:54
	→ HicksD_ joined	01:55
	→ sigv_ joined	01:55
	→ thiago joined	01:55
	→ Fujk joined	01:55
	→ magic_ joined	01:55
	→ iokill_ joined	01:55
	← baweaver left	01:55
	→ mino_ joined	01:56
	← heftig left	01:56
	→ pilif joined	01:56
	← ManikM left	01:56
	← Internet13 left	01:56
	← faylite left	01:56
	← ahmetalpbalkan left	01:56
	← Ziber left	01:56
	← magic left	01:56
	← eXeC64 left	01:56
	← kapowaz_ left	01:56
	← GarethAdams left	01:56
	← sea-gull left	01:56
	← cebor left	01:56
	← Floatingman left	01:56
	← mp4 left	01:56
	← HicksD left	01:56
	← ujjain left	01:56
	← Fifty5Plus left	01:56
	← mino left	01:56
	mino_ → mino	01:56
	→ baweaver joined	01:56
	magic_ → magic	01:56
	← sigv left	01:56
	← johan__ left	01:56
	← iokill left	01:56
	→ breiti joined	01:56
	→ eXeC64 joined	01:56
	→ GarethAdams joined	01:56
	← pilif left	01:57
	← ome left	01:57
	← gitinfo left	01:57
	← ionelmc left	01:57
	← ikanobori_ left	01:57
	← Caius left	01:57
	← nemesit\|znc left	01:57
	sigv_ → sigv	01:57
	→ ikanobori__ joined	01:57
	→ rom1504_ joined	01:57
	← dw left	01:57
	← cnj left	01:57
	← BtbN left	01:57
	← retard left	01:57
	← JStoker left	01:57
	← rom1504 left	01:57
	← hellome left	01:57
	→ retard_ joined	01:57
	→ donmichelangelo joined	01:57
	← shennyg____ left	01:58
	← ohcibi left	01:58
	← jonet left	01:58
	→ cnj joined	01:58
	→ jrdavid joined	01:58
	← jds left	01:58
	← jdav_gone left	01:58
	← Phtes left	01:58
	→ cebor joined	01:58
	→ jdav_gone joined	01:58
	→ Floatingman joined	01:58
	→ kapowaz_ joined	01:59
	→ miffor` joined	01:59
	→ jds joined	01:59
	→ Phtes joined	01:59
	→ Internet13 joined	01:59
	→ shennyg____ joined	01:59
	← jrdavid_ left	02:00
	→ ionelmc joined	02:00
	← michelangelo left	02:00
	→ ome joined	02:00
	← Sleepy63 left	02:00
	← devhost left	02:00
	← snuttilatti left	02:00
	→ devhost joined	02:00
	→ Sleepy63 joined	02:01
	← GarethAdams left	02:01
	→ GarethAdams joined	02:01
	← baweaver left	02:01
	← Sasazuka left	02:01
	→ ujjain joined	02:01
	→ Caius joined	02:01
	→ pilif joined	02:01
	← miffor left	02:02
	← jason237 left	02:02
	← thiago left	02:02
	Caius → Guest87505	02:02
	→ heftig joined	02:02
	→ BtbN joined	02:02
	→ ohcibi joined	02:02
	→ nemesit\|znc joined	02:02
	→ JStoker joined	02:02
	→ snuttilatti joined	02:02
	← rom1504_ left	02:02
	→ rom1504 joined	02:02
	→ gitinfo joined	02:03
	ChanServ set mode: +o	02:03
	→ a_le joined	02:03
	← JStoker left	02:04
	← hgl left	02:05
	→ hgl joined	02:05
	→ jonet joined	02:06
	← MissionCritical left	02:06
	→ dw joined	02:06
	→ b1nar1 joined	02:06
	← zapb_ left	02:06
	← APerson_ left	02:07
	→ rchavik joined	02:07
	← kballou left	02:08
	→ JStoker_ joined	02:08
	JStoker_ → JStoker	02:08
	← sarri left	02:09
	← PaulCapestany left	02:09
	→ miffor`` joined	02:09
	→ thiago joined	02:09
	→ sea-gull joined	02:09
	→ vals_ joined	02:10
	← tango_ left	02:10
	← cxreg left	02:10
	← niax left	02:10
	← JStoker left	02:10
	→ niax joined	02:10
	→ JStoker joined	02:10
	→ cxreg joined	02:11
	→ crumpler joined	02:11
	→ ropav joined	02:11
	← kukks left	02:11
	→ danemacmillan joined	02:11
	→ PaulCapestany joined	02:12
	→ sgen joined	02:12
	→ tmcmahon joined	02:12
	← robbyoconnor left	02:12
	← miffor` left	02:13
	← eric__ left	02:13
	→ robbyoconnor joined	02:13
	→ jason237 joined	02:13
	← kpease left	02:13
	→ zapb_ joined	02:14
	← miffor`` left	02:14
	→ colorbot joined	02:16
	← sohail` left	02:16
	→ smccarthy joined	02:16
	→ sarri joined	02:18
	← sarri left	02:18
	→ sarri joined	02:18
	← imachuchu left	02:18
	→ sohail` joined	02:18
	← aidalgol left	02:18
	→ MissionCritical joined	02:19
	→ aidalgol joined	02:20
	← tmcmahon left	02:21
	← m0ltar left	02:21
	← weiyang left	02:22
	← Lyqyd left	02:22
	→ crelix joined	02:22
	← MalteJ left	02:22
	→ bdavenport joined	02:27
	← ropav left	02:27
	→ ropav joined	02:27
	→ palcu joined	02:28
	← jwmann left	02:28
	→ watabou joined	02:28
	← AR45 left	02:29
	← Milkweed left	02:29
	→ EminenceHC joined	02:33
	→ Goplat joined	02:33
	← palcu left	02:33
	→ Vampire0_ joined	02:33
	→ wbdecker joined	02:34
	← CKyle left	02:35
	← livingstn left	02:35
	→ weiyang joined	02:35
	← crumpler left	02:36
	← Vampire0 left	02:37
	← EminenceHC left	02:38
	← pheaver left	02:39
	← fairuz left	02:39
	← sohail` left	02:40
	← JosephFerano left	02:41
	→ wrouesnel joined	02:41
	→ JosephFerano joined	02:44
	← a_le left	02:45
	← moritzs left	02:45
	→ CKyle joined	02:45
	→ a_le joined	02:45
	← CheckDavid left	02:47
	polyzen → poly	02:47
	← lpax left	02:47
	→ Reskp joined	02:49
	← tranzfuse left	02:51
	← johtso left	02:51
	← Reskp left	02:53
	→ livingstn joined	02:54
	→ hahuang61 joined	02:55
	→ DarkCthulhu joined	02:56
	→ Gitzilla joined	02:57
	← ColdKeyboard left	02:57
	← darkbasic left	02:57
	→ darkbasic joined	02:58
	→ Malsasa joined	02:58
	→ devoldmx joined	02:59
	← duplex left	02:59
	← crelix left	03:00
	→ duplex joined	03:00
	← a_le left	03:01
	← wxg4irc left	03:02
	← hahuang61 left	03:02
	→ nkouevda joined	03:02
	← paulweb515 left	03:03
	← checkItOut left	03:03
	← Noldorin left	03:03
	→ hahuang65 joined	03:03
	← Vivekananda left	03:04
	← dbarrett left	03:05
	→ zacts joined	03:05
	← colorbot left	03:06
	← smccarthy left	03:06
	→ smccarthy joined	03:07
	← danemacmillan left	03:07
	← thiago left	03:08
	← msonntag left	03:08
	← ropav left	03:09
	← mribeirodantas left	03:10
	→ msonntag joined	03:11
	→ St1gma joined	03:12
	← hadees left	03:13
	→ adys joined	03:14
	← jleclanche left	03:15
	→ EminenceHC joined	03:16
	← jrnieder left	03:18
	→ sctskw joined	03:19
	→ thedodd joined	03:19
	→ hadees joined	03:19
	← hadees left	03:20
	→ magic_ joined	03:20
	→ sohail` joined	03:20
	→ str joined	03:21
	← EminenceHC left	03:21
	← jason237 left	03:21
	→ AndroUser2 joined	03:22
	← AndroUser2 left	03:22
	← luriv left	03:22
	→ jason237 joined	03:23
	→ t0th_-_ joined	03:23
	← Manny_ left	03:25
	→ ManikM joined	03:25
	→ chrisgeo joined	03:25
	← sgen left	03:26
	→ alvaro_o joined	03:26
	← ehmatthes left	03:26
	→ awkwardusername joined	03:26
	→ slixpk joined	03:27
	← Fifty5Plus_ left	03:27
	→ Fifty5Plus joined	03:27
	→ AndroUser2 joined	03:27
	← t0th_-_ left	03:28
	→ AR45 joined	03:28
	→ shampine joined	03:29
	← disabled_ left	03:30
	← Asiajey left	03:30
	← chrisgeo left	03:30
	← Baako left	03:31
	← awkwardusername left	03:32
	→ Nizumzen joined	03:32
	← Malsasa left	03:32
	→ _Atom_ joined	03:32
	← AndroUser2 left	03:32
	← pmallya left	03:33
	→ AndroUser2 joined	03:34
	← AndroUser2 left	03:35
	→ AndroUser2 joined	03:35
	← thibaultcha left	03:37
	← Nijikokun left	03:38
	← AndroUser2 left	03:38
	← m0viefreak left	03:38
	← CKyle left	03:40
	→ EminenceHC joined	03:41
	← amikiri left	03:41
	← dsdeiz_ left	03:41
	→ BSaboia joined	03:41
	→ dsdeiz joined	03:42
	← _Atom_ left	03:42
	→ dreiss joined	03:43
	← DaveD_PDX left	03:44
	← wrouesnel left	03:44
	← Bruno_ left	03:44
	→ Motoko joined	03:45
	← EminenceHC left	03:45
	← devoldmx left	03:46
	→ rishabh__ joined	03:46
	→ mikewintermute joined	03:48
	← mikewintermute left	03:49
	← ezioadf left	03:49
	→ Reskp joined	03:49
	← weiyang left	03:51
	← buffal0 left	03:52
	← centrx left	03:52
	← aidalgol left	03:52
	← gnfz left	03:53
	→ aidalgol joined	03:53
	→ AndroUser2 joined	03:53
	← Reskp left	03:54
	→ colorbot joined	03:56
	← Mitchbones left	03:56
	← AndroUser2 left	03:59
	→ AndroUser2 joined	04:00
	← AndroUser2 left	04:01
	→ subhojit777 joined	04:01
	← eletuchy left	04:02
	→ CKyle joined	04:04
	→ weiyang joined	04:05
	→ centrx joined	04:05
	→ Error404NotFound joined	04:06
	← centrx left	04:07
	← MacGyver left	04:07
	← aidalgol left	04:08
	← roflin left	04:08
	← Nickeeh left	04:09
	→ aidalgol joined	04:09
	← colorbot left	04:12
	→ iliketurtles joined	04:13
	← poly left	04:13
	← livingstn left	04:15
	→ Glub0t joined	04:17
Glub0t	hi, I want to make sure that when I rename a file in git repo, the commit history for that file is still persist. Am I correct?	04:19
slixpk	Glub0t: Probably. The repo will always have past versions of that file.	04:21
	Glub0t: But what do you mean "for that file"	04:22
Glub0t	slixpk: the file that being renamed	04:23
	← aidalgol left	04:23
Glub0t	slipxpk: I mean when using git blame, I still can still who edit what. Not like new file with one commit.	04:26
	*still can see	04:27
	→ kerrick joined	04:27
	← CKyle left	04:30
	→ Xiti` joined	04:31
	→ Bruno_ joined	04:31
	← Xiti` left	04:32
	← Xiti left	04:33
	→ iamjarvo joined	04:33
	← iamjarvo left	04:34
slixpk	Glub0t: http://git-scm.com/docs/git-blame	04:34
	→ iamjarvo joined	04:34
slixpk	Glub0t: "The origin of lines is automatically followed across whole-file renames (currently there is no option to turn the rename-following off). To follow lines moved from one file to another, or to follow lines that were copied and pasted from another file, etc., see the -C and -M options."	04:34
	← BSaboia left	04:35
slixpk	Glub0t: Sounds like it will work perfectly according to the docs! :D	04:35
	→ kyb3r_ joined	04:36
Glub0t	slipxpk, I just test it, with just mv, not git mv, and it's not work as expected	04:39
	← shampine left	04:40
	→ thibaultcha joined	04:40
	← javster left	04:41
	→ shampine joined	04:41
Glub0t	slipxpk, thx for your reply. Now, I'm sure that I have to use git mv, instead mv. (I have to change my habit -__-)	04:43
	← robbyoconnor left	04:44
	→ EminenceHC joined	04:44
	→ daito joined	04:45
	← watabou left	04:46
slixpk	Glub0t: Heh, yeah. You can also git add the new file and git rm the old one. Git will recognize the rename in the staging area if you do git status after.	04:48
	← qbjc left	04:48
	→ fairuz joined	04:48
	→ mennea joined	04:49
	← EminenceHC left	04:49
	← MattMaker left	04:49
	→ MattMaker joined	04:50
	→ Reskp joined	04:50
	→ robbyoconnor joined	04:51
	→ ErKa joined	04:51
	→ watabou joined	04:52
	← JanC left	04:52
	→ boombatower joined	04:54
	← Reskp left	04:55
	→ sinequanon joined	04:55
	→ puff joined	04:55
	← dreiss left	04:58
	→ devoldmx joined	04:59
	← devoldmx left	04:59
	→ devoldmx joined	05:00
	← harish left	05:01
	→ Baako joined	05:03
	← hgl left	05:03
	→ ehmatthes joined	05:04
	→ dreiss joined	05:05
	← meanderer left	05:06
	→ JanC joined	05:06
	← toothrot left	05:07
	← wbdecker left	05:08
	→ pheaver joined	05:11
	→ Nevik joined	05:12
	→ t0th_-_ joined	05:12
	→ snuffeluffegus joined	05:12
	← zacts left	05:13
	→ King_Hual joined	05:13
	← thedodd left	05:14
	→ colorbot joined	05:14
	→ zacts joined	05:14
	→ palcu joined	05:15
	← dreiss left	05:15
	← durre left	05:15
	← Nevik left	05:16
	← t0th_-_ left	05:17
	← enitiz left	05:17
	→ ojacobson joined	05:17
	→ JohnBat26 joined	05:18
	← mennea left	05:19
	→ mennea joined	05:19
	← palcu left	05:19
	← King_Hual left	05:20
	← sinequanon left	05:22
	→ hgl joined	05:23
	← ojacobson left	05:24
	→ a_le joined	05:24
	← ManikM left	05:25
	→ ManikM joined	05:25
	→ ircBaako joined	05:26
	→ beautifulmind joined	05:28
	← Baako left	05:29
	→ dreiss joined	05:30
	→ thiago joined	05:35
	← beautifulmind left	05:36
	→ awkwardusername joined	05:37
	← knownasilya left	05:39
	← dreiss left	05:41
	→ beautifulmind joined	05:41
	→ diegoaguilar joined	05:42
	→ Bruno__ joined	05:42
	→ wjiang joined	05:44
	← wjiang left	05:45
	→ wjiang joined	05:45
	← Bruno_ left	05:45
	← colorbot left	05:46
	← smccarthy left	05:49
	→ arup_r joined	05:49
	← mennea left	05:49
	adys → jleclanche	05:49
	→ mennea joined	05:49
	→ johnkevinmbasco joined	05:49
	→ dreiss joined	05:51
	→ EminenceHC joined	05:51
	→ Reskp joined	05:51
	← lindenle left	05:53
	← ircBaako left	05:54
	← otter768 left	05:54
	← EminenceHC left	05:56
	← Reskp left	05:56
	→ s8321414 joined	06:01
	← diegoaguilar left	06:01
	← veebers left	06:02
	← rishabh__ left	06:03
	← UmbraMalison left	06:04
	← a_le left	06:04
	→ Nevik joined	06:05
	→ UmbraMalison joined	06:05
	→ BlaXpirit joined	06:05
	→ DaveD_PDX joined	06:07
	→ a_le joined	06:07
	→ ircBaako joined	06:07
ircBaako	hi guys i want to clone from gits but i wanna want to clone specify files. how can i do this please	06:08
	← glebihan left	06:09
slixpk	ircBaako: I don't believe you can. You have to clone the entire git repository.	06:09
ircBaako	slixpk okay thanks	06:10
	← dreiss left	06:11
ircBaako	i have some files in my local host thats are not up to date than my repo but at the same time i have some files in my repo that are more up to date than my local working copy	06:11
	→ glebihan joined	06:12
	← thiago left	06:13
	→ Xiti joined	06:13
	→ dreiss joined	06:15
	→ saurabh joined	06:18
	saurabh → Guest44325	06:18
	→ corni joined	06:19
	→ palcu joined	06:21
	← a_le left	06:22
	← snuffeluffegus left	06:24
	→ a_le joined	06:25
	→ colorbot joined	06:25
	← arup_r left	06:25
	← palcu left	06:26
	← corni left	06:26
	→ pcfreak30 joined	06:26
	→ thiago joined	06:27
	→ pantsman- joined	06:27
	→ sinequanon joined	06:28
pcfreak30	How can I search the reflogs for a file. I have a lost commit.	06:28
heftig	pcfreak30: try git reflog -- path/of/file	06:29
Seveas	pcfreak30: git reflog filename	06:29
	though it doesn't seem to actually do what it would seem to do, try with --stat to see why	06:30
	← zivester left	06:31
	→ Junior joined	06:31
	→ arup_r joined	06:33
	→ pcypher joined	06:33
	← solker__ left	06:34
	← a_le left	06:34
pcfreak30	?	06:34
	I just have a commit thats lost and need to recover code	06:34
	→ solker_ joined	06:34
	→ Sijdesign joined	06:35
	→ jmverges joined	06:35
	← thiago left	06:35
kadoban	pcfreak30: Do you know what branch it was on or anything?	06:36
	← beautifulmind left	06:36
	← johnkevinmbasco left	06:37
pcfreak30	master	06:37
	← pheaver left	06:37
pcfreak30	we are not using branches atm	06:37
	→ kriks joined	06:37
	→ thiago joined	06:37
	→ a_le joined	06:37
kadoban	pcfreak30: Any idea of the time period, or would you recognize the commit message or anything? Easiest way is just to manually look in the reflog and find it	06:38
pcfreak30	im trying to find file changes	06:38
	in the commits for my file	06:38
	← solker_ left	06:39
pcfreak30	Would prob be under 2 weeks that I wrote this	06:39
	← zumba_addict left	06:40
	→ gauke joined	06:41
	→ zumba_addict joined	06:41
	ChanServ set mode: +o	06:43
	Eugene changed the topic to: Welcome to #git, the place for git help and and and and and \| Current stable version: 2.1.3 \| Start here: http://jk.gs/git \| Getting "cannot send to channel"? /msg gitinfo .voice \| Beware the HEADless horseman of gitty hollow	06:43
	Eugene set mode: -o	06:43
	← pcypher left	06:44
	→ ThomasLocke joined	06:44
	← watabou left	06:45
	← ThomasLocke left	06:45
	→ ThomasLocke joined	06:45
	← zumba_addict left	06:46
	← pantsman- left	06:46
phy1729	s/and/buffalo/g	06:46
	→ nrsk joined	06:47
Eugene	Har	06:47
	← gauke left	06:47
	ChanServ set mode: +o	06:47
phy1729	http://en.wikipedia.org/wiki/Buffalo_buffalo_Buffalo_buffalo_buffalo_buffalo_Buffalo_buffalo	06:47
	Eugene changed the topic to: Welcome to #git, the place for git help and Buffalo buffalo Buffalo buffalo buffalo buffalo Buffalo buffalo. \| Current stable version: 2.1.3 \| Start here: http://jk.gs/git \| Getting "cannot send to channel"? /msg gitinfo .voice \| Beware the HEADless horseman of gitty hollow	06:47
	← a_le left	06:47
Eugene	Yeah, I had to look up which was capitalized	06:47
	→ gauke joined	06:47
	Eugene set mode: -o	06:47
phy1729	\o/ made the topic	06:48
	← gauke left	06:48
	← colorbot left	06:48
	← mennea left	06:49
	→ colorbot joined	06:49
	→ mennea joined	06:49
Eugene	It really doesn't take much at all to do that	06:50
	I'll just get drunk and /op random people	06:50
phy1729	really?	06:50
Eugene	Totes	06:50
	phy1729 makes a not to be more active during Friday evenings	06:50
phy1729	note even	06:50
	ChanServ set mode: +o	06:50
	← iliketurtles left	06:51
	ChanServ set mode: -o	06:51
	→ Reskp joined	06:52
	→ EminenceHC joined	06:53
	← colorbot left	06:53
milki	lol	06:53
	→ lindenle joined	06:53
	→ ciampix joined	06:54
phy1729	I should make a script to do my standard thing when I get random ops	06:54
milki	ruh roh	06:54
	← Reskp left	06:56
	→ Err404NotFound joined	06:57
	← Error404NotFound left	06:57
	← EminenceHC left	06:57
	← lindenle left	06:58
	→ wrouesnel joined	06:58
	← Aa4on left	06:59
	→ tarkus joined	06:59
	→ a_le joined	06:59
	→ t0th_-_ joined	07:01
	→ Aa4on joined	07:01
	← AR45 left	07:02
	→ marthinal joined	07:02
	← Err404NotFound left	07:03
	→ Error404NotFound joined	07:03
	→ EminenceHC joined	07:03
	→ AR45 joined	07:03
	→ dregad joined	07:05
	← t0th_-_ left	07:06
	← mennea left	07:06
	← Sijdesign left	07:06
	← EminenceHC left	07:07
	→ zumba_addict joined	07:08
	← ciampix left	07:08
	→ Marcus_ joined	07:08
	→ lb1a joined	07:11
	→ ilhami joined	07:12
	→ aidalgol joined	07:12
	← glebihan left	07:13
	← a_le left	07:13
	→ freimatz joined	07:14
	→ a_le joined	07:14
	← a_le left	07:14
	← devoldmx left	07:14
	→ devoldmx joined	07:15
	← BtbN left	07:15
	← jonet left	07:15
	← eXeC64 left	07:15
	← breiti left	07:15
	← devoldmx left	07:15
	→ rakm_ joined	07:15
	→ spaceman joined	07:15
	← antispaceman left	07:16
	→ mattstratton joined	07:16
osse	i've never made it to the topic	07:16
	I have been kicked a bunch of times though	07:16
	→ CalimeroTeknik joined	07:17
	← rakm left	07:17
	← dregad left	07:17
	rakm_ → rakm	07:17
	← Motoko left	07:18
	→ titou_ joined	07:18
	← titou left	07:18
	→ colorbot joined	07:19
	← zumba_addict left	07:19
	← dom96 left	07:19
	← Mekkis left	07:20
	← nemesit\|znc left	07:20
	← ErKa left	07:20
	→ Gizburdt joined	07:21
	→ nilg joined	07:21
	→ palcu joined	07:22
	→ ciampix joined	07:22
	→ dom96 joined	07:22
	← MLM left	07:23
	← ohcibi left	07:23
	← himikof left	07:23
	← bauruine left	07:24
	← ManikM left	07:25
	→ ManikM joined	07:25
	← palcu left	07:27
	→ nnyk_ joined	07:27
	→ damccull_ joined	07:29
	→ BinGOs_ joined	07:29
	→ abec0_ joined	07:29
	→ sLite_ joined	07:29
	→ tonyj_ joined	07:29
	← heftig left	07:29
	← damccull left	07:29
	→ jdmf joined	07:29
	← colorbot left	07:30
	← tonyj left	07:30
	← BinGOs left	07:30
	← abec0 left	07:30
	← sLite left	07:30
	strictlyb → sb	07:31
	→ dc5ala joined	07:31
	→ devoldmx joined	07:35
	→ solker_ joined	07:35
	← sctskw left	07:36
	← RagnarDanneskjol left	07:36
	← sinequanon left	07:36
	→ Marcus___ joined	07:37
	→ punchaga` joined	07:37
	→ glebihan joined	07:39
	→ kopparam joined	07:39
	→ colorbot joined	07:39
	← devoldmx left	07:39
	← Marcus_ left	07:39
	← solker_ left	07:39
	→ milli` joined	07:39
	← punchagan left	07:40
	→ jagob joined	07:41
	→ jrvlima joined	07:44
	→ tarkus_ joined	07:45
	→ a_le joined	07:45
	← tarkus left	07:45
	→ Nevik_ joined	07:45
	→ red_horned_rihno joined	07:45
	← red_horned_rihno left	07:46
	← jrvlima left	07:48
	← Nevik left	07:49
	← JStoker left	07:49
	← sea-gull left	07:49
	← dw left	07:49
	← pilif left	07:49
	← Guest87505 left	07:49
	← ujjain left	07:49
	← GarethAdams left	07:49
	← coasterz left	07:49
	← AlexanderS left	07:49
	← SupaHam left	07:49
	← creppe left	07:49
	← fishey2 left	07:49
	← idoru left	07:49
	← manitu left	07:49
	← pikaren left	07:49
	← ramlev left	07:49
	← zamba left	07:49
	← spaceone left	07:49
	← milli left	07:49
	← jmverges left	07:50
	→ b1nar1_ joined	07:50
	→ jmverges joined	07:51
	← b1nar1 left	07:52
	← ag4ve_ left	07:52
	→ eXeC64 joined	07:53
	→ jonet joined	07:53
	← glebihan left	07:53
	→ ramlev joined	07:53
	← kopparam left	07:54
	→ ujjain joined	07:54
	→ ojacobson joined	07:54
	→ nekyian_ joined	07:54
	→ cbr joined	07:54
	→ Reskp joined	07:54
	→ JStoker joined	07:54
	→ AlexanderS joined	07:55
	→ lindenle joined	07:55
	→ pilif joined	07:55
	→ BtbN joined	07:55
	→ tvw joined	07:55
	→ nemesit\|znc joined	07:55
	→ freeman42 joined	07:56
	→ SupaHam joined	07:56
	→ breiti joined	07:56
	→ heftig joined	07:56
	← s8321414 left	07:56
	← a_le left	07:58
	→ himikof joined	07:58
	→ LeMike joined	07:58
	→ skylite joined	07:58
	→ bauruine joined	07:58
	→ manitu joined	07:59
	← lindenle left	07:59
	← Reskp left	07:59
	→ palcu joined	08:00
	← palcu left	08:00
	← francisfish left	08:01
	→ hebz0rl joined	08:01
	← BinGOs_ left	08:01
	→ DrSkyLizard joined	08:02
	→ BinGOs joined	08:02
	→ jceb joined	08:03
	← jceb left	08:03
	→ PCatinean joined	08:04
	→ glebihan joined	08:04
	← iamjarvo left	08:04
	→ mennea joined	08:05
	→ Brain joined	08:05
	← sohail` left	08:06
	→ jceb joined	08:06
	← dkog left	08:06
	→ goTAN joined	08:06
	← BlaXpirit left	08:08
	→ EminenceHC joined	08:09
	→ sea-gull joined	08:09
	← mennea left	08:09
	→ mennea joined	08:09
	→ TomyWork joined	08:10
	vals_ → tango_	08:10
	→ ohcibi joined	08:12
	→ GarethAdams joined	08:12
	← ehmatthes left	08:12
	← EminenceHC left	08:13
	→ ghostlines joined	08:13
	← freeman42 left	08:13
	→ jargon joined	08:14
	← shampine left	08:14
	→ zamba joined	08:14
	← sb left	08:15
	→ sb joined	08:15
	← sb left	08:15
	→ Suchit joined	08:15
	→ strictlyb joined	08:16
	→ snuffeluffegus joined	08:18
	→ sohail` joined	08:18
	→ Caius joined	08:19
	→ dw joined	08:19
	→ coasterz joined	08:19
	→ fishey2 joined	08:19
	→ idoru joined	08:19
	→ pikaren joined	08:19
	→ spaceone joined	08:19
	← glebihan left	08:19
	← boombatower left	08:19
	→ boombatower joined	08:20
	← boombatower left	08:20
	→ boombatower joined	08:20
	← pikaren left	08:20
	→ pikaren joined	08:20
	← Caius left	08:20
	→ Caius joined	08:20
	← Tuna-Fish left	08:20
	→ harish joined	08:21
	→ mlechner joined	08:21
	→ Tuna-Fish joined	08:21
	← aidalgol left	08:21
	→ aidalgol joined	08:21
	← nikita left	08:23
	← colorbot left	08:23
	← freimatz left	08:25
	→ colorbot joined	08:25
	→ nikita joined	08:26
	← colorbot left	08:27
	← ojacobson left	08:27
	→ seschwar joined	08:28
	← DrSkyLizard left	08:28
	→ Amandil joined	08:29
	← nkouevda left	08:29
	← sohail` left	08:29
	← CustosLimen left	08:30
	→ psoo joined	08:30
	→ dtrott joined	08:30
dtrott	When I get a rebase conflict sometime I want to unstage (git reset HEAD … git checkout -f ….) a set of files is there a way to do this with just one command ?	08:32
	← joki left	08:32
jast	git checkout HEAD -- <file>	08:33
	→ elichai2 joined	08:34
dtrott	jast:Thanks thats going to save me a lot of time….	08:34
	→ hs366 joined	08:34
	→ solker_ joined	08:36
	← gv left	08:36
	← govg left	08:36
	→ joki joined	08:37
	← ilhami left	08:37
	→ ilhami joined	08:37
	← goTAN left	08:38
	→ colorbot joined	08:38
	← FabTG left	08:38
	→ bmcorser joined	08:38
	← thibaultcha left	08:39
	← solker_ left	08:40
	← Gamecubic left	08:40
	→ gv joined	08:40
	→ FabTG joined	08:41
	→ moritzs joined	08:41
	→ glebihan joined	08:41
	→ AshyIsMe joined	08:41
	← arup_r left	08:41
AshyIsMe	what's it called when you want to check in only some of the changes in a file?	08:41
grawity	`git add -p`	08:42
	← zapb_ left	08:42
	→ zapb_ joined	08:42
AshyIsMe	grawity: cheers	08:42
	← madduck left	08:43
	→ madduck joined	08:44
	← madduck left	08:44
	← AshyIsMe left	08:44
	← raven-au left	08:44
	← danjordan left	08:45
	← srcerer left	08:45
	→ danjordan joined	08:46
	← zzz_AR45 left	08:46
	→ madduck joined	08:46
	← madduck left	08:46
	→ madduck joined	08:46
	← elichai2 left	08:47
	→ elichai2 joined	08:47
	← nekyian_ left	08:48
	← AR45 left	08:49
	→ raven-au joined	08:49
	← dreiss left	08:49
	→ t0th_-_ joined	08:50
	→ AR45 joined	08:50
	→ elichai2_ joined	08:51
	← colorbot left	08:51
	← elichai2 left	08:51
	← mattstratton left	08:51
dtrott	When doing a rebase, git is very “smart” about finding directories that have been relocated and applying the patch there, is there any way to make it “dumb” so that it doesn’t try to relocate packages into a different directory ?	08:51
	← elichai2_ left	08:51
	→ kopparam joined	08:52
	→ francisfish joined	08:52
	← seschwar left	08:53
	→ mattstratton joined	08:54
	→ Emugel joined	08:54
	← Error404NotFound left	08:54
	← t0th_-_ left	08:54
	← raven-au left	08:54
	→ Reskp joined	08:55
	← Amandil left	08:56
	← mattstratton left	08:57
	→ CustosLimen joined	08:57
Emugel	I have a computer and a laptop and would like to develop on both of them. What is the recommended workflow for this use case? git clone?	08:57
	← oskarkv left	08:57
grawity	of course – what else is there?	08:57
osse	git clone is "never" part of a workflow, because it's somethign you do just once.	08:58
	← darkbasic left	08:58
	→ darkbasic joined	08:58
grawity	the question is /what/ you'll clone – a repo on your own server that you can push to, or the other computer's repo	08:58
	→ mattstratton joined	08:59
	← thiago left	08:59
	→ Xethron joined	08:59
	→ ag4ve joined	08:59
	← Reskp left	09:00
	→ palcu joined	09:00
Emugel	okay I'll proceed then with cloning my laptop's repo then	09:01
	thx	09:01
	→ Juzzika joined	09:01
	→ raven-au joined	09:02
	← blubberbop left	09:03
	← mattstratton left	09:03
	→ mattstratton joined	09:05
masak	there's nothing to prevent me from pushing a stash, is there?	09:05
	for, um, backup.	09:06
	← palcu left	09:06
	→ mnngfltg joined	09:06
jast	well you'd have to make a ref for it	09:06
masak	oh, that's true.	09:06
	osse tries	09:07
masak	let's assume I want to fetch it later and get it back on the stack of stashes.	09:07
jast	that's tricky	09:07
masak	what's the easiest way to do that?	09:07
bremner	just commit already. way less trouble	09:07
masak	sure.	09:07
jast	because stashes are in a reflog, and there's no interface for adding reflog entries	09:07
masak	this is a thought experiment.	09:07
jast	you could fetch it and 'git stash apply <ref>', though	09:07
	(I think)	09:07
osse	the latest stash has a ref already: refs/stash	09:07
	but when I do git push origin refs/stash[:refs/stash] (I tried both) I get:	09:08
	! [remote rejected] refs/stash -> refs/stash (funny refname)	09:08
	heh	09:08
	← mattstratton left	09:08
mnngfltg	Hello! Pretty simple question: I want to review branch `feature/abc`, which was created from `master` one week ago. To see the changes made in the branch, I can do `git checkout feature/abc; git diff ^master'. But that'll give me changes that have been made in `master` in the past week. What do people use to review branches then?	09:08
jast	hence my saying you need to make a ref :)	09:08
masak	wow, you can git-stash apply things that are not on the stack of stashes.	09:08
jast	sure	09:08
grawity	yeah, I think it refuses 2-component names nowadays?	09:08
	← raven-au left	09:08
masak	probably should make a custom ref, in my own little ref/something namespace.	09:09
	→ raven-au joined	09:09
jast	mnngfltg: no idea what exactly you want to see, but e.g. if you want a diff of the feature branch started from the point it diverged from master: git diff master...feature/abc	09:09
	→ mattstratton joined	09:10
	← LeMike left	09:10
grawity	push refs/stash:refs/tmp/stash	09:10
	→ mikecmpbll joined	09:10
	→ EminenceHC joined	09:10
grawity	note that it won't push reflog, only individual stashes	09:10
	so push refs/stash@{1}:... or whatever	09:10
osse	git push origin refs/stash:refs/rofl/stash worked	09:10
	ahh, grawity beat me to me	09:10
	to it	09:10
	← mattstratton left	09:13
	← EminenceHC left	09:14
	← kopparam left	09:15
	→ mattstratton joined	09:16
	→ nour joined	09:16
	→ elichai2 joined	09:17
elichai2	hey	09:17
	→ Baako joined	09:17
elichai2	how can i create new branch not base on master?	09:17
	→ seschwar joined	09:18
elichai2	i mean i want to create branch name `test` that has the code of branch `old` not `master`	09:18
osse	elichai2: git branch test old	09:18
bremner	elichai2: see the examples in man git branch	09:18
gitinfo	elichai2: the git-branch manpage is available at http://jk.gs/git-branch.html	09:18
	→ kopparam joined	09:18
	→ Gatis joined	09:19
bremner	even if the man page is impenetrable, it's always worth looking at the examples	09:19
	← ircBaako left	09:19
	← mattstratton left	09:19
	← Goplat left	09:19
	→ arup_r joined	09:19
	← seschwar left	09:20
	→ ircBaako joined	09:20
	→ seschwar joined	09:21
	← kevin-brown left	09:21
	→ kevin-brown joined	09:21
	→ mattstratton joined	09:21
	← Emugel left	09:23
	← kopparam left	09:23
	→ marcogmonteiro joined	09:24
	← mattstratton left	09:24
	→ martinklepsch joined	09:24
	← Baako left	09:24
	→ teran joined	09:25
	← ManikM left	09:25
	→ ManikM joined	09:25
	→ bvi joined	09:26
	→ mattstratton joined	09:26
	→ petersr joined	09:26
	→ endiruna joined	09:27
	AR45 → zsh	09:27
	→ srcerer joined	09:27
	Solid1_afk → Solid1	09:28
	→ palcu joined	09:28
	← weiyang left	09:28
	→ CheckDavid joined	09:28
	← CustosLimen left	09:29
	← mattstratton left	09:29
	→ nfk joined	09:30
	zsh → AR45	09:30
	← zacts left	09:31
	→ mattstratton joined	09:31
	→ leopardb joined	09:33
	← raven-au left	09:33
	→ colorbot joined	09:33
	← madduck left	09:34
	→ DrSkyLizard joined	09:34
	← jceb left	09:35
	← Gatis left	09:35
	→ kopparam joined	09:36
	← mattstratton left	09:36
	→ solker_ joined	09:36
	← str left	09:37
	AR45 → ar45	09:37
	→ mattstratton joined	09:37
	→ Baako joined	09:38
	← petersr left	09:38
	→ roflin joined	09:39
	← jargon left	09:39
	← Gizburdt left	09:40
	→ govg joined	09:40
	← arup_r left	09:40
	← mattstratton left	09:40
	← solker_ left	09:41
	← ircBaako left	09:41
	→ s8321414 joined	09:42
	→ mattstratton joined	09:42
mnngfltg	jast, that's exactly what I want to see	09:43
	jast, thanks!!	09:44
	← elichai2 left	09:44
	← Suchit left	09:44
	→ MacGyver joined	09:44
	← MacGyver left	09:45
	→ MacGyver joined	09:45
	→ guysoft42 joined	09:45
	← mattstratton left	09:45
	← LucasKA left	09:46
	→ madduck_ joined	09:46
guysoft42	hey all, I am trying to get the sha1 of an checkout svn repo in github. this means I need to generate my own Sha1 of a directory. has anyone done that? the only thing on the internet I can do is this: http://stackoverflow.com/questions/6011172/git-hash-object-on-a-directory and the scripts there dont work without .git	09:46
	→ jargon joined	09:46
	← FreezingCold left	09:46
	→ liamkeily joined	09:47
	→ settermjd joined	09:48
bremner	guysoft42: but with a .git directory, how is this a git problem?	09:48
	→ jceb joined	09:48
	→ mattstratton joined	09:48
bremner	s/with/without/ ?	09:48
	← MacGyver left	09:49
	→ MacGyver joined	09:49
	→ CustosLimen joined	09:49
	→ raiciu joined	09:49
	→ arnatal joined	09:50
	→ jonmorehouse joined	09:50
	→ Zupoman joined	09:50
	← mattstratton left	09:51
	→ achadwick joined	09:51
	→ mattstratton joined	09:52
guysoft42	bremner, I want to understand how git calculates the SHA1 for a directory tree. surely you could do that without git?	09:53
osse	guysoft42: calulate the sha1 of all the files in the directory,then calculate the sha1 of the listing	09:54
	of those	09:54
	recurse as necessary	09:55
	← ilhami left	09:55
	← mattstratton left	09:55
	→ Reskp joined	09:56
	→ Kicer86 joined	09:56
osse	guysoft42: but the listing is in a particular format, and the sha1 of the files is actually the sha1 of 'blob <size>\0<file contents'.	09:57
	→ mattstratton joined	09:58
guysoft42	osse, ok, in think i got it all buy how does the listing look?	09:58
osse	I don't know the exact format	09:58
	→ teran_ joined	09:58
	← jceb left	09:59
	→ sMa_ joined	09:59
	← teran left	10:00
	→ leopardb_ joined	10:00
	← mattstratton left	10:00
	← Reskp left	10:01
	← madduck_ left	10:01
	→ mattstratton joined	10:02
	→ arup_r joined	10:02
	← kyb3r_ left	10:02
	← jargon left	10:03
guysoft42	osse, will it be written anywhere	10:03
	→ latenite joined	10:03
osse	I assume so	10:03
	← hgl left	10:03
	← arup_r left	10:03
latenite	Hi folks, I am quite new to git. Now I have problem pushing my local stuff to my remote origin. This is what I do: https://gist.github.com/anonymous/e11c0922203c342950c7	10:04
	But nothing gets transfered. Why?	10:04
	← leopardb left	10:04
guysoft42	guess ill google	10:04
osse	latenite: you must git commit first	10:04
	→ ircBaako joined	10:04
osse	guysoft42: sorry, I don't know where that documentation is	10:04
bremner	in the fine source?	10:04
osse	guysoft42: maybe it's mentioned in !bottomup	10:05
gitinfo	guysoft42: 'Git from the bottom up' starts with explaining the building blocks of git and proceeds to tell you how they fit together. http://ftp.newartisans.com/pub/git.from.bottom.up.pdf (http://ikke.info/git.from.bottom.up.pdf)	10:05
	→ jargon joined	10:05
osse	bremner: I looked in tree.h, and then gave up	10:05
	← mattstratton left	10:05
latenite	osse, omg, sure. Sorry. THAT was embarrassing :(	10:05
	osse, thank you tough :D	10:05
	→ thibaultcha joined	10:06
osse	guysoft42: http://stackoverflow.com/questions/14790681/format-of-git-tree-object	10:06
	→ sohail` joined	10:06
	→ beautifulmind joined	10:06
	→ goTAN joined	10:06
latenite	osse, now on another client, I get: https://gist.github.com/anonymous/7ed526de1ae9188b431c	10:07
	← beautifulmind left	10:07
	→ mattstratton joined	10:07
	← magic left	10:07
latenite	osse, what is ment by "stash" ?	10:07
osse	man git-stash	10:07
gitinfo	the git-stash manpage is available at http://jk.gs/git-stash.html	10:07
guysoft42	osse, thanks! ill see if i can implement this	10:07
	← kopparam left	10:07
	← Baako left	10:08
	→ ecky--ptang-zoob joined	10:08
osse	guysoft42: if this is a one-off thing you need it'll be easier to create a temporary scratch repo, run update-index and then write-tree. But I'm not trying to stop you .p	10:08
	← mattstratton left	10:09
	→ beautifulmind joined	10:09
latenite	osse, ok I am sure I don't want to stash. I would rather combine both versions manually and have a new-big one. How would I do that?	10:09
osse	latenite: commit them first	10:10
	→ sdfvsfgvsdf joined	10:10
	→ mattstratton joined	10:10
	← thibaultcha left	10:10
	→ mikecmpb_ joined	10:11
	← Nizumzen left	10:12
	→ jceb joined	10:12
osse	latenite: if you stash, pull, then "pop" the stash again then you get the same opportunity	10:12
	→ nettoweb joined	10:13
	← mattstratton left	10:14
	← mikecmpbll left	10:14
latenite	osse, it sais "fix conflicts and run "git commit"" : https://gist.github.com/anonymous/c8d8bd9e3b379d8bd2cb	10:14
	→ intellix joined	10:14
latenite	osse, but how/ what should I fix? sorry 1st time doing this kind of stuff	10:15
	→ EminenceHC joined	10:15
	→ mattstratton joined	10:15
lb1a	osse, here is your "one-time-topic-change" coupon. use it wisely ;)	10:18
osse	latenite: the two files at the bottom	10:18
lb1a	[]	10:18
osse	!conflict > latenite	10:18
gitinfo	[!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, don't panic. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II	10:18
	← mattstratton left	10:18
	← jargon left	10:18
	→ netcarver joined	10:18
	← Glub0t left	10:19
	→ Reskp joined	10:19
	← EminenceHC left	10:20
	→ icio joined	10:20
	→ jargon joined	10:20
	→ mattstratton joined	10:21
	← sdfvsfgvsdf left	10:21
	→ arup_r joined	10:22
	← mattstratton left	10:23
	→ rath joined	10:24
	→ hgl joined	10:25
	mikecmpb_ → mikecmpbll	10:25
	→ mattstratton joined	10:25
	→ madduck_ joined	10:27
	← madduck_ left	10:27
	→ madduck_ joined	10:27
	← hyperair left	10:28
	→ GDG612 joined	10:28
	← mattstratton left	10:28
	← aidalgol left	10:29
latenite	osse, ok. What tools (one for terminal one for X) would you recommend for git mergetool? It asks for emacs here, but I never worked with emacs before.	10:29
	← martinklepsch left	10:29
	→ martinklepsch joined	10:29
	→ mattstratton joined	10:30
	← punchaga` left	10:30
	→ Gizburdt joined	10:30
	← elcheckito left	10:31
	← fairuz left	10:31
	← sohail` left	10:32
	→ punchagan joined	10:32
	← mattstratton left	10:32
	→ raven-au joined	10:33
	← boombatower left	10:34
	← ecky--ptang-zoob left	10:34
	→ ecky--ptang-zoob joined	10:34
	→ shebbi joined	10:35
shebbi	hi, what is a bare repos?	10:35
	→ mattstratton joined	10:35
shebbi	"make it bare", what does this mean?	10:35
Seveas	a bare repo does not have a working tree	10:36
punchagan	shebbi: clone with a --bare flag. http://git-scm.com/book/en/v2/Git-on-the-Server-Getting-Git-on-a-Server	10:36
shebbi	do i need a bare repos?	10:37
	← mattstratton left	10:37
	→ rhombus joined	10:37
	→ kopparam joined	10:38
	← nikita left	10:38
	→ solker_ joined	10:38
	← ecky--ptang-zoob left	10:38
	← jonmorehouse left	10:38
	→ ecky--ptang-zoob joined	10:38
	→ t0th_-_ joined	10:39
masak	shebbi: the "server" doing pushes and pulls is often bare.	10:39
shebbi	ok	10:39
masak	shebbi: because a working tree is only sensible if there's a developer sitting on the box.	10:39
	→ nikita joined	10:40
	← daito left	10:40
	→ Nickeeh joined	10:40
	→ mattstratton joined	10:41
	← solker_ left	10:42
	← sarri left	10:43
	← colorbot left	10:43
	← kopparam left	10:43
	← t0th_-_ left	10:43
shebbi	what's a good name for a repo?	10:43
	any convention?	10:43
latenite	Hi folks, I just merged on one of my clients and pushed to master. Now the other client can not pull. I get:	10:43
	There is no tracking information for the current branch.	10:43
	Please specify which branch you want to merge with.	10:43
	What happend?	10:44
	→ sarri joined	10:44
Seveas	shebbi: the name of the project :)	10:44
shebbi	Seveas: ok	10:44
Seveas	latenite: git branch --set-upstream-to branch/you/want/to/merge/with	10:45
	← mattstratton left	10:45
	→ mattstratton joined	10:46
latenite	Seveas, I am totaly lost now :(	10:48
	https://gist.github.com/anonymous/67c445f5338d425158b3	10:48
	← raven-au left	10:49
	Solid1 → Solid1_afk	10:49
latenite	Seveas, I have a bare repo I am pushing to and all my clients pull from.	10:49
	← mattstratton left	10:49
	→ mattstratton joined	10:50
	→ kopparam joined	10:51
	← tokik left	10:52
	← mattstratton left	10:53
	→ t0th_-_ joined	10:54
	← solker left	10:54
	← raiciu left	10:55
	→ arup_r_ joined	10:55
	→ MalteJ joined	10:55
	← kopparam left	10:56
	→ mattstratton joined	10:56
	→ elcheckito joined	10:56
	→ pwnz7777 joined	10:57
	← Orbitrix left	10:58
	← arup_r left	10:58
	→ Orbitrix joined	10:58
	← mattstratton left	10:58
	← teran_ left	10:58
	→ raven-au joined	10:59
	→ mkoskar joined	11:00
	→ nodekid_ joined	11:00
	→ mattstratton joined	11:00
	→ ilhami joined	11:01
	→ stamina joined	11:01
	← nodekid left	11:02
	← ilhami left	11:02
	→ ilhami joined	11:02
	→ daedeloth joined	11:02
	← mattstratton left	11:03
	→ mattstratton joined	11:05
	→ Malsasa_ joined	11:06
	← raven-au left	11:06
	← mattstratton left	11:07
	→ thibaultcha joined	11:08
	→ raven-au joined	11:08
	→ vtunka joined	11:10
	← nettoweb left	11:10
	→ mattstratton joined	11:10
	→ nettoweb joined	11:11
	Malsasa_ → Malsasa	11:11
	← thibaultcha left	11:12
	← hgl left	11:12
	→ hgl joined	11:13
	→ lindenle joined	11:14
	→ checkItOut joined	11:14
	← mattstratton left	11:14
	→ hexagoxel joined	11:16
	← CustosLimen left	11:16
	→ mattstratton joined	11:16
	← wjiang left	11:16
	→ paulweb515 joined	11:17
	← mattstratton left	11:17
	← lindenle left	11:18
	→ EminenceHC joined	11:19
	→ ajithps joined	11:19
	← raven-au left	11:20
	→ vpl joined	11:20
	→ Raging_Hog joined	11:21
	→ ignas joined	11:21
	→ mattstratton joined	11:21
	← paulweb515 left	11:22
	→ raven-au joined	11:22
	← ircBaako left	11:22
lb1a	latenite, you tried to setup an upstream beanch	11:23
	← EminenceHC left	11:23
lb1a	latenite, but you specified the remote REPO name instead of the branchname	11:23
	← palcu left	11:24
	→ jottr joined	11:24
lb1a	The help was : "git branch --set-upstream-to=origin/<branch> master " you did "git branch --set-upstream-to origin" where you should have done e.g. for the master branch: "git branch --set-upstream-to origin/master master"	11:24
shebbi	do i put the codebase in the .git folder?	11:25
lb1a	shebbi, no you dont put anything in the .git dir	11:25
shebbi	so far i created a repos in D:\repos	11:25
	← ManikM left	11:25
lb1a	shebbi, read as "DONT TOUCH IT" ;)	11:25
	← mattstratton left	11:25
	→ ManikM joined	11:25
shebbi	I put codebase in D:\repos	11:25
lb1a	shebbi, what have you done, what did you want to achieve?	11:25
	→ King_Hual joined	11:25
shebbi	then do my first commit right?	11:25
	I want to use GIT for version control	11:26
	← wrouesnel left	11:26
shebbi	my project is in C:\wamp\www	11:26
	→ mattstratton joined	11:26
shebbi	I want to version control www folder	11:26
lb1a	shebbi, maybe you want to do a quick introduction as in !trygit or read a little bit about how to use git in a !book ?	11:26
gitinfo	shebbi: A quick, interactive, in-browser introduction to git is available at http://try.github.io	11:26
	shebbi: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable	11:26
shebbi	I'm specifically using tortoise git	11:27
	I'm not going to use git bash in command line	11:27
	too hard	11:27
lb1a	hmkay.... the problem is that we dont support !gui stuff	11:27
gitinfo	Graphical user interfaces are not supported here. If you want to get support, it needs to be through the git CLI. Reasons: 1) Because very few people here use the graphical interface. 2) Because giving instructions for GUI's is difficult. 3) The command line gives you a history of what commands you have executed.	11:27
	← madduck_ left	11:27
	→ madduck joined	11:28
	← bmcorser left	11:28
	← mattstratton left	11:29
lb1a	shebbi, i recommend clicking through the !trygit tutorial. you'll notice that you basically need only a few commands to start with git	11:29
gitinfo	shebbi: A quick, interactive, in-browser introduction to git is available at http://try.github.io	11:29
shebbi	Sure	11:29
lb1a	shebbi, and you will improve while using it IRL	11:29
shebbi	I used git bash 3 years ago and forget practically everything	11:29
	I want to use a GUI this time	11:30
	anyway, I initialised a repos by right clicking on www	11:30
esc	are rebase --onto and cherry-picking a range always equivalent?	11:31
	→ kopparam joined	11:31
	→ mattstratton joined	11:31
lb1a	esc, well, not always depending on your range..... but they are very similar	11:31
esc	i guess rebase onto could preserve merges too?	11:32
	→ alexh_ joined	11:32
esc	lb1a: are there corner cases you could imagein?	11:32
lb1a	esc, if you specify it to do so yes, its not the default	11:32
esc	yes, I am aware of that	11:33
lb1a	merges would be such a case	11:33
	but there are more pro users of git here that maybe know more about it. i for myself prefer to use rebase -i instead of manually picking ranges	11:34
	← mattstratton left	11:34
	→ clauswit_ joined	11:34
	← hgl left	11:34
CareBear\	esc : ask specific questions instead - difficult to answer so open ended questions	11:35
	→ mattstratton joined	11:36
	← Gizburdt left	11:36
	→ paulweb515 joined	11:36
	→ solker joined	11:38
	→ User458764 joined	11:39
	← jargon left	11:39
	Vampire0_ → Vampire0	11:40
	← mattstratton left	11:40
	← D4v33__ left	11:40
Vampire0	esc, rebase --onto and cherry-picking are two totally different things	11:40
	esc, rebase moves commits, cherry-picking copies commits	11:40
	← GDG612 left	11:41
Vampire0	esc, merges I think both will not handle very good. At least with rebase afair it will flatten the merge, bringing in the changes, but not having a merge commit as a result	11:41
esc	but they can have the very same effect on the DAG, right?	11:41
	→ mattstratton joined	11:41
	← Caius left	11:42
	← dw left	11:42
	← coasterz left	11:42
	← fishey2 left	11:42
	← idoru left	11:42
	← spaceone left	11:42
	← solker left	11:43
	← madduck left	11:43
Vampire0	esc, no, one copies commits, one moves commits	11:44
	→ madduck joined	11:44
	← mattstratton left	11:44
Vampire0	With rebase you have the same amount of commits before and after, with cherry-pick you have the amount you cherry-picked added	11:44
	← checkItOut left	11:44
	← intellix left	11:44
esc	but if the branch I am rebasing on already contains a commit that I have cherry-picked from the branch I am rebasing that commit will be discarded	11:46
	→ EminenceHC joined	11:46
	→ mattstratton joined	11:46
esc	I can see what you mean by move vs. copy	11:47
	← michael_mbp left	11:48
	← mattstratton left	11:48
	→ michael_mbp joined	11:49
	← EminenceHC left	11:50
	→ Naeblis joined	11:51
Naeblis	How could I move the latest commit I did from one branch to another?	11:51
	← DrSkyLizard left	11:51
	→ mattstratton joined	11:51
esc	Naeblis: cherry-pick is an option	11:52
	checkout the branch you want to move it to	11:52
	git cherry-pick <original-branch>	11:52
	and then reset the branch, if you want to get rid of the commit	11:52
	← pwnz7777 left	11:53
	← madduck left	11:54
	→ madduck joined	11:55
Naeblis	thanks	11:55
	← mattstratton left	11:55
	← bvi left	11:55
	→ Gizburdt joined	11:55
UmbraMalison	Hi, i have a repo which forks from another. there is a patch in the other repo that i'd like to cherry pick. i set my local repo to add the other repo as a remote, but when i cherry pick despite the SHA it tries to commit the latest commit, not the one i want. confused	11:55
	→ str joined	11:56
madduck	UmbraMalison: you might need to provide more info e.g. a typescript using a paste bot	11:56
UmbraMalison	madduck, no problem. what do you mean by a typescript?	11:57
	→ mattstratton joined	11:57
madduck	UmbraMalison: a "screenshot" of your command line using e.g. http://paste.debian.net/ to show us	11:57
UmbraMalison	np. 2 mins	11:58
	← Naeblis left	11:58
	← mattstratton left	11:59
	← stamina left	11:59
UmbraMalison	madduck, sorry whilst going through the steps slowly, i realised my mistake. I assumed from somewhere i need to tell cherry-pick which branch to use... this is not the case. sorry for the noise, problem solved.	12:00
madduck	cool	12:00
	→ mattstratton joined	12:01
	→ Reskp_ joined	12:02
	→ williangliao joined	12:02
	← williangliao left	12:02
Vampire0	esc iirc it will be empty as the changes are already there and by default left out, yes.	12:02
	← arup_r_ left	12:02
Vampire0	esc, and I find it interesting that you advise to use cherry-pick for moving a commit, while I just explained that it copies and not moves. A simple rebase would have moved the commit :-)	12:03
	→ williangliao joined	12:03
	→ intellix joined	12:03
	← chrisgeorge left	12:03
	← mattstratton left	12:03
	← williangliao left	12:04
	← Reskp left	12:04
	← moritzs left	12:04
	← martinklepsch left	12:04
	→ williangliao joined	12:04
Vampire0	UmbraMalison, just remember the mantra "a commit is NOT part of any particular branch"	12:04
	:-)	12:04
esc	Vampire0: how would you have done the request with rebase?	12:04
	← williangliao left	12:05
	→ mattstratton joined	12:06
Vampire0	Well, many roads lead to rome. :-)	12:06
UmbraMalison	Vampire0: i do find the concepts alien at present. I need my employer to fork out for a course so that someone can shout at me till i get it.	12:06
	← sonOfRa left	12:06
	← BtbN left	12:06
Vampire0	esc Well, actually maybe your solution was even better if I think about it, as the rebase would have moved the branch along.	12:06
	esc, forget what I said. :-D	12:06
	UmbraMalison, well, it is dead simple. A commit has one or more parents and the commits build a tree without loops (DAG = directed acyclic graph)	12:08
	UmbraMalison, a tag or a branch are just Post-ITs you stick to a commit	12:08
esc	Vampire0: you could create a branch, to-rebase, then do rebase --onto target to-rebase^ to-rebase and then fast-forward the target to to-rebase, finally delete to-rebase	12:08
	← mattstratton left	12:08
	← nettoweb left	12:08
Vampire0	UmbraMalison, you can move around these post-its as you like	12:08
esc	one could also go via format-patch	12:08
	→ amikiri joined	12:08
esc	or reset --soft HEAD ^ and then use stash	12:09
Vampire0	UmbraMalison, the difference between tag and branch is just that if you are "on" a branch, its post-it will move along if you create a new commit	12:09
	→ groolot joined	12:09
esc	yeah, reset --sort HEAD^ && stash && checkout target && stash pop && commit	12:09
	although in that case you lose the commit-message	12:09
Vampire0	esc, well, as I said, many roads lead to rome with git :-)	12:09
	→ BtbN joined	12:10
esc	always! :)	12:10
Vampire0	actually you would not even need the stash I think	12:10
esc	depends on the diff of the commit	12:10
Vampire0	except if there are conflicts	12:10
esc	yeah, exactly	12:10
	→ mattstratton joined	12:10
	← danjordan left	12:11
Vampire0	UmbraMalison, maybe !bottomup or !book can help you gather some understanding	12:11
gitinfo	UmbraMalison: 'Git from the bottom up' starts with explaining the building blocks of git and proceeds to tell you how they fit together. http://ftp.newartisans.com/pub/git.from.bottom.up.pdf (http://ikke.info/git.from.bottom.up.pdf)	12:11
	UmbraMalison: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable	12:11
esc	!gitbuch	12:11
gitinfo	[!gitbu.ch] Das deutsche Git-Buch: http://gitbu.ch -- anders als von Pro Git (http://git-scm.com/book) gibt es davon keine kostenlose Online-Ausgabe.	12:11
	← Derega left	12:11
esc	so that one still exists, huh	12:11
	→ sav__ joined	12:11
	→ danjordan joined	12:11
	→ sonOfRa joined	12:12
	→ palcu joined	12:12
	← mattstratton left	12:12
	→ Derega joined	12:12
	→ mattstratton joined	12:13
	→ palcu_ joined	12:13
	← intellix left	12:15
	← sophiejjj left	12:15
	→ darkbasic_ joined	12:17
	← palcu left	12:17
	← mattstratton left	12:17
	← melter left	12:17
	← darkbasic left	12:17
	← marthinal left	12:18
	→ mellernoia joined	12:18
	→ mattstratton joined	12:19
	← ciampix left	12:20
	→ arup_r joined	12:20
	→ bvi joined	12:22
	← mattstratton left	12:22
	→ m0ltar joined	12:22
	→ EminenceHC joined	12:22
	← ap0c left	12:23
	→ sebbu joined	12:24
	← sebbu2 left	12:24
	← sebbu left	12:24
	→ sebbu joined	12:24
	→ mattstratton joined	12:24
	→ mizu_no_oto joined	12:24
	← vtunka left	12:26
	→ bvi_ joined	12:26
	← mattstratton left	12:26
	← bvi left	12:27
	← EminenceHC left	12:27
	← leopardb_ left	12:28
	→ mattstratton joined	12:29
	→ Caius joined	12:30
	→ dw joined	12:30
	→ coasterz joined	12:30
	→ fishey2 joined	12:30
	→ idoru joined	12:30
	→ spaceone joined	12:30
	← Caius left	12:30
	→ Caius joined	12:30
	→ melter joined	12:30
	← vpl left	12:31
	→ vpl joined	12:31
	← ghostlines left	12:32
	← mattstratton left	12:32
	→ mattstratton joined	12:34
	← govg left	12:35
	→ govg joined	12:36
	← mattstratton left	12:37
	← amikiri left	12:38
	→ mattstratton joined	12:39
	← mellernoia left	12:39
	→ solker joined	12:39
	→ marthinal joined	12:39
	← endiruna left	12:40
	← mattstratton left	12:41
	→ dangerousdave joined	12:42
	→ LucasKA joined	12:42
	← s8321414 left	12:44
	← solker left	12:44
	→ Trudko joined	12:44
	→ mattstratton joined	12:44
	→ s8321414 joined	12:44
	← Rixius left	12:45
	← netcarver left	12:45
	← mattstratton left	12:47
	← LucasKA left	12:47
	← tirengarfio left	12:47
	→ Rixius joined	12:47
	→ amikiri joined	12:48
	→ mattstratton joined	12:49
	→ Nizumzen joined	12:51
	← User458764 left	12:51
	→ lsiv568 joined	12:52
	← mattstratton left	12:52
	← Gitzilla left	12:52
	← Gizburdt left	12:54
	→ mattstratton joined	12:55
	← amikiri left	12:56
	→ martinklepsch joined	12:56
	← howitdo left	12:56
	← mattstratton left	12:57
	→ cannonball joined	12:57
	→ fairuz joined	12:57
	← Rixius left	12:58
	→ Malsasa_ joined	12:58
	→ zumba_addict joined	12:58
	← Malsasa left	12:59
UmbraMalison	Vampire0: thanks, sending to the printer...	13:00
	← fstd left	13:00
	→ mattstratton joined	13:00
	→ fstd joined	13:00
	→ Rixius joined	13:01
	← martinklepsch left	13:01
	→ bollullera joined	13:01
	→ martinklepsch joined	13:02
	← mattstratton left	13:03
	← ajithps left	13:04
	← rchavik left	13:04
	→ CKyle joined	13:05
	→ mattstratton joined	13:05
	← zumba_addict left	13:05
	→ cbr__ joined	13:05
	→ hcc23 joined	13:06
	→ intellix joined	13:06
	→ colorbot joined	13:06
	→ endiruna joined	13:06
	← colorbot left	13:06
	→ shinnya joined	13:07
	← b1nar1_ left	13:07
	← cbr left	13:08
	cbr__ → cbr	13:08
	→ mellernoia joined	13:08
	← mattstratton left	13:08
	→ thibaultcha joined	13:09
	→ pandeiro joined	13:09
	← smw left	13:10
	→ mattstratton joined	13:10
	→ howitdo joined	13:11
	→ robban joined	13:11
	→ shigosei joined	13:14
	→ encod3 joined	13:14
	← liamkeily left	13:14
	← thibaultcha left	13:14
	→ mattstra_ joined	13:14
	← mattstratton left	13:15
	→ vtunka joined	13:15
	→ tmcmahon joined	13:15
	→ lindenle joined	13:16
	→ petersr joined	13:17
	← petersr left	13:17
	← mattstra_ left	13:18
	← nikita left	13:18
	← mellernoia left	13:19
	→ mattstratton joined	13:19
	← jceb left	13:19
	← lindenle left	13:20
	← bvi_ left	13:20
	→ mellernoia joined	13:21
	→ nikita joined	13:21
	← Rixius left	13:21
	← mattstratton left	13:21
	→ sebhoss joined	13:22
	→ mattstratton joined	13:23
	← cagedwisdom left	13:23
	← mellernoia left	13:23
	→ RaceCondition joined	13:23
	→ Rixius joined	13:24
	← ManikM left	13:25
	→ mellernoia joined	13:25
	→ Manny joined	13:25
	← mattstratton left	13:26
	→ livingstn joined	13:27
	→ mattstratton joined	13:28
	→ astrofog joined	13:28
	← livingstn left	13:30
	→ livingstn joined	13:30
	← livingstn left	13:30
	→ tokik joined	13:30
	→ EminenceHC joined	13:30
	← Tuna-Fish left	13:31
	→ fstd_ joined	13:31
	→ livingstn joined	13:31
	→ liamkeily joined	13:31
	← Reskp_ left	13:31
	← cbr left	13:31
	→ cbr joined	13:32
	← mattstratton left	13:32
	→ bvi_ joined	13:32
	→ listochkin joined	13:32
	→ Reskp joined	13:32
	← MalteJ left	13:32
	← fstd left	13:32
	fstd_ → fstd	13:32
	→ mattstratton joined	13:33
	← kdlv left	13:34
	→ jceb joined	13:34
	→ lpax joined	13:34
	← Internet13 left	13:34
	← mattstratton left	13:35
	← EminenceHC left	13:35
	← mellernoia left	13:35
	→ kdlv joined	13:36
	→ khisanth_ joined	13:37
	→ daggs1 joined	13:37
	→ mellernoia joined	13:37
	→ Internet13 joined	13:38
	← latenite left	13:38
daggs1	greetings, is there a standard way to sync changes from a specific remote branch into another remote repo?	13:38
	→ mattstratton joined	13:38
Vampire0	daggs1, define "sync"	13:38
tobiasvl	daggs1: !sync ?	13:38
gitinfo	daggs1: [!fork_sync] You can read a nice guide on how to update your fork with the upstream repository here: https://help.github.com/articles/syncing-a-fork	13:38
	← mellernoia left	13:39
daggs1	cool! thanks :)	13:39
	← Khisanth left	13:40
	→ solker joined	13:40
	→ mellernoia joined	13:40
	→ Tuna-Fish joined	13:42
	← alexh_ left	13:42
	← mattstratton left	13:42
	← harish left	13:43
	→ mattstratton joined	13:44
	← solker left	13:45
	← daniell left	13:45
	→ dfas joined	13:46
	→ harish joined	13:46
	← mizu_no_oto left	13:46
	→ knownasilya joined	13:46
	→ b1nar1 joined	13:47
	← nnyk_ left	13:47
	← mattstratton left	13:47
	← arup_r left	13:47
	← beautifulmind left	13:48
	← bvi_ left	13:48
	robustus → robustus\|Off	13:49
	← govg left	13:49
	→ KevinMGranger joined	13:49
	← dsdeiz left	13:50
	→ mattstratton joined	13:50
	robustus\|Off → robustus	13:50
	→ govg joined	13:50
	← kopparam left	13:51
	← Malsasa_ left	13:51
	← darkbasic_ left	13:52
	← shebbi left	13:52
	← mattstratton left	13:53
	→ darkbasic joined	13:54
	← palcu_ left	13:54
	→ Gizburdt joined	13:54
	→ Patch joined	13:55
	→ tier joined	13:56
	← CKyle left	13:56
	→ zumba_addict joined	13:56
	← vtunka left	13:56
	→ mattstratton joined	13:56
	→ hyperair joined	13:57
	← daggs1 left	13:57
	← ORiON-- left	13:57
	→ daggs-work joined	13:57
	→ dmiles_afk joined	13:58
	→ ORiON-- joined	13:58
	← mattstratton left	13:58
	← Guest44325 left	13:58
dmiles_afk	git submodules keep something like a "fork" in the main .git pointing ad the submodule?	13:58
tobiasvl	fork? no…	13:58
	← hcc23 left	13:59
	← zumba_addict left	13:59
dmiles_afk	well why i ask is this...	13:59
	→ zumba_ad_ joined	13:59
	← govg left	13:59
	← Gizburdt left	13:59
	← Segfault_ left	13:59
	→ nnyk_ joined	14:00
	→ govg joined	14:00
	← dcpc007 left	14:00
dmiles_afk	i am going to be changing things from someone elses repostiory that i dont have write access to.. so i can fork it on github then i can submodule it into a tree that i am using	14:00
	i was wondering if that fork on github isnt that usefull	14:00
	← ThomasLocke left	14:00
	→ dcpc007 joined	14:01
	← nemesit\|znc left	14:01
	← blueyed left	14:01
	← Ratler left	14:01
	← JelmerD left	14:01
	← endiruna left	14:01
	← crane left	14:01
	← rjc left	14:01
	← chernjie left	14:01
	← PaulePanter left	14:01
	← heroux left	14:01
	← rudi_s left	14:01
	← encod3 left	14:01
	→ mattstratton joined	14:01
	← MattMaker left	14:02
dmiles_afk	since from what i can tell is unpushed changes to the fork would be staged in the repo declaring the submodule	14:02
	← _Vi left	14:02
	← scorphus left	14:02
	← falstaff left	14:02
	← tokkee left	14:02
	← mellernoia left	14:02
	← JohnBat26 left	14:02
	← JanC left	14:02
	← gniourf left	14:02
	→ MattMaker joined	14:02
	← mitzip_ left	14:02
	→ falstaff joined	14:02
	← akheron left	14:02
	→ d10n-work joined	14:02
offby1	if anyone cares -- the GNU Emacs project is said to be transitioning to git as we speak ... said to be one of the hairiest conversions-to-git ever (from bzr)	14:03
	→ endiruna joined	14:03
	→ akheron joined	14:03
	→ JohnBat26 joined	14:03
	→ PaulePanter joined	14:03
	→ chernjie joined	14:03
	→ ThomasLocke joined	14:03
	→ rudi_s joined	14:03
	→ heroux joined	14:03
	→ tokkee joined	14:03
	→ encod3 joined	14:03
	→ rjc joined	14:03
	← darkbasic left	14:04
	→ JelmerD joined	14:04
	→ nemesit\|znc joined	14:04
	→ Mitchbones joined	14:04
	→ mellernoia joined	14:04
	→ enitiz joined	14:04
	→ blueyed joined	14:04
	→ darkbasic joined	14:04
dmiles_afk	ok i see .. i do need this stopgap fork	14:04
	← Rixius left	14:04
	→ Ratler joined	14:04
	→ gniourf joined	14:04
	← Ratler left	14:05
	→ Ratler joined	14:05
	→ _Vi joined	14:05
	→ crane joined	14:05
	← mattstratton left	14:05
moritz	offby1: how does one measure hairiness of migrations? WTFs per minute?	14:05
offby1	moritz: sounds about right	14:05
	→ JanC joined	14:05
	→ Rixius joined	14:06
	→ crose joined	14:07
	→ mattstratton joined	14:07
dmiles_afk	sorry one more newbiesh question.. if i fork someone else repository and they delete it later.. am i going to continue to operate?	14:08
luto	yes	14:08
	← tchan left	14:08
	→ zivester joined	14:08
	← blarghlarghl left	14:09
	← zumba_ad_ left	14:09
	← jceb left	14:09
	→ dsdeiz joined	14:10
	← mattstratton left	14:10
dmiles_afk	at.. https://github.com/TeamSPoon/logicmoo/tree/master/src_modules i am pointing to a submodule called swish.. if is a forked repostiory	14:11
	→ thibaultcha joined	14:11
	→ mylord joined	14:11
	→ mattstratton joined	14:11
	← dtrott left	14:12
mylord	I can’t seem to pull latest on a branch from my server	14:12
dmiles_afk	it is a forked repostiory.. they just updated .. can i from 'logicmoo' call teh commands in 'swish' to catch up to what it's forked?	14:12
mylord	From client, I pushed branch and I see it in bitbucket	14:12
tobiasvl	dmiles_afk: !sync ?	14:12
gitinfo	dmiles_afk: [!fork_sync] You can read a nice guide on how to update your fork with the upstream repository here: https://help.github.com/articles/syncing-a-fork	14:12
	→ zumba_addict joined	14:12
mylord	but on my server, what should I do to pull it? git check merge-android; git pull origin merge-android ?	14:12
	← _Vi left	14:13
	← Junior left	14:13
	← Rixius left	14:13
	→ ehmatthes joined	14:13
	→ palcu_ joined	14:14
dmiles_afk	tobiasvl: thanks .. i am guessing the sanest think is to on my disk have two checkouts of my submodule.. one playing :"submodule" and the other a clone of the fork	14:14
	→ MarkyC joined	14:14
	← zumba_addict left	14:14
	← listochkin left	14:14
	← mattstratton left	14:14
	→ zumba_addict joined	14:14
dmiles_afk	clone of the fork , i sync	14:15
	← zumba_addict left	14:15
dmiles_afk	submodule pointing to fork , i consume	14:15
	→ zumba_ad_ joined	14:15
	← shinnya left	14:15
	← tmcmahon left	14:15
MarkyC	Can someone explain how to remove a file from a pull request?	14:15
	(it's already in the branch, but I don't want a pull request's changes to that file to be commited	14:15
	← thibaultcha left	14:15
dmiles_afk	slightly i guess i whished submodules had their very own first class .fgit dir	14:16
	← mitzip left	14:16
	← nnyk_ left	14:16
dmiles_afk	slightly i guess i wish submodules had their very own first class .git dir rather than a text file with a link ;P then i'd be less confused	14:17
	→ mattstratton joined	14:17
tobiasvl	MarkyC: this sounds like something for #github, but afaik you can't. a github pull request is tied to a branch	14:17
	→ nnyk_ joined	14:17
MarkyC	tobiasvl: I'm on BitBucket, so I'll ask there	14:18
	← zumba_ad_ left	14:18
	→ zumba_addict joined	14:18
	→ mitzip joined	14:19
MarkyC	tobiasvl: what would happen if they git rm thefile in their branch?	14:19
	→ buffal0 joined	14:19
	→ Rixius joined	14:19
	← mattstratton left	14:20
	← tier left	14:20
	→ moritzs joined	14:20
	→ checkItOut joined	14:22
	→ javster joined	14:22
	← subhojit777 left	14:23
	→ mattstratton joined	14:23
	→ jceb joined	14:23
	→ tchan joined	14:23
	← dc5ala left	14:24
	← Rixius left	14:24
	→ tier joined	14:25
	← zumba_addict left	14:25
	→ Takle joined	14:25
	← dangerousdave left	14:25
	→ blarghlarghl joined	14:25
	snuffeluffegus → pizza	14:26
	pizza → snuffeluffegus	14:26
	→ zumba_addict joined	14:26
	← lsiv568 left	14:26
	→ Alpha-17 joined	14:26
	→ Noldorin joined	14:26
	← mellernoia left	14:27
	← mattstratton left	14:27
	← Alpha-17 left	14:27
	→ iamjarvo joined	14:27
	← checkItOut left	14:27
	→ mattstratton joined	14:28
	→ mellernoia joined	14:29
	← s8321414 left	14:29
	→ tmcmahon joined	14:29
	→ mribeirodantas joined	14:29
	→ lsiv568 joined	14:29
	→ Rixius joined	14:29
	→ LeMike joined	14:30
	→ cagedwisdom joined	14:30
	← nnyk_ left	14:30
	→ solker joined	14:31
	← mattstratton left	14:32
	← tmcmahon left	14:32
	→ chrisgeorge joined	14:32
	→ tesaf joined	14:33
	← Reskp left	14:33
	→ mattstratton joined	14:34
	← settermjd left	14:35
	→ sohail` joined	14:35
	→ listochkin joined	14:35
	→ Gizburdt joined	14:35
	→ EminenceHC joined	14:35
	→ DigitallyBorn joined	14:35
	← dsdeiz left	14:35
	← mattstratton left	14:37
	→ dsdeiz joined	14:37
	← DigitallyBorn left	14:38
	← frdmn left	14:39
	→ frdmn joined	14:39
	→ Junior joined	14:39
	→ shawndumas joined	14:40
	← asakura1 left	14:40
	← EminenceHC left	14:40
	→ mattstratton joined	14:41
	→ diegoviola joined	14:41
	← moritzs left	14:42
	← listochkin left	14:42
	→ smccarthy joined	14:43
	← zumba_addict left	14:43
	→ jerius joined	14:44
	← iamjarvo left	14:45
	→ AaronMT joined	14:45
	← mattstratton left	14:45
	→ dangerousdave joined	14:45
	← dangerousdave left	14:46
	→ nnyk_ joined	14:46
	→ zso joined	14:46
	→ moritzs joined	14:47
	← zso left	14:47
	→ mattstratton joined	14:47
	→ User458764 joined	14:48
	→ listochkin joined	14:49
	→ Gamecubic joined	14:50
	← listochkin left	14:51
	← m0ltar left	14:51
	→ listochkin joined	14:52
	← mattstratton left	14:52
	← Gizburdt left	14:52
	→ Neozonz joined	14:52
	→ mattstratton joined	14:53
	← bollullera left	14:53
	→ jargon joined	14:53
	→ pmallya joined	14:54
	→ koderok joined	14:54
	← Takle left	14:54
	← Marcus___ left	14:55
	→ Takle joined	14:55
	→ Gizburdt joined	14:55
	→ asakura1 joined	14:56
	← mattstratton left	14:56
	→ mattstratton joined	14:56
	← dsdeiz left	14:56
	← dw left	14:57
	← listochkin left	14:57
	← moritzs left	14:57
	→ Reskp joined	14:58
	← Manny left	14:58
	→ ManikM joined	14:58
	→ Marcus___ joined	15:00
	→ _Vi joined	15:00
	← crose left	15:01
	→ Spacew00t joined	15:01
	→ MrSavage joined	15:01
	→ dangerousdave joined	15:01
	← Rixius left	15:01
	← str left	15:02
	→ bollullera joined	15:02
	← JohnBat26 left	15:02
	→ JohnBat26 joined	15:02
	← bollullera left	15:02
	← hightower4 left	15:02
	← mattstratton left	15:03
	← ar45 left	15:03
	→ iamjarvo joined	15:03
	← palcu_ left	15:03
	→ dreiss joined	15:03
	→ creppe joined	15:03
	→ bollullera joined	15:04
	← bollullera left	15:04
	← mellernoia left	15:05
	← kermit left	15:05
	→ Rixius joined	15:05
	→ kermit joined	15:06
	← Neozonz left	15:06
	→ bollullera joined	15:06
	← bollullera left	15:07
	→ dw joined	15:07
	→ mellernoia joined	15:07
	→ DrSkyLizard joined	15:08
	→ mattstratton joined	15:08
	→ bollullera joined	15:08
	→ AR45\|ALT joined	15:09
	← zivester left	15:09
	← bollullera left	15:09
	→ mkaesz joined	15:09
	← ilhami left	15:09
	← facundor left	15:10
	→ chrisgeo joined	15:10
	→ bollullera joined	15:11
	→ hcc23 joined	15:11
	← moparisthebest left	15:11
	→ thibaultcha joined	15:11
	← bollullera left	15:12
	→ Emugel joined	15:12
	→ bollullera joined	15:13
	→ zumba_addict joined	15:13
	← BombStrike left	15:13
	← weyer left	15:13
	← bollullera left	15:13
Emugel	hi, what is the best way to handle local configuration files which content is different on different repository? is there a better option than to just add them to the ignore list?	15:13
	← Reskp left	15:13
	← cagedwisdom left	15:13
	← mattstratton left	15:14
	→ BombStrike joined	15:14
	→ bollullera joined	15:14
jast	!configfiles	15:14
gitinfo	It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas	15:14
	← rath left	15:15
	← bollullera left	15:15
	→ bvi_ joined	15:15
	→ deuterium joined	15:15
Emugel	wow there's a faq for this :) thanks jast.	15:15
	→ weyer joined	15:15
canton7	it's one of the oldest triggers iirc?	15:15
	← AR45\|ALT left	15:16
	→ clauswitt joined	15:16
	→ facundor joined	15:16
	← thibaultcha left	15:16
jast	it's been around a long time, that's for sure	15:16
	→ BlaXpirit joined	15:16
	→ fr33domlover joined	15:16
	→ mattstratton joined	15:17
	→ bollullera joined	15:17
	← javster left	15:17
	robustus → robustus\|Off	15:17
deuterium	does anybody know an easy way to deploy a git server on debian, preferably including a github-like web interface etc.?	15:17
	→ javster joined	15:17
osse	deuterium: install gitlab or gitorious	15:18
	→ AR45 joined	15:18
	AR45 → Guest15231	15:18
qsuscs	github enterprise? :D	15:18
deuterium	osse: cool, will look into these, thanks!	15:18
qsuscs	(it costs a whole lot of money.)	15:18
	← mattstratton left	15:19
	← DrSkyLizard left	15:19
	→ kopparam joined	15:19
	← kopparam left	15:19
deuterium	qsuscs: didn't even know this exists ;)	15:19
	← clauswit_ left	15:19
cbreak	if you have to ask how much it costs you can't afford it.	15:19
deuterium	qsuscs: "whole lot of money" doesn't sound too inviting though ;)	15:19
	cbreak: guess we can't then	15:19
jast	PSA: http://jk.gs/git/bot/trigger_recent.php now shows all changes ever, ordered chronologically	15:20
	→ mattstratton joined	15:20
qsuscs	deuterium: https://enterprise.github.com/features#pricing	15:20
	← clauswitt left	15:20
	→ bvi__ joined	15:20
qsuscs	it surely looks nice, but yes, not cheap.	15:20
	→ polyzen joined	15:20
	← facundor left	15:20
goTAN	hm I want to setup 2 git project which share some parts, is there a way to somehow "connect" them?	15:20
jast	as you can see, 'configfiles' was added four days after the very first triggers	15:20
	← bvi_ left	15:21
qsuscs	goTAN: !subrepo	15:22
gitinfo	goTAN: [!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding.	15:22
	← Guest15231 left	15:22
	← javster left	15:22
qsuscs	goTAN: that is, make something a library/module/$fancy_hipster_programming_language_term and add it e.g. as submodule	15:22
	→ mizu_no_oto joined	15:23
	→ AR45\|ALT joined	15:23
	← mattstratton left	15:23
	→ tranzfuse joined	15:23
	→ moparisthebest joined	15:24
	→ Amandil joined	15:24
	→ mattstratton joined	15:25
	← bvi__ left	15:25
	← Trudko left	15:25
osse	beanapifactory	15:26
	← govg left	15:26
	→ MalteJ joined	15:26
goTAN	hmm	15:26
	qsuscs: basically the first project is a game and the second project is a level editor for that game	15:27
	→ govg joined	15:27
goTAN	so which one would you choose	15:27
	← mattstratton left	15:28
goTAN	so I would tend to the first approach	15:29
	→ m0ltar joined	15:29
	→ nyuszika7h joined	15:30
nyuszika7h	I don't seem to have p4merge in my locally compiled git installation, how can I get it?	15:30
	→ LBV_User joined	15:31
deuterium	qsuscs: it's above our budget indeed	15:31
	← Takle left	15:31
	→ mattstratton joined	15:31
	→ MLM joined	15:32
osse	nyuszika7h: it's not part of git	15:32
	nyuszika7h: http://www.perforce.com/downloads/Perforce/20-User?qt-perforce_downloads_step_3=1#product-10	15:32
nyuszika7h	ah	15:32
	oh it uses Xorg, I can't run that on my server then >_>	15:32
	→ Jackneill joined	15:33
osse	the only CLI tools I know of are vim, emacs and not using any at all.	15:33
nyuszika7h	I know vim but the vimdiff window git mergetool opened is just too confusing	15:34
	← AR45\|ALT left	15:34
	← mattstratton left	15:35
	→ settermjd joined	15:35
	→ Wiseboy joined	15:35
	→ AR45- joined	15:35
	← Junior left	15:35
	→ mattstratton joined	15:35
	→ subhojit777 joined	15:35
	→ listochkin joined	15:36
	→ bvi__ joined	15:37
	← jottr left	15:38
	← Spacew00t left	15:38
	← mattstratton left	15:39
	→ mattstratton joined	15:39
	→ eletuchy joined	15:39
	→ jottr joined	15:39
	← cannonball left	15:40
	← LeMike left	15:40
	→ Spacew00t joined	15:40
	→ cannonball joined	15:40
	→ EminenceHC joined	15:41
	← mattstratton left	15:41
	→ palcu joined	15:42
	← Emugel left	15:42
	← psoo left	15:43
	← ecky--ptang-zoob left	15:43
	→ ecky--ptang-zoob joined	15:43
	→ danemacmillan joined	15:44
	→ nootan joined	15:44
	← lb1a left	15:44
	→ icio_ joined	15:45
	← EminenceHC left	15:45
	← tvw left	15:45
nootan	Hello Guys. Is this the right place to ask how does git manage to know the changes that happens in the folder since the last commit?	15:45
	→ mattstratton joined	15:46
	→ Ankhers joined	15:47
	→ Takle joined	15:47
	← dangerousdave left	15:47
	← icio_ left	15:47
	→ blubberbop joined	15:47
nootan	<repeat> Hello Guys. Is this the right place to ask how does git manage to know the changes that happens in the folder since the last commit?	15:48
	← solker left	15:48
canton7	try asking your question. it's not clear what you're going to ask	15:48
	← kermit left	15:49
	← icio left	15:50
	→ freimatz joined	15:50
	→ kermit joined	15:50
jast	well it compares the files to what it's got remembered... and it skips files if it's fairly certain there's been no change	15:50
	I believe this works by caching inode numbers in the index file or something like that	15:51
	← mattstratton left	15:51
	→ mattstratton joined	15:51
	→ jcalonso joined	15:51
nootan	jast, does this mean it should copy all the code so that it can use it as reference	15:52
	← groolot left	15:52
	→ thumpba joined	15:52
nootan	s/code/files/	15:52
canton7	no - as a final result it will compute the hash of the new file and compare it against its cached hash	15:52
	*final fallback	15:52
	*final measure	15:53
LBV_User	it probably prefilter the files it knows, then check for change in dates, than compute what it remembers to be the contents of those files, then compare it's contents	15:53
	→ vtunka joined	15:53
nootan	in order to generate diffs, it needs to compare the contents -- doesn't it imply that there's at least one exact copy of the uncommited files?	15:54
	AR45- → AR45	15:54
	← Gizburdt left	15:54
	→ b1nar1_ joined	15:54
canton7	when it does generate the diff, yes it will compare the file on disk to what's stored as part of the last commit, or stored in the index for staged files	15:54
	← m0ltar left	15:55
cbreak	nootan: the file in the working dir is that copy	15:55
	← palcu left	15:55
	← b1nar1 left	15:56
	← tokik left	15:56
	← mattstratton left	15:56
nootan	cbreak, i am a little confused	15:56
	← hs366 left	15:56
	→ mattstratton joined	15:57
	← mlechner left	15:57
nootan	the file in the working dir is unstaged copy?	15:57
	→ palcu_ joined	15:57
	→ thedodd joined	15:57
	→ tokik joined	15:58
	← mattstratton left	15:58
cbreak	yes.	15:58
	you change it.	15:58
Vampire0	nootan, the committed file contents are in .git/objects	15:58
	→ mattstratton joined	15:58
	← b1nar1_ left	15:59
	→ Gizburdt joined	15:59
	← jottr left	15:59
	→ b1nar1 joined	15:59
nootan	the .idx and .pacck files?	16:00
	← Noldorin left	16:00
nootan	Vampire0, ^^	16:00
	← Amandil left	16:00
jast	among other things	16:01
	→ CKyle joined	16:01
jast	at different points in time, objects can be stored in different ways	16:01
	← blubberbop left	16:01
cbreak	you don't have to worry about that usually	16:01
	→ blubberbop joined	16:01
	→ moritzs joined	16:02
nootan	i am actually in the situation of implementing something like that	16:02
	→ Not_Whatever joined	16:02
nootan	so, i was wondering if there's some standard algo for that	16:02
	← Raging_Hog left	16:02
	→ mihaicris joined	16:02
	→ Sasazuka joined	16:03
	→ palcu joined	16:03
cbreak	depends.	16:03
	← palcu_ left	16:03
cbreak	on OS X you'd use fsevents	16:03
	← mattstratton left	16:03
cbreak	git does it the dumb way	16:04
	← goTAN left	16:04
	← thedodd left	16:05
	→ Segfault_ joined	16:05
nootan	And i have to impement it on .net (win stuffs)	16:05
	← mennea left	16:05
nootan	I am using something called filesystemwatcher	16:06
	← mizu_no_oto left	16:06
nootan	which fires event on file change, but for that i need to run some kind of service everytime	16:06
	→ steele joined	16:06
	→ mattstratton joined	16:06
	← Gizburdt left	16:06
	← nour left	16:06
	← mkaesz left	16:07
	→ a_le joined	16:08
offby1	nootan: you have to explicitly run a service in order to get notified of file system changes? That's surprising	16:08
	→ imachuchu joined	16:08
	→ kukks joined	16:08
	← kukks left	16:08
	→ kukks joined	16:08
	← awkwardusername left	16:09
	← lsiv568 left	16:09
nootan	offby1, I am not sure if Windows does that, but my app still needs to catch the event. for which it should be running.	16:09
	← jargon left	16:09
nootan	If i had to do it in git way, then i would have probably stored a version, close my app, and then when i reopen it, it would then check for changed files and folders	16:10
cbreak	on OS X you can get changes since some point X in the past	16:10
	with fsevents	16:10
	→ basiclaser_ joined	16:10
	→ psoo joined	16:10
cbreak	this is neat for backup programs for example	16:10
nootan	Oh, maybe i should lookup if there's something similar	16:11
grawity	on Windows, NTFS has the USN journal, which some indexers use	16:11
	← tokik left	16:11
cbreak	nootan: worst case you just remember last changed time and size of every file you care about	16:11
grawity	it has a complete log and therefore needs privileges, though	16:12
	→ lindenle joined	16:12
nootan	cbreak, that's what i thought, :)	16:12
	← mattstratton left	16:12
	← knobo left	16:12
nootan	grawity, oh, do you know if there's some kind of .net component for that	16:12
	→ thibaultcha joined	16:13
	→ faylite joined	16:14
	→ Reskp joined	16:14
	→ devoldmx joined	16:15
	← seschwar left	16:15
jast	change journals still require that you have a service running ot catch all of their events	16:15
	simply because they don't persist all change events forever	16:15
	← rhombus left	16:15
	← lindenle left	16:16
	robustus\|Off → robustus	16:16
	→ mattstratton joined	16:16
	→ rhombus joined	16:16
nootan	Ah, looks like i will fall back to using FileSystemWatcher	16:17
	anyways, thanks guys.	16:17
	← nrsk left	16:17
grawity	jast: but for a limited time they do; it's an on-disk log	16:17
	← abec0_ left	16:17
	→ abec0 joined	16:17
	← thibaultcha left	16:18
nootan	it will need a service anyways, otherwise you cannot be sure that you were able to catch all the events?	16:18
	← ThomasLocke left	16:19
	← Reskp left	16:19
	→ mkaesz joined	16:19
	→ crose joined	16:20
	← CKyle left	16:21
	→ steele_ joined	16:21
jast	nootan: yeah, that was my point :)	16:21
	← mihaicris left	16:22
	→ ojacobson joined	16:22
	← sebhoss left	16:22
	← moparisthebest left	16:22
	→ pcypher joined	16:23
	→ pheaver joined	16:23
	← mattstratton left	16:23
	← puff left	16:24
	→ puff joined	16:24
	← Sasazuka left	16:24
	→ Reskp joined	16:24
	← steele left	16:24
	→ steele joined	16:25
	← steele_ left	16:25
	→ Sasazuka joined	16:25
	← Sasazuka left	16:25
	→ Sasazuka joined	16:25
	← nikita left	16:25
	← koderok left	16:25
	→ mattstratton joined	16:26
	→ Neozonz joined	16:26
	← Neozonz left	16:26
	→ Neozonz joined	16:26
	→ alanwill_ joined	16:26
	→ pmallya__ joined	16:26
	← diegoviola left	16:26
	→ moparisthebest joined	16:28
	→ nikita joined	16:28
	← pcypher left	16:28
	→ pcypher joined	16:28
	← darkbasic left	16:29
	← pmallya left	16:29
	← jagob left	16:29
	← nickBek left	16:30
	← danjordan left	16:30
	→ darkbasic joined	16:30
	← MrSavage left	16:30
	→ danjordan joined	16:31
	← Reskp left	16:31
	← pheaver left	16:31
	← tozhu left	16:31
	→ mattstra_ joined	16:32
	→ robertt_dex joined	16:33
	← mattstratton left	16:33
	← pcypher left	16:34
	← mattstra_ left	16:34
	← moritzs left	16:35
	→ jagob joined	16:35
	← dreiss left	16:35
	→ mattstratton joined	16:36
	← Sasazuka left	16:37
	← psoo left	16:37
	← ManikM left	16:37
	← Juzzika left	16:38
	← mattstratton left	16:38
	→ knobo joined	16:40
	→ oskarkv joined	16:40
	← crose left	16:41
	→ kpease joined	16:42
	← livingstn left	16:42
	→ jhwhite joined	16:42
	← b1nar1 left	16:42
	→ ManikM joined	16:42
	← wookienz left	16:42
	← jhwhite left	16:42
	← ManikM left	16:43
	→ koderok joined	16:43
	→ ManikM joined	16:43
	→ wookienz joined	16:43
	← Marcus___ left	16:44
	← enitiz left	16:44
dserodio	when using https por pushing, is is necessary to enter the password for every push, or is there an alternative?	16:44
	s/por/for/	16:44
nootan	dserodio, using ssh?	16:45
canton7	iirc you can use .netrc to save your credentials?	16:45
	or use one of the credentials helpers?	16:45
dserodio	nootan, yeah, our stupid InfoSec department wants to forbid the use of SSH for Git so I'm trying to list pros/cons of each solution	16:45
	← koderok left	16:46
	← CheckDavid left	16:47
	→ tirengarfio joined	16:47
milki	wow, whats wrong with ssh -.-	16:47
	→ brockfredin joined	16:47
Remram	If I "git push myremote branch1 branch2" and one of the ref fails (because it's not fast-forward for instance), do the following branches get pushed?	16:47
brockfredin	I'm having a problem with gitflow. Whenever I start a new branch, It's not loading all the project .cs files.	16:47
	Any tips?	16:47
	← cbr left	16:48
	→ EminenceHC joined	16:48
	→ mizu_no_oto joined	16:49
	→ herdingcat joined	16:49
	← FilipNortic left	16:49
kadoban	brockfredin: What command(s) are you running, and what changes? What do you mean by not loading the project files?	16:49
imachuchu	brockfredin: so a branch is just a pointer to a commit. When you create a new branch by default it points to your currently checked out commit, so which commit are you creating the branch from?	16:49
	← tier left	16:50
	→ tier joined	16:50
	← ehmatthes left	16:50
	→ kopparam joined	16:51
	→ nettoweb joined	16:51
brockfredin	kadoban imachuchu I'm running git flow init and or using source tree by default to run: git checkout -b branchName develop	16:52
	← jceb left	16:52
	→ dreiss joined	16:52
	← thumpba left	16:52
	→ jottr joined	16:52
kadoban	brockfredin: So then branchName is at whatever state that develop is.	16:53
	← EminenceHC left	16:53
Remram	ok it seems refs that can be updated get updated	16:53
	even if they come after failing refs on the command line	16:54
	(please tell me if I'm wrong)	16:54
	(it's important ;)	16:54
brockfredin	kadoban Kadoban You'd think but somehow the git flow is getting in the way. I then look at the state of my repository and I'm missing a project which is a dependency for my solution. I re-cloned my repo, did it with msysgit instead, and then it's not sucking down any of the libraries that are needed.	16:55
	← palcu left	16:56
	← kopparam left	16:56
	← kukks left	16:56
	→ Sasazuka joined	16:57
	← sohail` left	16:58
	← dreiss left	16:58
	→ joelm joined	16:58
	← Brain left	16:59
	→ jonmorehouse joined	17:00
kadoban	brockfredin: I'm just not clear on what you're expecting to happen that isn't. Is 'develop' at a state you expect? Because it should be before you branch off of it and expect /that/ to be usable	17:00
	→ palcu_ joined	17:01
	← Neozonz left	17:01
	← a_le left	17:01
	← Mitchbones left	17:02
	← bollullera left	17:03
	← TomyWork left	17:03
	→ scorphus joined	17:03
	← scorphus left	17:03
	→ scorphus joined	17:03
	→ jontmorehouse joined	17:04
	← jonmorehouse left	17:06
hfp	Hey all, is it bad to rewrite the public history if I am the only one using the repo?	17:06
milki	no it is not	17:08
	→ miffor`` joined	17:08
	→ RagnarDanneskjol joined	17:08
	← miffor`` left	17:08
	← iamjarvo left	17:08
milki	but if its public	17:08
	→ a_le joined	17:08
milki	how do you know you are the only one!?	17:08
	→ lindenle joined	17:09
hfp	milki: Because it's a repo I started yesterday and I'm 99% sure no one else cloned it	17:09
	→ lsiv568 joined	17:09
kadoban	On the same note, if you make the repo hostile to others, you probably soon will be the only one if you're not already.	17:09
	khisanth_ → Khisanth	17:10
	← brockfredin left	17:11
hfp	ok maybe I;m looking at this the wrong way. I made a temporary commit to a temp branch because I was switching computers and wasn't ready to make a full commit. I pushed that and pulled from that other computer. Then I did my commits on that temp branch and now I would like to remve the initial temp commit but retain all the other commits and apply them on master	17:11
	How can I fix it?	17:11
	→ kingsley-t joined	17:12
milki	hfp: try !fixup	17:12
gitinfo	hfp: So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!	17:12
kadoban	hfp: rebase -i it onto master, leaving out that commit. Alternatively, cherry-pick the rest.	17:12
hfp	if I cherry-pick the rest, I won't lose anything even if I skip the temp commit?	17:13
	→ thibaultcha joined	17:14
kadoban	You can have conflicts, but I'm not sure what else you mean you'd lose	17:14
	→ LucasKA joined	17:14
hfp	the initial temp commit that is a partial one and that I don't want to appear in master	17:15
	→ ascarter joined	17:15
	← hebz0rl left	17:16
	← lindenle left	17:16
	→ lindenle joined	17:16
	→ Thra11 joined	17:17
kadoban	hfp: Yeah, none of that will be in there. Did you fix up the commit in the next one or something? You can combine the two with rebase -i then, if that's what you want.	17:17
	→ CheckDavid joined	17:17
	← Not_Whatever left	17:17
hfp	kadoban: Well I made commits after that but I didn't touch the temp commit that had broken code in it. So if I rebase -i the temp commit and the one after they'll be fused together?	17:18
	→ leeN joined	17:18
	← thibaultcha left	17:19
kadoban	nfk: rebase -i is interactive rebase. It lets you rearrange, combine and overwise change commits however you like.	17:19
	← ascarter left	17:19
	← harish left	17:20
hfp	kadoban: The fact that I pushed one of the commits doesn't matter?	17:20
	→ m0viefreak joined	17:21
	← ome left	17:21
	→ thedodd joined	17:21
kadoban	hfp: All of the things I mentioned change history if that's what you're asking. Since you only pushed it into what I assume is some branch named "temp" though, it shouldn't matter much.	17:21
hfp	kadoban: Yes I pushed into a temp branch that I'll discard once the changes are integrated into master	17:22
	→ danemacm1 joined	17:22
	→ iamjarvo joined	17:22
	← mkoskar left	17:24
	← intellix left	17:24
	← danemacmillan left	17:24
	← vtunka left	17:25
	← jontmorehouse left	17:26
	robustus → robustus\|Off	17:26
	→ pcypher joined	17:26
	→ jonmorehouse joined	17:26
	→ EvilPenguin joined	17:26
	→ livingstn joined	17:27
	→ beneggett joined	17:27
nfk	kadoban, i haven't even used rebase ever, but okay...	17:27
	→ akushner_ joined	17:27
	robustus\|Off → robustus	17:27
	← joelm left	17:28
	→ koderok joined	17:28
	→ maestrojed joined	17:28
kadoban	nfk: Heh, sorry.	17:28
	← Takle left	17:30
	← jottr left	17:30
	→ desposo joined	17:31
	→ Takle joined	17:31
	robustus → robustus\|Off	17:31
	← hexagoxel left	17:32
	← Xethron left	17:32
	→ joelm joined	17:32
	→ Reskp joined	17:32
	→ javster joined	17:33
	← Reskp left	17:33
	← kerrick left	17:33
	← jcalonso left	17:34
	→ MrSavage joined	17:34
	→ Reskp joined	17:34
	← mikecmpbll left	17:34
	→ shoerain joined	17:34
	→ weyer_ joined	17:35
	← Takle left	17:35
	← martinklepsch left	17:36
	→ b1nar1 joined	17:36
	← weyer left	17:36
shoerain	How fancy should I get with rebasing/reworking history? I'm thinking of a way to tell if a pair of commits are independent of each other. Say I have a test suite, and I make commits [A,B,C] with different changes in each. I can just reorder the commits [A,C,B], and it should rebase fine (as well as run the tests fine).	17:36
	← nnyk_ left	17:37
shoerain	From what I can tell, just because I reorder commit B and C does not guarantee that it will rebase fine and run tests fine.	17:38
	← hahuang65 left	17:38
	→ CKyle joined	17:38
	← Reskp left	17:38
	→ pheaver joined	17:38
	← liamkeily left	17:39
	← achadwick left	17:39
kadoban	shoerain: You seem to have contradicted yourself there, so I'm not sure what you're asking. There's no guarantee that there won't be conflicts or that your tests will still pass.	17:39
	→ jceb joined	17:40
kadoban	shoerain: As to how fancy you should get...why do any of it? If you've already published/shared this stuff especially, leave it alone. Otherwise, do as much cleanup as you like, but yes you can easily screw up history worse than you started.	17:40
	→ fishey joined	17:41
	→ nrsk joined	17:41
	→ coasterz_ joined	17:41
	← bvi__ left	17:41
	← iamjarvo left	17:42
shoerain	kadoban: 1. haven't published it yet. 2. Don't think I contradicted myself. I was wondering if the second clause is true and if the first clause is possible (i.e. given 2 commits and a predicate for commutativity, are the commits commutative?)	17:43
	→ Pyrogerg joined	17:43
shoerain	Reordering commits seem to be a pretty delicate action	17:43
kadoban	It is	17:44
	→ dreiss joined	17:44
kadoban	The contradiction I mentioned is the last sentence of your first paragraph and then the next message after that seem to be exact opposites. Maybe I'm misreading/misunderstanding.	17:44
shoerain	and I end up committing a lot of half-functional unordered commits (cleanup, feature, cleanup, feature) that may be better pieced as (cleanup, cleanup, feature, feature)	17:44
	← freimatz left	17:45
kadoban	shoerain: Does it actually matter though? What's the harm in the way they're currently ordered?	17:45
	← coasterz left	17:45
	← fishey2 left	17:45
	← mnngfltg left	17:45
	→ iamjarvo joined	17:46
	← tg left	17:46
	→ iliketurtles joined	17:46
shoerain	ruminating thoughts. Creating a readable history is pretty darn useful	17:46
	→ pcypher_ joined	17:46
kadoban	shoerain: I mean if you really want to reorder, go ahead. It's not /that/ bad, but if you really want all of history to make sense, you can easily get conflicts you have to deal with and if you want to you should make sure your tests pass at every point...if you care about that anyway.	17:46
	← Arsonide left	17:47
	→ Arsonide joined	17:47
	← iliketurtles left	17:47
	← endiruna left	17:47
	→ Gizburdt joined	17:48
	sjmikem_ → sjmikem	17:48
	← dw left	17:48
	→ tg joined	17:49
	← pcypher left	17:50
	→ Ard0nik joined	17:50
	← knobo left	17:50
	← steele left	17:52
	→ steele joined	17:53
	← Ardonik left	17:53
	→ MattB2 joined	17:53
	→ pantsman- joined	17:53
	← subhojit777 left	17:53
	→ dw joined	17:53
	→ EminenceHC joined	17:54
	→ FSMaxB joined	17:54
	→ Ardonik joined	17:54
FSMaxB	Is there a way to write hooks for "git add"?	17:54
	← EvilPenguin left	17:55
	← Ard0nik left	17:55
	← listochkin left	17:55
	← ecky--ptang-zoob left	17:55
	→ ecky--ptang-zoob joined	17:56
	→ Reskp joined	17:57
	← sMa_ left	17:57
	→ Ard0nik joined	17:57
	← steele left	17:57
	→ kukks joined	17:58
	← kukks left	17:58
	→ kukks joined	17:58
	← EminenceHC left	17:59
	← Ardonik left	17:59
	→ tranzfus_ joined	17:59
	← herdingcat left	17:59
	→ nour joined	18:00
	← a_le left	18:00
	→ a_le joined	18:01
	← javster left	18:02
	← Reskp left	18:02
	→ herdingcat joined	18:02
	→ javster joined	18:02
	← tranzfuse left	18:03
	← nootan left	18:03
	← mellernoia left	18:03
	← lsiv568 left	18:03
	→ sdrfnord1 joined	18:04
	← pmallya__ left	18:05
	← ruukasu left	18:06
	→ ruukasu joined	18:06
	→ hexagoxel joined	18:07
	← javster left	18:07
	→ bvi__ joined	18:07
	→ anli_ joined	18:07
	→ subhojit777 joined	18:08
	gitinfo set mode: +v	18:08
	← bvi__ left	18:08
	← shigosei left	18:10
	→ hahuang65 joined	18:10
anli_	I have created a branch to an already existing name, then I force pushed, however, when I pull that branch to another machine that was aware of the branch before the overwrite, I can not get new contents, why?	18:10
	→ arnaud__ joined	18:12
	→ dtrott joined	18:12
anli_	It doesnt even work to delete the local branch then switch to origin/branchname, the contents will still be the old one	18:12
	→ javster joined	18:13
	→ steele joined	18:15
	← jonmorehouse left	18:15
	→ thibaultcha joined	18:15
	→ intellix joined	18:15
	← Ankhers left	18:16
	← pcypher_ left	18:16
	→ pcypher joined	18:16
	→ meanderer joined	18:17
	→ awkwardusername joined	18:17
	← francisfish left	18:19
	← thibaultcha left	18:19
MattB2	Hi, "This branch is 5 commits ahead of upstream/master"... I have a fork of a github repo, and from that fork I have branches with open pull requests to upstream that I want to keep. So far so good. Along the way I made some changes and committed to master in my fork. (first mistake!). I have brought my master up to date from upstream, but am still ahead by 5 commits. I don't need those commits. How do I get rid of them so they don'	18:20
	t pollute new branches from my local master that I might want to PR into upstream? Thanks!	18:20
	← daedeloth left	18:20
	→ francisfish joined	18:20
	← steele left	18:21
	→ steele joined	18:22
	← kriks left	18:22
	→ aswen joined	18:23
imachuchu	anli_: well, first off try "git ls-remote origin" to list out what branches your repo knows of on remote, then try to create a new branch with "git checkout -b testBranch origin/whateverRemoteBranch" to create one pointing to the same commit	18:23
	→ michelangelo joined	18:23
anli_	I am using tortoise, is not git fetch -all doing exactly what the first you said is doing?	18:23
imachuchu	anli_: "git ls-remote origin" just has git show you what branches it knows of on the remote. I'm sorry but I have no expiriance with tortoise-git, I can help you with the command line but not as much with a gui	18:25
MattB2	Put another way: how do I get my local and remote master aligned to upstream master without losing the branches I've already PRd?	18:25
anli_	I am deleting the branch locally and then I switch to origin/branchname, that should give me the latest version of branchname locally, should it not?	18:26
	← francisfish left	18:26
imachuchu	MattB2: nomatter what you do to master it won't effect other branches (branches point to commits, commits are immutable), so just get your local master like you want it and force push to remote	18:26
	← donmichelangelo left	18:26
	← steele left	18:26
MattB2	So something like this? http://stackoverflow.com/questions/9646167/clean-up-a-fork-and-restart-it-from-the-upstream	18:26
	→ jottr joined	18:27
imachuchu	anli_: from within the gui? No idea. Make sure that you have fetched though so that git knows about changes on the remote (you said you pulled, just making sure)	18:27
	→ steele joined	18:27
anli_	I am fetching	18:27
imachuchu	MattB2: yep, reset hard your local branch to whatever then force push to make remote like what you want	18:28
	→ Takle joined	18:29
MattB2	okay cool, thanks imachuchu, trying it now!	18:29
imachuchu	anli_: does tortoise git say what git sees the remote branch at (again, I have never even seen this GUI so I'm only of so much use)	18:29
	MattB2: no problems, best of luck!	18:29
anli_	I can get a list of branch names	18:29
	→ baweaver joined	18:29
anli_	Maybe I should open the command line then	18:29
	← encod3 left	18:30
	← nrsk left	18:30
	← aswen left	18:31
	→ tier_ joined	18:31
anli_	I am using git ls-remote origin, the branch is coming up	18:31
	← jottr left	18:32
anli_	How do I do a listing in the same way locally?	18:32
MattB2	imachuchu: Now on my fork it says 'This branch is 22 commits behind upstream/master' Wha?	18:32
	:-/	18:32
	← baweaver left	18:32
imachuchu	MattB2: sounds like you reset it too far back in the past	18:33
	anli_: "git branch -v"	18:33
	→ listochkin joined	18:33
	← pandeiro left	18:33
anli_	I tried git branch list, that created a branch name list...	18:33
	Well, the branch in question is not longer listed when i git branch	18:34
	← tier left	18:34
anli_	(not talking about list9	18:35
	)	18:35
imachuchu	anli_: "git branch" is used to create and manipulate branches, "git branch <someName>" creates a branch names someName	18:35
	→ Neozonz joined	18:35
anli_	Too bad the word "create" is not included in the sentence "git branch list"	18:35
	→ martinklepsch joined	18:35
anli_	:)	18:35
	← koderok left	18:36
imachuchu	anli_: excellent, so do "git branch <somename> origin/branchName"	18:36
	anli_: ehh, branches are near free so accidentally creating one isn't a big deal at all	18:36
anli_	heh	18:36
	← Gizburdt left	18:36
anli_	I created the branch I am interested in	18:36
	← _Vi left	18:36
	→ kriks joined	18:37
	→ autojack joined	18:37
anli_	By doing as you said	18:37
	→ mikecmpbll joined	18:37
autojack	I need some help with squashing commits. I'm just wondering if I can squash 2 together when there are other commits in between the two that I want to leave alone. an example is here: https://gist.github.com/omehegan/ea80ac53a85364673a96	18:37
imachuchu	anli_: does tortoise say what you want too?	18:38
anli_	I never switched	18:38
	Still in master	18:38
	← herdingcat left	18:38
	→ pandeiro joined	18:38
anli_	Writing git checkout branchname in console	18:38
	→ EvilPenguin joined	18:38
	→ Skapadapaduu joined	18:39
anli_	tortoise is now showing the old branch	18:39
kadoban	autojack: rebase -i (interactive rebase) will let you reorder and squash commits like that	18:39
imachuchu	autojack: absolutely, interactive rebase the two commits next to eachother and use fixup/squash. Note you are changing history though for every commit past the first one	18:39
MattB2	imachuchu: set the wrong remote (a different form of upstream that was 22 commits behind). Doh!	18:39
	← javster left	18:39
	← Sasazuka left	18:39
anli_	Trying git fetch --all	18:39
kadoban	autojack: The help file for rebase is quite good if you're not familiar with it	18:39
MattB2	*fork	18:39
	← MarkyC left	18:39
	→ freeman42 joined	18:40
imachuchu	MattB2: ah well, it was all local so no harm no foul	18:40
anli_	Well, that is taking forever, it seems :)	18:40
	→ javster joined	18:40
autojack	kadoban: yeah, I read the 'rewriting history' git documentation to get to this point.	18:40
	← EvilPenguin left	18:40
anli_	counting objects, time to put a billy in the micro, it seems	18:40
	→ EvilPenguin joined	18:40
	→ t4nk224 joined	18:41
autojack	imachuchu: so I would go into interactive rebase, and just move the two commits so they're next to each other, and then set the first to pick and the second to squash? and I can do that in one operation?	18:41
MattB2	how do I change the upstream? it's telling me it already exists...	18:42
	← Neozonz left	18:42
	→ regedit joined	18:42
	→ Reskp joined	18:42
imachuchu	autojack: yep	18:42
kadoban	autojack: Yeah, exactly	18:42
	→ netcarver joined	18:42
autojack	cool.	18:42
	→ devoldmx33 joined	18:42
	← FSMaxB left	18:43
	← ManikM left	18:43
	→ herdingcat joined	18:43
	→ ManikM joined	18:43
MattB2	git remote remove (answering my own question)	18:43
	→ ap0c joined	18:44
	← javster left	18:44
autojack	see my comment to my gist, does that look right?	18:44
	← devoldmx left	18:44
	← MattB2 left	18:44
	← subhojit777 left	18:44
	→ endiruna joined	18:44
kadoban	autojack: Should be, yeah. Note that there's also 'fixup', depending on if you want the commit message of fb11a29 to be there or not.	18:45
	gitinfo set mode: +v	18:45
t4nk224	If you have a working tree with unstaged changes, what happens to those changes after running a git stash apply	18:45
	do you lose them? in this case, a stash wasn't done before the apply	18:46
	→ ilhami joined	18:46
kadoban	t4nk224: I don't think it lets you do that? Reading the manpage seems to agree, unless I'm misreading.	18:47
	← martinklepsch left	18:47
	← Reskp left	18:47
	→ aniruddhabanerje joined	18:47
t4nk224	i'm getting one of my dev's history log	18:47
	I may be missing something	18:48
	← herdingcat left	18:48
	← mizu_no_oto left	18:49
	→ mizu_no_oto joined	18:49
	→ herdingcat joined	18:49
cbreak	t4nk224: git stash apply applies the contents of a stash	18:50
	→ diegoviola joined	18:50
	← marcogmonteiro left	18:50
cbreak	this will fail without anything done if a file that needs to be changed for this is changed	18:50
	git will not lose changes.	18:50
	→ jrnieder joined	18:50
	← jonyfive left	18:50
	→ Sasazuka joined	18:51
	← t0th_-_ left	18:51
	→ Reskp joined	18:52
	→ t0th_-_ joined	18:52
	← skylite left	18:53
	→ Gizburdt joined	18:53
t4nk224	to my understanding. He was doing a lot of renaming and moving folders around. forgot to stash the modified state, and was able to execute a git stash apply stash@{0} and lost his changes	18:53
	→ mennea joined	18:53
autojack	kadoban: reading now. so with squash, I get to make up a new commit message, with fixup that commit's message is just discarded in favor of the one above it?	18:53
	← kukks left	18:54
	→ javster joined	18:54
	→ liamkeily joined	18:54
kadoban	autojack: I'm pretty sure squash just combines the commit messages. But yes on fixup	18:54
autojack	well, the doc says "When you save and exit the editor, Git applies all three changes and then puts you back into the editor to merge the three commit messages."	18:55
	in squash.	18:55
	← arnatal left	18:55
	→ FreezingCold joined	18:56
	→ kukks joined	18:56
	← kukks left	18:56
	→ kukks joined	18:56
autojack	so it appears you get to edit the final result in that case.	18:56
kadoban	Possibly, I didn't think so though.	18:56
autojack	cool. thanks for the help :)	18:56
Vampire0	yes, that is what squash does, it combines the commits and then gives you the commit message editor with all squashed comments for edit	18:57
	→ thibaultcha joined	18:57
	→ ascarter joined	18:57
	← tier_ left	18:57
	→ EminenceHC joined	18:58
	← ojacobson left	18:58
	← maqr left	18:58
	← t4nk224 left	18:58
	← israelpattison left	18:58
	→ israelpattison joined	18:59
	→ Nijikokun joined	18:59
	← Nijikokun left	18:59
	→ petersr joined	18:59
	→ petersr_ joined	19:00
	→ Nijikokun joined	19:00
	← Nijikokun left	19:00
	← the8thbit\|work left	19:00
	→ Nijikokun joined	19:01
	← petersr_ left	19:01
	→ m0ltar joined	19:02
	← EminenceHC left	19:02
	← pheaver left	19:03
	→ Marcus_ joined	19:03
	← steele left	19:03
	→ steele joined	19:03
	→ tier joined	19:03
	← mkaesz left	19:04
	→ baweaver joined	19:05
	→ devoldmx joined	19:05
	→ lsiv568 joined	19:06
	→ tranzfuse joined	19:06
	→ Sceorem joined	19:07
	← nettoweb left	19:07
	← steele left	19:07
	→ proq joined	19:08
	← listochkin left	19:08
	→ listochkin joined	19:09
	← devoldmx33 left	19:09
	← tranzfus_ left	19:09
	→ KaaK joined	19:10
	← punchagan left	19:10
	← intellix left	19:10
	← javster left	19:11
	→ steele joined	19:11
	→ javster joined	19:11
	← a_le left	19:12
	→ a_le joined	19:12
KaaK	i've just pulled from a remote, and now I've got ~100 unmerged files in my stage. How can I resolve all these conflicts using `theirs` changes?	19:12
	→ Amandil joined	19:12
	← listochkin left	19:13
	→ jgardella joined	19:13
	← paulweb515 left	19:14
cbreak	KaaK: throw away the merge and git merge -X theirs?	19:14
	→ pheaver joined	19:14
cbreak	(git merge --abort in newer git I think should abort)	19:14
	← netcarver left	19:14
	← diegoviola left	19:15
	← smccarthy left	19:15
	→ LeMike joined	19:16
	← Reskp left	19:16
KaaK	so just pull down the remote into a seperate local branch and merge the two there? (using -X theirs)	19:16
	← javster left	19:16
	← autojack left	19:16
	→ checkit joined	19:16
	→ listochkin joined	19:17
kadoban	KaaK: You can 'git fetch' and then refer to the remote branch (whateverremote/whateverbranch)	19:17
	KaaK: That's actually usually a better idea than pull, since you can see what's up before you decide what to do with it.	19:17
	→ martinklepsch joined	19:18
cbreak	KaaK: why separate?	19:18
	← ignas left	19:18
KaaK	cbreak, because I'm a git idiot that is still working out cli git :P	19:18
cbreak	git merge --abort	19:19
KaaK	kadoban, that was exactly what I needed, thanks!	19:19
cbreak	just type that	19:19
	it will abort the failed merge	19:19
	→ sedeki joined	19:19
kadoban	'welcome	19:19
	← devoldmx left	19:19
cbreak	KaaK: there's no need for a separate branch	19:20
KaaK	yeah, that was key too, i just pulled some linux changes, and it completely killed my view of the repo -- that merge abort was awesome	19:20
cbreak	after that, just retry with -X theirs	19:20
	and make sure to run the unit tests	19:20
	-X theirs can fail	19:20
KaaK	its looking golden again, thanks tons	19:21
	cbreak, will it fail silently?	19:21
cbreak	maybe.	19:21
	KaaK: it will resolve conflicts in their favor	19:21
	but that doesn't mean that you will lose your changes	19:21
	only some of them	19:21
	maybe there are dependencies	19:21
KaaK	ahh	19:21
cbreak	I don't trust it.	19:22
	I recommend not trusting it.	19:22
	← jason237 left	19:23
KaaK	i don't know what this remote did then -- its the beaglebone black's linux repo, and even without making changes to my local copy, I got merge conflicts on a pull	19:23
	← mennea left	19:23
	← mribeirodantas left	19:24
	→ mennea joined	19:25
KaaK	I'm also not ruling out user error, but i've done literally nothing with this repo except to initially clone it, and occationally pull -- all from the same branch	19:25
	→ aidalgol joined	19:25
KaaK	or rather, same local and remote branches	19:25
	← mennea left	19:25
kadoban	That seems odd	19:26
	→ mennea joined	19:26
	→ jottr joined	19:27
cbreak	KaaK: !lol	19:28
gitinfo	KaaK: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	19:28
cbreak	KaaK: that should show you	19:28
	the merge is between your local changes (first parent) and the remote changes (second parent)	19:28
	→ javster joined	19:28
	← robbyoconnor left	19:28
KaaK	my other mystery/lack-of-understanding with this repo is its commits that don't touch any files -- e.g. https://github.com/beagleboard/linux/commit/ecaaeeffe0437f526f7923756bfa95986c042ffd	19:28
	→ mribeirodantas joined	19:29
	→ Asiajey joined	19:29
	← Asiajey left	19:29
	→ Asiajey joined	19:29
	← kriks left	19:29
	← hydrajump left	19:29
cbreak	maybe leftover of a history rewrite	19:29
	that'd also cause merge conflicts for everyone else	19:29
	← pdtpatr1ck left	19:30
	→ nnyk_ joined	19:30
	→ Not_Whatever joined	19:30
	→ veebers joined	19:30
	← Gizburdt left	19:31
	→ Gizburdt joined	19:31
	← basiclaser_ left	19:31
	← Sceorem left	19:31
	← ascarter left	19:32
	→ King_Hual` joined	19:32
	← jottr left	19:32
	← lsiv568 left	19:32
	← aniruddhabanerje left	19:32
	← ilhami left	19:33
	← sedeki left	19:33
	← pheaver left	19:33
	← a_le left	19:34
	→ a_le joined	19:35
Takumo	two things, can I put my post-recieve hook in my local git repo and push it to the remote? I'd also like to send the user the output of the hook when they push, can I do that?	19:35
	Tried google but couldn't find what I was looking for	19:35
	← King_Hual left	19:36
	→ sedeki joined	19:37
	← tango_ left	19:37
	← liamkeily left	19:38
qsuscs	Takumo: 1) no, for obvious reasons	19:38
Takumo	fair enough, what about point 2, echoing to the user when they push?	19:39
hexagoxel	what is the appropriate mailing list for gitk dev?	19:39
qsuscs	Takumo: imagine `echo -e "#!/bin/sh\ntar cf - ~" > post-receive; chmod +x post-receive; git commit -am "blah"; git push`	19:39
	← King_Hual` left	19:39
qsuscs	Takumo: the second one is even the default, i think, !tias	19:39
gitinfo	Takumo: Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://gitolite.com/tias.html may help with git-specific TIAS.	19:39
	← astrofog left	19:40
	← palcu_ left	19:40
	→ lsiv568 joined	19:41
	← hahuang65 left	19:42
	→ pmallya_ joined	19:42
	→ __adrian joined	19:42
	← User458764 left	19:42
	→ palcu_ joined	19:42
	→ codetroll joined	19:42
	→ Pessimist joined	19:43
	← __adrian left	19:43
	→ Reskp joined	19:43
	← pmallya_ left	19:43
	← Spacew00t left	19:43
	→ jb55 joined	19:43
	→ pmallya joined	19:43
	→ dangerousdave joined	19:44
	→ pheaver joined	19:45
	→ King_Hual joined	19:45
Pessimist	I bisected the kernel and got the first bad commit id. How can I checkout the commit before it?	19:45
grawity	commit^	19:45
	→ Spacew00t joined	19:46
	→ liamkeily joined	19:46
Pessimist	grawity, which options should I use?	19:46
	← EvilPenguin left	19:46
grawity	whatever you usually use to check out a commit	19:46
	← palcu_ left	19:47
	← Not_Whatever left	19:47
	← bdavenport left	19:47
	→ TheFuzzball joined	19:47
	→ tristanp joined	19:48
	→ paulweb515 joined	19:48
	← dangerousdave left	19:48
	→ mihaicris joined	19:48
	← Takle left	19:48
tristanp	can someone clue me in to a way to have command line git warn me when i check out a branch with stashes? i hate that sometimes i stash changes and then come back later and it slips my mind that I had changes not commited	19:49
	it makes me reluctant to stash changes and change branches since i fear ill forget about them :)	19:50
	→ Takle joined	19:50
	← Gizburdt left	19:51
	← javster left	19:52
	← herdingcat left	19:52
	→ javster joined	19:52
	→ kopparam joined	19:52
	→ kballou joined	19:53
kadoban	tristanp: So don't do that maybe? Stashes are for short-term saving stuff, IMO.	19:53
Pessimist	grawity, so I can do: git checkout commitid~1 ?	19:53
grawity	sure, or `git checkout commit^`	19:53
kadoban	tristanp: You can easily make a manual commit instead, possibly on a branch...or just on the same one and remember the commit isn't finished.	19:53
	← javster left	19:53
	→ javster__ joined	19:53
	← kukks left	19:54
	← Takle left	19:54
	← mennea left	19:56
	→ mennea joined	19:56
	→ steele_ joined	19:56
	→ EminenceHC joined	19:57
	← RaceCondition left	19:57
	← kopparam left	19:58
	→ Sceorem joined	19:58
	→ nettoweb joined	19:59
	← baweaver left	20:00
	← steele left	20:01
	→ a-l-e joined	20:01
	→ WaReZ joined	20:01
	← steele_ left	20:01
	→ g0bl1n joined	20:01
	← EminenceHC left	20:01
	→ EminenceHC joined	20:02
	← govg left	20:03
	→ bdavenport joined	20:03
	→ steele joined	20:04
	← sedeki left	20:05
	→ barduck joined	20:05
	→ Baluser joined	20:06
	← Freemason left	20:06
	← iamjarvo left	20:06
	→ tango_ joined	20:06
	← EminenceHC left	20:07
	→ Bass10 joined	20:08
	← pcypher left	20:10
	← g0bl1n left	20:10
	→ iamjarvo joined	20:12
hexagoxel	git format-patch produces output that does not seem to include the commit id the patch is based on. is that correct? would it not make sense to include that? am i missing some flag?	20:13
grawity	yes, the commit-ID is mostly useless in this context	20:13
	← pmallya left	20:13
kadoban	hexagoxel: If the commit hash was meaningful to the person you were sending to, you wouldn't need to use format-patch, no?	20:14
	→ kristofferR joined	20:14
kadoban	hexagoxel: Because then they'd already /have/ the commit, or at least be able to bring it in somehow.	20:14
	← alanwill_ left	20:14
qsuscs	you could e.g. use man git request-pull	20:14
gitinfo	the git-request-pull manpage is available at http://jk.gs/git-request-pull.html	20:14
	← checkit left	20:15
	← kevinb left	20:15
hexagoxel	kadoban: but.. id of commit being base of patch != id of patch	20:15
kadoban	Oh I see. Yeah, disregard that then.	20:16
	← Bass10 left	20:16
	← mihaicris left	20:17
	→ moritzs joined	20:17
	→ pcypher joined	20:19
	← Bruno__ left	20:19
	→ solker joined	20:20
	→ pmallya joined	20:20
	→ kevinb joined	20:21
hexagoxel	grawity: could you elaborate? would it not be useful for the git devs to know that my patch is based on the gitk subtree repository?	20:23
	→ smw joined	20:24
	← mennea left	20:25
	→ akushner__ joined	20:26
	→ mennea joined	20:26
	← martinklepsch left	20:26
	→ denete joined	20:26
	← jleclanche left	20:27
	← lsiv568 left	20:27
	→ sedeki joined	20:28
	← Spacew00t left	20:28
	← javster__ left	20:28
	→ zhuang joined	20:28
	← Kicer86 left	20:29
zhuang	hi, can I push changes to another workspace (the result of a git clone)?	20:29
	← akushner_ left	20:29
	← nnyk_ left	20:29
	← LeMike left	20:29
	→ lsiv568 joined	20:30
zhuang	i know that i can always pull from the other direction, but i'm wondering if push is also possible	20:30
	→ fresham joined	20:30
	← akushner__ left	20:30
	← aidalgol left	20:30
	→ Spacew00t joined	20:30
kadoban	zhuang: You shouldn't push to non-bare repositories.	20:31
shoerain	zhuang: by 'workspace', do you mean a 'remote'? http://git-scm.com/book/en/v2/Git-Basics-Working-with-Remotes	20:31
	oh hmm other repositories	20:31
	→ aidalgol joined	20:31
	→ boombatower joined	20:31
	← boombatower left	20:31
	→ boombatower joined	20:31
	→ sheperson joined	20:31
zhuang	shoerain: it's a remote, but not a bare repo but a git clone of a bare repo	20:32
	→ kukks joined	20:32
zhuang	kadoban: i own both of them, just want the convenience of syncing them without pushing.	20:32
	→ francisfish joined	20:33
zhuang	kadoban: without pushing to the bare repo, that is	20:33
shoerain	zhuang: there's always unison (two-way rsync) and other tools	20:33
	→ martinklepsch joined	20:33
	← solker left	20:33
kadoban	zhuang: Well, pushing between them isn't a good solution. I think there's a trigger around here that explains why if you're curious...	20:34
	!nonbare	20:34
gitinfo	[!bare] 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:34
kadoban	!pushnonbare	20:34
	→ ghostlines joined	20:35
	← ghostlines left	20:35
kadoban	Well, I guess that link works well enough, it explains a bit.	20:35
puff	Good afternoon. I continue in my ongoing saga of reading about git internals. I've realized that what I would really like is to find a tutorial that pretends to implement git from the ground up, one stage at a time.	20:35
	→ ghostlines joined	20:35
	→ shpoont joined	20:35
Eugene	The closest we have is !cs	20:35
gitinfo	"Git for Computer Scientists" is a quick introduction to git internals for people who are not scared by phrases like Directed Acyclic Graph. http://eagain.net/articles/git-for-computer-scientists/ See also !concepts !bottomup	20:35
kadoban	puff: That sounds...daunting.	20:35
	→ skylite joined	20:36
	← kristofferR left	20:36
	← LBV_User left	20:36
puff	kadoban: Eh... maybe not so much. Not actually implementing them, but sketcing out the design.	20:36
	← Sasazuka left	20:36
zhuang	shoerain: that's not a git tool, right? i'm trying to stay within the git land. the scenario i have is that i have a dev machine and a bunch of test machines. after making a local commit, i want to push that commit to all the test machines so that i can run tests on them before i finalize the commit	20:36
	→ dieciocho joined	20:36
puff	kadoban: I.e. "okay, so first we want to build an object store that stores our files, we'll make it look like this: etc"	20:36
kadoban	Yeah, I don't know of anything like that. You could write one maybe, hehe.	20:37
puff	kadoban: I might, by the time I'm done.	20:37
	Eugene: yeah, read that, not nearly enough detail in it :-).	20:37
	← dieciocho left	20:37
	→ javster joined	20:38
	→ dieciocho joined	20:38
Eugene	And the relevant section in the book?	20:38
	→ hahuang65 joined	20:38
	→ palcu joined	20:38
	← ecky--ptang-zoob left	20:39
puff	kadoban: I've written a couple books, so not entirely out of the question. But right now I'm just trying to understand git.	20:39
	Eugene: which book?	20:39
Eugene	!book	20:39
gitinfo	There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable	20:39
puff	Eugene: Chapter 10, you mean?	20:39
	Eugene: Yeah, still reading that.	20:39
kadoban	puff: Cool	20:39
	→ ecky--ptang-zoob joined	20:39
	← edenist left	20:40
	← romanovic left	20:40
puff	Chapter 7 of the community git book is somewhat helpful. http://schacon.github.io/gitbook/	20:40
	→ romanovic joined	20:41
puff	I don't need to understand it down to the bits and bytes level, but most things I've read so far have way too much handwaviness that really bugs me.	20:41
	I can't build a good mental model if big chunks of it are hidden from me.	20:41
	← mylord left	20:42
	← Marcus_ left	20:42
	→ edenist joined	20:42
	→ corni joined	20:42
	← corni left	20:42
	→ corni joined	20:42
	← ManikM left	20:43
	→ ManikM joined	20:43
	← hahuang65 left	20:43
	→ didpul joined	20:43
	→ aniruddhabanerje joined	20:43
	← moritzs left	20:44
	→ Not_Whatever joined	20:45
	→ Takle joined	20:46
	← t0th_-_ left	20:46
	→ t0th_-_ joined	20:47
	← ghostlines left	20:48
	→ EvilPenguin joined	20:48
	← Spacew00t left	20:49
	→ alanwill_ joined	20:49
	← mizu_no_oto left	20:49
	→ Spacew00t joined	20:49
	→ jason237 joined	20:50
Eugene	There's.... really not much to it?	20:50
	You take some bits over here, and you shove them over there	20:50
	← francisfish left	20:51
	→ mdhopkins joined	20:52
	← codetroll left	20:54
	← mennea left	20:55
	← Pessimist left	20:56
	→ HakShinKen joined	20:56
	→ mennea joined	20:56
	← HakShinKen left	20:56
	← ivan\ left	20:56
	→ ivan\ joined	20:57
	→ unixpro1970 joined	20:57
	→ ojacobson joined	20:58
	→ mixandgo joined	20:58
	← MrSavage left	20:59
	← steele left	20:59
	→ baweaver joined	21:00
	→ steele joined	21:00
	← shpoont left	21:00
	← jceb left	21:00
	← smw left	21:01
	← sedeki left	21:02
	→ ErKa joined	21:02
	← SupaHam left	21:02
	← zhuang left	21:02
	← javster left	21:03
	→ Mitchbones joined	21:04
	← steele left	21:04
	← Jackneill left	21:04
	→ javster joined	21:04
	← m0ltar left	21:05
	→ SupaHam joined	21:06
	→ tvw joined	21:06
	→ tgunr joined	21:06
	→ cagedwisdom joined	21:07
	← bgerber left	21:07
	← pcypher left	21:07
	→ steele joined	21:07
	← s00pcan left	21:08
	← SupaHam left	21:08
	→ SupaHam_ joined	21:08
	← gv left	21:08
	→ EminenceHC joined	21:08
	→ bgerber joined	21:08
	← javster left	21:08
	← Nizumzen left	21:09
	→ fbest joined	21:10
	← fbest left	21:10
spaceone	is there something like 'git stash rename' ?	21:11
	→ Scriptonaut joined	21:12
	→ enitiz joined	21:12
	← Pyrogerg left	21:12
	← lasers left	21:12
Scriptonaut	hmm, so for some reason I can't do a pull request	21:12
	it's greyed out (on github)	21:12
	→ gv joined	21:12
spaceone	Scriptonaut: better ask in #github	21:13
	← EminenceHC left	21:13
	→ lasers joined	21:13
Scriptonaut	ah, thanks	21:13
	← Scriptonaut left	21:13
fresham	spaceone: pop then save?	21:13
spaceone	fresham: they cannot really apply, and it's uncofortable for many stashes	21:13
	→ jwmann joined	21:13
	→ Pyrogerg joined	21:13
proq	spaceone: if you want to rename you should just save your stash with a new description and then delete the old stash	21:14
	← robertt_dex left	21:14
proq	spaceone: git stash save "new name"; git stash drop stash@{<number>}	21:14
	→ pcypher joined	21:14
	→ ascarter joined	21:15
	← liamkeily left	21:15
spaceone	proq: hm? i need to pop it before then? as i already said → it currently can't be applied	21:16
	← kukks left	21:16
	→ jottr joined	21:16
proq	spaceone: yes, you have to have changes before you can stash save. if you are popping it then you wouldn't need the drop command I gave you.	21:17
CEnnis91	So I need to be able to ignore a single file on a local machine but it needs to exist in the repository, so this doesn't look like a job for .gitignore	21:17
spaceone	proq: so your suggestion is not what i want...	21:17
CEnnis91	Is there another way to exclude files on a single machine	21:17
spaceone	as already answered before	21:17
kadoban	CEnnis91: You can't ignore tracked files, it just doesn't work. I assume this is a configuration file of some sort?	21:17
Eugene	!config	21:18
gitinfo	[!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas	21:18
CEnnis91	Its actually a symlinked file, it was a bad, quick fix	21:18
	In the repo its a text file, indicating its a temp file, when the code run, we properly remove and symlink a binary of proper architecture	21:19
	← ORiON-- left	21:19
Eugene	Nuke the text file and put a note in the README	21:20
CEnnis91	I guess I could just kill off that file from the repo and remove the text	21:20
	Yep	21:20
proq	spaceone: as there isn't a git stash rename you will have to do it that way	21:20
Eugene	Slap anybody who attempts to `make` without a symlink	21:20
proq	spaceone: unless you plan to patch git	21:20
	→ Qnx joined	21:21
	← Qnx left	21:21
	← settermjd left	21:22
	← nfk left	21:22
	→ ORiON-- joined	21:23
	→ Gizburdt joined	21:23
CEnnis91	Eugene: that might result in me getting fired, because that would be my boss =/	21:23
Eugene	Slap harder	21:24
	← tarkus_ left	21:24
CEnnis91	We even have a script that prepares the symlink, he just refuses to run it	21:24
	← mennea left	21:25
	→ malukenho joined	21:26
	→ dangerousdave joined	21:26
	→ mennea joined	21:26
	→ moritzs joined	21:27
	← pmallya left	21:27
	← Ard0nik left	21:27
	← aniruddhabanerje left	21:28
	← deuterium left	21:29
	→ Ard0nik joined	21:29
	← dangerousdave left	21:29
	← kermit left	21:30
	→ _leb joined	21:30
	→ dangerousdave joined	21:30
	← nour left	21:30
	← jerius left	21:30
	← awkwardusername left	21:30
	→ netcarver joined	21:31
	← dangerousdave left	21:31
	← CKyle left	21:31
	← aidalgol left	21:32
	→ dangerousdave joined	21:32
	← dangerousdave left	21:32
	← pheaver left	21:32
	← nettoweb left	21:33
	← fr33domlover left	21:33
	← a-l-e left	21:33
	← puff left	21:34
	← jb55 left	21:34
	→ jb55 joined	21:35
	→ AndroidLoverInSF joined	21:35
	→ pbrobst joined	21:36
	← Skapadapaduu left	21:36
	← ecky--ptang-zoob left	21:36
	→ yosito joined	21:37
	→ aidalgol joined	21:37
	→ dsdeiz joined	21:37
	→ dangerousdave joined	21:37
	← marthinal left	21:37
	← petersr left	21:37
	→ King_Hual` joined	21:37
	→ Neozonz joined	21:38
	← Neozonz left	21:38
	→ Neozonz joined	21:38
	→ DeathIncarnate joined	21:38
	→ hahuang65 joined	21:39
	← jb55 left	21:40
	← lsiv568 left	21:40
	→ kermit joined	21:41
	← Gizburdt left	21:41
	→ pmallya joined	21:41
	→ bitkiller joined	21:42
	→ paul424 joined	21:42
	← Neozonz left	21:42
	← hahuang65 left	21:43
	← livingstn left	21:45
	← Not_Whatever left	21:45
	→ Quevin_ joined	21:46
	→ RaceCondition joined	21:46
	← Asiajey left	21:46
	→ Sasazuka joined	21:46
	→ jonmorehouse joined	21:46
	→ upene joined	21:47
	← ahmetalpbalkan_ left	21:47
	← fresham left	21:48
	← sheperson left	21:49
	→ checkit joined	21:49
	checkit → digital_janitor	21:49
	← Spacew00t left	21:50
	→ Spacew00t joined	21:50
	← aidalgol left	21:50
	← dangerousdave left	21:51
	← chris2 left	21:51
	→ aidalgol joined	21:52
	→ Es0teric joined	21:52
	→ hahuang65 joined	21:52
	→ sedeki joined	21:52
Es0teric	question — how do i view commits only from a specific branch with no merges?	21:52
	meaning excluding merges and any updates from the original branch it was branched from	21:53
	← mennea left	21:55
	→ mennea joined	21:56
	← pacbard left	21:57
	→ vurma joined	21:57
	← vurma left	21:57
	← mennea left	21:59
	→ kukks joined	22:00
	← kukks left	22:00
	→ kukks joined	22:00
	← proq left	22:00
	← Amandil left	22:02
	← sword` left	22:03
	← mribeirodantas left	22:04
	← tier left	22:05
	← dsdeiz left	22:06
	→ mellernoia joined	22:06
	→ sword` joined	22:06
	← mixandgo left	22:07
	← zumba_addict left	22:07
	→ zumba_addict joined	22:08
	← githogori left	22:09
	← upene left	22:09
	← baweaver left	22:10
	← tesaf left	22:10
	← barduck left	22:11
	← tristanp left	22:11
	→ mribeirodantas joined	22:11
	← mribeirodantas left	22:11
	→ mribeirodantas joined	22:11
	← buffal0 left	22:12
	→ puff joined	22:12
puff	Hm, according to this page: http://schacon.github.io/gitbook/7_how_git_stores_objects.html git stores the object store's type and size at the beginning of the data, before compressing it. That sorta doesn't make sense, unless it's really easy/cheap to decompress the first few bytes to fetch the type/size.	22:13
	← zumba_addict left	22:13
	← Spacew00t left	22:13
	→ fr33domlover joined	22:13
	→ githogori joined	22:13
	← hstefan left	22:14
	→ EminenceHC joined	22:14
	→ javster joined	22:14
	← cannonball left	22:15
	← mribeirodantas left	22:15
	→ hstefan joined	22:15
	← githogori left	22:15
	→ Trudko joined	22:15
	← beneggett left	22:16
	→ githogori joined	22:16
	→ Juzzika joined	22:18
	← EminenceHC left	22:18
	→ upene joined	22:18
	← NBhosting left	22:20
	← yosito left	22:21
	→ chris2 joined	22:22
chris2	hi. i have a problem recovering a corrupted git repo	22:22
	a few blobs are missing, but they all belong to one tree	22:22
	← Nevik_ left	22:23
chris2	i thus want to rewrite the history of the repo such that this revision never appeared, but all before and after do	22:23
	→ yosito joined	22:23
chris2	how can i do this? when i just remove the commit with rebase -i, it tries to reapply all diffs after, resulting in massive merge conflicts	22:23
	→ Nevik joined	22:23
	← b1nar1 left	22:23
	← iamjarvo left	22:24
chris2	any ideas? else i'll write a tool to rewrite the commits	22:26
osse	chris2: git filter-branch	22:26
	← DeathIncarnate left	22:27
osse	chris2: see the man page for an example on how to skip certain commits	22:27
chris2	with parent filter?	22:27
	→ liamkeily joined	22:27
	→ zumba_addict joined	22:27
osse	commit-filter is what I had in mind	22:27
chris2	that will skip the checkout too? because that will fail else	22:28
osse	i don't know	22:28
chris2	For example, calling skip_commit "$@"	22:28
	will leave out the current commit (but not its changes! If you want	22:28
	that, use git rebase instead).	22:28
	ok, will try	22:28
osse	filter-branch works with commits, rebase works with patches (hence conflicts)	22:28
	← Thra11 left	22:29
	→ iamjarvo joined	22:29
	← iamjarvo left	22:29
	← sedeki left	22:29
	→ baweaver joined	22:30
	→ iamjarvo joined	22:30
	← jason237 left	22:30
	→ Zemeio joined	22:31
Zemeio	Hi guys. I cloned a repository and i want to merge the changes made on the original repository into mine, is there a way?	22:31
osse	Zemeio: git pull	22:31
	← ascarter left	22:32
Zemeio	git pull would pull from my cloned right?	22:32
osse	by default it pulls from where you cloned from	22:32
	← iamjarvo left	22:32
	→ s8321414 joined	22:32
	← AR45 left	22:32
Zemeio	I think I messed up in my explanation, I created a fork	22:33
	← denete left	22:33
	← veebers left	22:33
	← zumba_addict left	22:33
	→ zumba_addict joined	22:33
osse	Zemeio: then add the original as a second remote (git remote add original <URL>) then git fetch original then git merge original/master	22:33
	or equivalent	22:33
	→ AR45 joined	22:33
Zemeio	osse: Thanks osse, I will try that out	22:34
	← Sasazuka left	22:34
	← jgardella left	22:34
	← sdrfnord1 left	22:34
	→ ascarter joined	22:34
	→ veebers joined	22:35
	← AR45 left	22:35
	← ShooterMG left	22:35
	← shawndumas left	22:35
puff	Hm, when I do git cat-file -p on a tree, the first column is a six-digit number. I'm having a hard time finding anything that documents what this number is.	22:36
	→ AR45 joined	22:37
	→ Dudi joined	22:37
osse	puff: it's a "permission" of sorts. the first three digits are 100 for files, 120 for trees and 140 for symlinks (I think)I.	22:37
	The three last ones are 755 for executables and 644 for other files	22:37
	← tranzfuse left	22:37
puff	Ah, cool, thanks.	22:37
	Is there anywhere I could read up on this?	22:38
osse	wopps, I wasn't entirely right, but the first three = type of object, last three = executable or not	22:38
	→ tranzfuse joined	22:38
osse	I have no idea. I learned about it through the grapevine	22:38
	← King_Hual` left	22:38
	→ CKyle joined	22:38
	→ b1nar1 joined	22:39
	← tranzfuse left	22:39
puff	osse: Thanks.	22:39
	→ pacbard joined	22:39
	← mdhopkins left	22:41
	← veebers left	22:41
	← _leb left	22:42
	← ManikM left	22:43
	→ veebers joined	22:43
	← moritzs left	22:43
	← JohnBat26 left	22:44
	→ ManikM joined	22:44
	← Trudko left	22:44
	→ dsdeiz joined	22:45
	→ Sasazuka joined	22:46
	→ Not_Whatever joined	22:46
	→ shawndumas joined	22:46
osse	puff: grepping around a bit, I can't find it mentioned anywhere :O	22:47
	... except that the second half is always either 644 or 755	22:49
	... forgetting to mention that it can be 000 also	22:49
	→ gittish joined	22:51
	← gittish left	22:51
	→ harish_ joined	22:52
	← martinklepsch left	22:53
	→ s00pcan joined	22:53
	→ martinklepsch joined	22:53
	← harish_ left	22:53
	← kermit left	22:53
	← hyperboreean left	22:53
	→ hyperboreean joined	22:54
	→ SonikBoom joined	22:54
	← ErKa left	22:56
	← Es0teric left	22:56
	← zumba_addict left	22:56
	→ zumba_addict joined	22:57
	← zumba_addict left	22:57
	→ zumba_addict joined	22:57
	← anli_ left	22:58
	→ leb joined	22:59
	← chrisgeo left	23:00
	← dtrott left	23:00
	← a_le left	23:00
	→ dtrott joined	23:00
	← zumba_addict left	23:00
	← CKyle left	23:01
	→ kermit joined	23:01
	→ zumba_addict joined	23:01
	← BlaXpirit left	23:01
	→ a_le joined	23:01
	→ GeoAleyPerMer joined	23:02
	→ echo-area joined	23:03
	← blahdodo left	23:03
	→ Es0teric joined	23:03
	→ danemacmillan joined	23:03
	→ pheaver joined	23:04
	← jonmorehouse left	23:04
	→ blahdodo joined	23:05
	→ sgen_ joined	23:06
	← steele left	23:06
	← Nevik left	23:07
	← danemacm1 left	23:07
	→ hjutrdfgbj joined	23:08
	← vpl left	23:08
	← Sceorem left	23:09
	← TheFuzzball left	23:09
	← Es0teric left	23:09
	→ vpl joined	23:11
	← paul424 left	23:11
	← sgen_ left	23:12
	← jagob left	23:12
	← upene left	23:13
	→ jonyfive joined	23:13
	← dtrott left	23:14
	← freeman42 left	23:14
	→ Gitzilla joined	23:16
	← hjutrdfgbj left	23:17
	← Not_Whatever left	23:18
	→ EminenceHC joined	23:20
	← rhombus left	23:21
chris2	osse: thanks, that worked!	23:21
	← thedodd left	23:21
chris2	osse: had to git clone --no-local to only get the now reachable objects, but else it was easy	23:21
	← King_Hual left	23:22
	← corni left	23:22
	← Reskp left	23:22
	← endiruna left	23:23
	→ Reskp joined	23:23
jab416171	how do I set up git on a server so I can specify the hostname and the repo name, without the fully qualified path to the repo?	23:24
	← EminenceHC left	23:24
	← zumba_addict left	23:25
Mercury	So, I just did something stupid, which was an extension that did 'git add .' 'git commit -a --amend -C HEAD', the problem is that I had a number of untracked files that I want to go back to being untracked.	23:25
osse	chris2: \o/	23:25
Mercury	How do I fix that?	23:25
	→ sgen_ joined	23:25
	→ zumba_addict joined	23:25
osse	chris2: you can clean it up without doing a clone first, but making the clone is much easier	23:25
Mercury	git rm --cached ?	23:25
chris2	i tried various gc --prune etc, didnt work	23:25
osse	yeah you need --expire this and that, it's tedious	23:26
chris2	tried that too	23:26
	that damn missing object always killed the repack	23:26
	→ intellix joined	23:26
osse	chris2: you should see now that the diff associated with thee commit after the deleted one is significantly	23:26
	oh	23:26
	hmm, yeah that might be	23:26
chris2	but now i cloned without issue and git fsck is happy on the clone as well	23:26
osse	significantly different	23:27
chris2	yeah, it's the unified diff	23:27
	"unified"	23:27
	→ Nevik joined	23:28
	← MattMaker left	23:28
	← baweaver left	23:28
	← puff left	23:29
	← kpease left	23:30
	→ jameshendrix joined	23:32
	← Sasazuka left	23:32
	→ Alayde_ joined	23:32
	→ Sasazuka joined	23:33
	← Sasazuka left	23:33
	→ Sasazuka joined	23:33
	← mellernoia left	23:33
	→ the_other_cat joined	23:33
	→ ciampix joined	23:33
	← Reskp left	23:34
	→ mizu_no_oto joined	23:35
	→ Reskp joined	23:35
	→ tokik joined	23:36
	← kadoban left	23:36
	→ chris2_ joined	23:37
	← echo-area left	23:38
	← Alayde_ left	23:38
	← the_other_cat left	23:40
	← Zupoman left	23:40
	← martinklepsch left	23:40
	→ zumba_ad_ joined	23:40
	← lpax left	23:41
	← hcc23 left	23:41
	→ madewokherd joined	23:42
	← yosito left	23:42
	→ mribeirodantas joined	23:42
	← zumba_ad_ left	23:43
	← zumba_addict left	23:43
	← dieciocho left	23:43
	← pmallya left	23:44
	→ zumba_addict joined	23:44
	→ nnyk_ joined	23:44
	← aspiers left	23:45
	→ towski joined	23:45
	→ shinnya joined	23:45
	→ dieciocho joined	23:46
	← sgen_ left	23:47
	← zumba_addict left	23:49
	← boombatower left	23:49
	→ MattMaker joined	23:49
	→ akushner joined	23:49
	→ the_other_cat joined	23:50
	← chris2 left	23:50
	← b1nar1 left	23:50
	coasterz_ → coasterz	23:50
	← pheaver left	23:51
	← dreiss left	23:52
	→ b1nar1 joined	23:52
	← WaReZ left	23:53
	→ dieciocho_ joined	23:54
	→ blackmesa joined	23:54
	chris2_ → chris2	23:54
	→ Scriptonaut joined	23:54
	← pantsman- left	23:55
Scriptonaut	hey guys, so I made a new branch from master, made a few small changes, and then added them, committed them, and pushed them to their own branch (same name as local branch) on github. For some reason when I tried to checkout master, it is telling me: Your branch is ahead of origin/master by 2 commits	23:55
	← kingsley-t left	23:56
Scriptonaut	then I fetched origin master, and it's telling me: Your branch and origin/master have diverged	23:56
	← fairuz left	23:56
Scriptonaut	and have 2 and 21 different commits each, respectively	23:56
	← meanderer left	23:56
	→ Radivarig joined	23:57
	← GeoAleyPerMer left	23:57
	← tg left	23:58
	← towski left	23:58
	← the_other_cat left	23:58
	← b1nar1 left	23:59

Logs Search ←Prev date Next date→

Channels Documentation