IRCloggy #git 2014-10-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-10-11
	← fstd left	00:00
splud	when I run git status, I often don’t actually get CURRENT status of difference between my local repo and the remote - how can I do that?	00:00
	→ fstd joined	00:00
kadoban	splud: 'git fetch' first.	00:00
	← baweaver left	00:00
kadoban	splud: That's what 'git fetch' does, it updates your local repo's idea of what exists at the remote(s)	00:01
splud	ok.	00:01
imachuchu	maestrojed: "If there is already a git repo tracking the code of this project it makes sense to use to continue working with that repo." is weird, how about something closer to "If there is already a git repo tracking the code of this project then it makes sense to continue using it."	00:02
	→ EminenceHC joined	00:02
maestrojed	imachuchu gotcha, I agree.	00:02
	← joelm left	00:03
maestrojed	And when I am referring to a shared origin repo, did I use the terms correctly?	00:03
	← dreiss left	00:03
maestrojed	maybe "remote" instead of "origin" makes sense	00:03
kadoban	Yes	00:04
maestrojed	kadoban yes, what? :) yes, call it remote, don't call it origin?	00:04
	→ johnstein joined	00:04
kadoban	maestrojed: Yes to remote instead of origin	00:04
	← weemsledeux left	00:04
maestrojed	kadoban thanks!	00:05
imachuchu	maestrojed: how about instead of "All teams/contributors should work from the same repo with a shared (origin)" something like "All teams/contributors should contribute to the same shared remote repository."	00:05
maestrojed	yes!	00:05
	thank you	00:05
	← hahuang65 left	00:06
	← thumpba left	00:06
	← imachuchu left	00:06
	→ thumpba joined	00:07
	→ rikko joined	00:07
	→ leb joined	00:07
	← EminenceHC left	00:07
	← rikko left	00:07
	← BSaboia left	00:08
	→ hahuang65 joined	00:09
	→ joelm joined	00:10
	← mikiones left	00:11
	← Quevin_ left	00:11
maestrojed	splud if you want to always run 'git fetch' then 'git status'. you can create an alias to do both. Some alias like 'cstatus'. Then you can just run 'git cstatus'	00:11
	← ColKurtz left	00:11
maestrojed	http://gitimmersion.com/lab_11.html	00:11
	← thumpba left	00:12
	→ mscook joined	00:12
	→ ColKurtz joined	00:12
	→ Celm joined	00:12
	→ mizu_no_oto joined	00:12
	← mscook left	00:13
	→ mscook joined	00:14
	← mizu_no_oto left	00:15
	← graphitemaster left	00:16
	→ graphitemaster joined	00:16
	← mscook left	00:16
	→ x0s_ joined	00:16
	← Celm left	00:17
	→ Consuela joined	00:17
	→ mizu_no_oto joined	00:17
	← Consuela left	00:17
	→ voiceofgrog joined	00:17
	→ aidalgol joined	00:18
	← voiceofgrog left	00:18
	→ voiceofgrog joined	00:19
	← voiceofgrog left	00:20
	→ voiceofgrog joined	00:20
	← autonomousdev left	00:20
	→ autonomousdev joined	00:21
	← x0s_ left	00:21
	→ atlantan joined	00:21
	← autonomousdev left	00:21
	← voiceofgrog left	00:21
	→ morenoh149 joined	00:21
	→ starkhalo joined	00:21
	→ voiceofgrog joined	00:22
	← brandonshowers left	00:24
	← ColKurtz left	00:25
	← maletor left	00:25
	→ _Atom_ joined	00:26
	→ maletor joined	00:26
	← WaReZ left	00:26
	← maletor left	00:28
	← ianbrandt left	00:28
	← ockham left	00:29
	← _alan_ left	00:29
	← atlantan left	00:30
	← Cheaterman1 left	00:30
	→ baweaver joined	00:30
	← ryez left	00:32
	← baweaver left	00:33
	→ baweaver joined	00:33
	→ ryez joined	00:33
	→ hays joined	00:34
	← hays left	00:34
	→ hays joined	00:34
	← baweaver left	00:36
	→ ColKurtz joined	00:37
	← maestrojed left	00:37
	→ [R] joined	00:39
	← BlaXpirit-UA left	00:39
[R]	i can't seem to figure out how to get ssl client certs to work... is there any magic aside from setting sslCert?	00:40
	← brammm left	00:41
	← _Atom_ left	00:42
	← armyriad left	00:43
	→ tinti joined	00:43
	→ armyriad joined	00:43
	← paul424 left	00:43
	← jontmorehouse left	00:44
	← jenni_naiaretti left	00:44
	← starkhalo left	00:44
	→ jenni_naiaretti joined	00:45
	← Sasazuka left	00:46
	→ mike_af joined	00:49
	→ Cheaterman1 joined	00:50
	← alexwhitman left	00:50
	→ autonomousdev joined	00:51
	← autonomousdev left	00:51
	← Kwpolska left	00:51
	← solution left	00:51
	← ColKurtz left	00:52
	→ autonomousdev joined	00:52
	← autonomousdev left	00:52
	← robustus\|Off left	00:52
	→ simesy joined	00:53
	→ Consuela joined	00:54
	→ robustus\|Off joined	00:54
	robustus\|Off → robustus	00:54
	← jamieshepherd left	00:55
	→ alexwhitman joined	00:55
	← ncthom91 left	00:55
	→ tmcmahon joined	00:57
	← simesy left	00:57
	← a_le left	01:00
	→ a_le joined	01:00
	→ ColKurtz joined	01:01
	→ morphix0 joined	01:01
	← beneggett left	01:01
	← kballou left	01:03
	→ CKyle joined	01:04
	← morenoh149 left	01:05
	← mike_af left	01:05
	← jhulten left	01:06
	← AllMaineClinic left	01:06
	→ weemsledeux joined	01:06
	← weemsledeux left	01:06
	→ weemsledeux joined	01:06
	← CheckDavid left	01:07
	→ autonomousdev joined	01:07
	← autonomousdev left	01:07
	→ thumpba joined	01:08
	→ autonomousdev joined	01:08
	→ _Vi joined	01:08
	→ Goplat joined	01:08
	→ Celm joined	01:13
	→ nnyk_ joined	01:14
	← nnyk_ left	01:14
	→ nnyk_ joined	01:14
	→ mike_af joined	01:15
	→ jamieshepherd joined	01:15
	← mike_af left	01:15
	→ mscook joined	01:16
	→ mike_af joined	01:16
	→ x0s_ joined	01:16
	← Celm left	01:17
	→ fuli joined	01:18
	← ColKurtz left	01:19
	← NoNMaDDeN left	01:19
	→ shinnya joined	01:19
	← mike_af left	01:20
	← morphix0 left	01:20
	← tmcmahon left	01:20
	← mellernoia left	01:20
	← str left	01:21
	← wdl left	01:23
	← weemsledeux left	01:23
	← RaceCondition left	01:23
	← jenni_naiaretti left	01:25
	← waveclaw left	01:25
	← CKyle left	01:25
	→ jenni_naiaretti joined	01:26
	→ morenoh149 joined	01:27
	← sean__ left	01:27
	→ Vampire0_ joined	01:28
	→ waveclaw joined	01:28
	← nnyk_ left	01:29
	→ nettoweb joined	01:30
	← mscook left	01:30
	← nettoweb left	01:31
	← Vampire0 left	01:31
	→ nettoweb joined	01:31
	← nettoweb left	01:32
	← alexwhitman left	01:32
	→ nettoweb joined	01:32
	← nettoweb left	01:33
	→ ColKurtz joined	01:34
	→ bezet joined	01:34
	→ nettoweb joined	01:34
	→ alexwhitman joined	01:35
	→ geomyidae_ joined	01:36
	← x0s_ left	01:36
	← pheaver left	01:38
	→ _alan_ joined	01:38
	← bezet left	01:39
	← nettoweb left	01:39
	← alexwhitman left	01:40
	← gccostabr left	01:43
	← autonomousdev left	01:43
	← Cheaterman1 left	01:44
	→ starkhalo joined	01:46
	→ alexwhitman joined	01:46
	→ qbann0p joined	01:47
	← hatzopoulos_ left	01:47
	→ hatzopoulos_ joined	01:48
	← gmb2020 left	01:49
	← ColKurtz left	01:49
	← mitzip left	01:50
	→ nkouevda joined	01:51
	→ simesy joined	01:53
	← nowhere_man left	01:54
	→ mike_af joined	01:54
	← mike_af left	01:54
	→ mike_af joined	01:54
	→ nowhere_man joined	01:55
	← LucasKA left	01:58
	← simesy left	01:58
	← pbrobst left	01:59
	→ mz\|` joined	01:59
	← mike_af left	02:00
	→ jpf_ joined	02:00
	← tristanp left	02:03
	← Marcus_ left	02:03
	← darkbasic left	02:04
	← jpf left	02:04
	→ Marcus_ joined	02:04
	→ codeman joined	02:04
	→ darkbasic joined	02:05
	← jpf_ left	02:05
	← jenni_naiaretti left	02:05
	← kaendfinger left	02:06
	→ jenni_naiaretti joined	02:06
	→ bAnt joined	02:07
	← Marcus_ left	02:09
	→ Dougie187 joined	02:09
	← starkhalo left	02:11
	→ jontmorehouse joined	02:11
	→ EminenceHC joined	02:12
	→ Celm joined	02:13
	→ justinmburrous joined	02:14
	← badcom left	02:15
	→ badcom joined	02:16
	→ jonmorehouse joined	02:16
	→ hsttlrjeff joined	02:16
	← jontmorehouse left	02:17
	← mizu_no_oto left	02:17
	← EminenceHC left	02:17
	← Celm left	02:17
	← Jarboe left	02:18
	→ Mitchbones joined	02:18
	→ EminenceHC joined	02:18
	← bAnt left	02:22
	→ watabou joined	02:22
	← EminenceHC left	02:23
	← [R] left	02:25
	← _alan_ left	02:25
	→ athan joined	02:29
	→ mscook joined	02:29
	→ Zenith77 joined	02:30
	← mscook left	02:30
	← athan left	02:31
	→ athan joined	02:32
	← hsttlrjeff left	02:34
	← asakura0 left	02:35
	→ kpreid joined	02:35
	← msonntag left	02:35
athan	Hello everyone, I'm having a strange error with https & signal 13, has anyone ever heard of anything like that?	02:36
	→ angelsl joined	02:37
	→ msonntag joined	02:37
athan	the exact response I get is "error: git-remote-https died of signal 13"	02:38
	→ maletor joined	02:40
	← eletuchy left	02:41
	← maletor left	02:41
	→ m0ltar joined	02:41
	→ eletuchy joined	02:41
	← hahuang65 left	02:41
	← armyriad left	02:41
	← leb left	02:42
	→ armyriad joined	02:42
	→ hahuang65 joined	02:43
	← gfixler left	02:44
	← eletuchy left	02:45
	← jenni_naiaretti left	02:46
	→ GT4066 joined	02:46
	← m0ltar left	02:47
	→ jenni_naiaretti joined	02:47
	→ asakura0 joined	02:48
	→ m0ltar joined	02:48
	→ CKyle joined	02:48
	← justinmburrous left	02:48
	→ mitzip joined	02:50
	← meatmanek left	02:52
	← phantombeta left	02:52
	→ simesy joined	02:54
emacer	athan, damn, sounds like cancer	02:54
	→ nnyk_ joined	02:54
emacer	or ebola	02:54
	→ Cheaterman1 joined	02:54
	← alexwhitman left	02:54
	← kwc left	02:55
athan	emacer: :(	02:56
	→ alexwhitman joined	02:56
	← zanchoPansa left	02:57
	→ meatmanek joined	02:57
	← m0ltar left	02:58
	← simesy left	02:59
emacer	emacer, I hear they're making good progress on cures, though!	02:59
	athan, signal 13 is SIGPIPE	03:00
	→ Celm joined	03:00
	→ listochkin joined	03:00
	→ tristanp joined	03:00
emacer	athan, that means: Broken pipe; write to pipe with no readers	03:01
	← alexwhitman left	03:03
	← ferreum left	03:04
	← listochkin left	03:04
	← tristanp left	03:05
	→ aarcane joined	03:06
	← Noldorin left	03:06
	→ alexwhitman joined	03:06
	← MattMaker left	03:07
	→ mizu_no_oto joined	03:10
	← watabou left	03:16
	→ boombatower joined	03:18
	→ JamesWine joined	03:20
	← mizu_no_oto left	03:24
	← _Vi left	03:24
	← rethus left	03:24
	← JamesWine left	03:25
	→ James_Wine joined	03:25
	← James_Wine left	03:25
	→ JamesWine joined	03:25
	→ GHAAAN23 joined	03:25
	→ MAAQJQI joined	03:25
	← madewokherd left	03:26
	← jenni_naiaretti left	03:26
	← hahuang65 left	03:27
	→ jenni_naiaretti joined	03:27
	← cgar left	03:28
	→ phantombeta joined	03:29
	phantombeta → abcdefg	03:29
	abcdefg → phantombeta	03:29
	← alexwhitman left	03:30
	→ tristanp joined	03:31
	← CKyle left	03:31
	→ alexwhitman joined	03:32
	→ bezet joined	03:35
	← tristanp left	03:36
	← bezet left	03:39
athan	emacer: Hmm, okay, I'll have to fiddle it looks like. Thank you :)	03:39
	→ pppp2 joined	03:43
	← aidalgol left	03:46
	← xSmurf left	03:46
	← hustl4 left	03:51
	← anomalyst left	03:52
	→ xSmurf joined	03:54
	→ simesy joined	03:55
	← badcom left	03:55
	→ anomalyst joined	03:56
	→ starkhalo joined	03:57
	← diegoaguilar left	03:57
	← Consuela left	03:58
	← alexwhitman left	03:59
	← simesy left	03:59
	← geomyidae_ left	04:02
	→ gmb2020 joined	04:03
	← smccarthy left	04:03
	← anomalyst left	04:04
	→ anomalyst joined	04:04
	→ deuti joined	04:04
	→ Marcus_ joined	04:04
	→ koderok joined	04:05
	→ alexwhitman joined	04:06
	← jenni_naiaretti left	04:07
	← Mitchbones left	04:07
	← nutron left	04:07
	→ jenni_naiaretti joined	04:08
	← frogonwheels left	04:08
	→ fatalhalt joined	04:08
	← Guest51316 left	04:08
	← SumDude left	04:08
	← Marcus_ left	04:09
	← pagioss left	04:09
	→ frogonwheels joined	04:11
	→ otter768 joined	04:13
	← deuti left	04:13
	→ justinmburrous joined	04:14
	← meatmanek left	04:15
	← St_Marx left	04:17
	← voiceofgrog left	04:17
	→ pheaver joined	04:18
	← splud left	04:19
	→ mennea joined	04:20
	← leeN left	04:21
	→ d4n13L joined	04:22
	← m0viefreak left	04:23
	← gmb2020 left	04:24
	→ EminenceHC joined	04:24
	→ meatmanek joined	04:25
	→ Guest8660 joined	04:28
	→ _alan_ joined	04:28
	→ St_Marx joined	04:29
	← EminenceHC left	04:29
	→ pagioss joined	04:29
	→ Malsasa joined	04:31
	← eliasr left	04:32
	← kukks left	04:32
	→ brandonshowers joined	04:33
	→ IIT joined	04:33
	← justinmburrous left	04:34
	← alexwhitman left	04:34
	← toothrot left	04:35
	→ watabou joined	04:35
	gitinfo set mode: +v	04:36
	→ alexwhitman joined	04:37
	→ PinkSpecs joined	04:37
	→ a-l-e joined	04:39
	← Nyoom left	04:39
	→ moritzschaefer joined	04:40
	← Guest8660 left	04:40
	← joelm left	04:41
	← pagioss left	04:41
	→ benmezger joined	04:42
	← benmezger left	04:43
	→ Warrior-kk joined	04:44
	← pheaver left	04:44
	→ simesy joined	04:45
	→ Ephexeve joined	04:46
	→ joelm joined	04:47
Ephexeve	Hey guys, urgent question, I did a git init, and git add. But then randomly I did a git reset --hard without running git commit first. How can I go back to where I was?	04:47
	All my files are gone! :(	04:47
	← alexwhitman left	04:47
	← jenni_naiaretti left	04:48
	← mkoskar left	04:48
	→ justinmburrous joined	04:48
	→ jenni_naiaretti joined	04:49
	→ jimmyy joined	04:50
	← mennea left	04:50
	→ NoNMaDDeN joined	04:50
	→ mennea joined	04:50
	→ alexwhitman joined	04:52
	→ edge joined	04:54
	← Dougie187 left	04:54
	← freeman42 left	04:54
	← edge left	04:57
	← alexwhitman left	04:57
	→ edge_ joined	04:58
	→ otakbeku joined	04:59
	→ alexwhitman joined	05:00
	← thibaultcha left	05:00
	← edge_ left	05:00
	→ theEdge joined	05:01
	→ mkoskar joined	05:01
	← UmbraMalison left	05:01
	← moritzschaefer left	05:01
	← sohail left	05:01
	← JamesWine left	05:01
	← theEdge left	05:02
	← qbann0p left	05:03
	→ justinmb_ joined	05:03
	→ UmbraMalison joined	05:05
	← justinmburrous left	05:06
	← Goplat left	05:07
	← koderok left	05:07
	← gdoteof left	05:08
beardtree	Ephexeve: you're fucked :/	05:08
	← nnyk_ left	05:09
	→ mscook joined	05:10
	→ Zifre_ joined	05:10
	← mscook left	05:10
Ephexeve	beardtree: thought so :(	05:10
	← beardtree left	05:11
	→ kadoban_ joined	05:11
	← Ephexeve left	05:11
	← LLaurent left	05:11
	← polyzen left	05:11
	← PinkSpecs left	05:12
	→ beautifulmind joined	05:12
	→ LLaurent joined	05:12
	→ PinkSpecs joined	05:12
	→ iliketurtles joined	05:12
	← iliketurtles left	05:12
	← Zifre left	05:13
	→ iliketurtles joined	05:14
	← kadoban left	05:14
	← alexwhitman left	05:14
	← iliketurtles left	05:14
	→ King_Hual joined	05:14
	← codeman left	05:18
	← lindenle left	05:18
	← King_Hual left	05:20
	→ alexwhitman joined	05:25
	→ gdoteof joined	05:26
	→ EminenceHC joined	05:27
	← jenni_naiaretti left	05:29
	→ jenni_naiaretti joined	05:29
	← otter768 left	05:30
	← mennea left	05:31
	→ _thumpba joined	05:31
	→ mennea joined	05:32
	← EminenceHC left	05:32
	→ tristanp joined	05:33
	← _thumpba left	05:33
	← a-l-e left	05:34
	→ bezet joined	05:35
	→ goTAN joined	05:36
	← tristanp left	05:37
	← alexwhitman left	05:37
	→ punchagan joined	05:37
	→ _thumpba joined	05:39
	← bezet left	05:40
	← kadoban_ left	05:40
	→ kadoban joined	05:40
	→ alexwhitman_ joined	05:42
	→ ciampix joined	05:43
	← brandonshowers left	05:45
	← alexwhitman_ left	05:48
	→ alexwhitman joined	05:48
	→ lindenle joined	05:49
	← simesy left	05:50
	← hatzopoulos_ left	05:51
	→ simesy joined	05:51
	← athan left	05:53
	← alexwhitman left	05:53
	← lindenle left	05:53
	← desposo left	05:54
	→ subhojit777 joined	05:54
	← Radivarig left	05:55
	← simesy left	05:55
	→ wojtasfs joined	05:55
	→ alexwhitman joined	05:58
	← gdoteof left	06:01
	← tgunr left	06:01
	← mennea left	06:01
	→ mennea joined	06:02
	← alexwhitman left	06:03
	→ Marcus_ joined	06:05
	→ MattMaker joined	06:06
	← jonmorehouse left	06:06
	→ jonmorehouse joined	06:07
	→ gdoteof joined	06:08
	← jenni_naiaretti left	06:09
	← Marcus_ left	06:10
	→ alexwhitman joined	06:10
	→ jenni_naiaretti joined	06:10
	→ gfixler joined	06:13
	→ thibaultcha joined	06:14
	→ jhulten joined	06:18
	← morenoh149 left	06:18
	← shinnya left	06:22
	← wojtasfs left	06:24
	→ reluctantlove joined	06:25
	→ irqq joined	06:26
	← boombatower left	06:26
	← alexwhitman left	06:26
	→ yarco joined	06:26
	→ shinnya joined	06:27
	→ alexwhitman joined	06:28
	→ EminenceHC joined	06:30
	← mennea left	06:31
	→ mennea joined	06:32
	← Gamecubic left	06:35
	← Celm left	06:35
	← EminenceHC left	06:35
	→ petersr joined	06:35
	← alexwhitman left	06:35
	← beautifulmind left	06:37
	← pppp2 left	06:37
	→ alexwhitman joined	06:40
	← starkhalo left	06:40
	← thibaultcha left	06:41
	→ beautifulmind joined	06:42
	← a_le left	06:43
	← alexwhitman left	06:45
	← watabou left	06:45
	← Kabaka left	06:49
	→ alexwhitman joined	06:49
	← irqq left	06:50
	← jenni_naiaretti left	06:51
	→ irqq joined	06:51
	→ simesy joined	06:51
	← fatalhalt left	06:51
	→ jenni_naiaretti joined	06:52
	← zumba_addict left	06:53
	→ zumba_addict joined	06:53
	← alvaro_o left	06:53
	← simesy left	06:56
	← Tuna-Fish left	06:56
	→ morenoh149 joined	06:56
	→ _Vi joined	06:57
	← reluctantlove left	06:58
	← beautifulmind left	06:58
	→ devoldmx joined	06:58
	→ nnyk_ joined	07:00
	← mennea left	07:01
	→ mennea joined	07:02
	→ ravi_ks_ joined	07:03
	→ morphix0 joined	07:03
	→ Jackneill joined	07:03
	→ koderok joined	07:05
	← koderok left	07:05
	← otakbeku left	07:06
	→ nnyk joined	07:06
	→ Tuna-Fish joined	07:07
	→ Junior joined	07:07
	← nnyk_ left	07:09
	← MattMaker left	07:14
	← Warrior-kk left	07:15
	→ nnyk_ joined	07:15
	→ hoijuiL joined	07:15
	→ Kabaka joined	07:16
	← nnyk left	07:17
	← goTAN left	07:17
	← ag4ve left	07:17
	← alexwhitman left	07:18
	→ sgen joined	07:18
	→ simesy joined	07:18
	← sgen left	07:18
	→ alexwhitman joined	07:19
	→ simesy_ joined	07:20
	← kyb3r_ left	07:21
	→ kyb3r_ joined	07:21
	← justinmb_ left	07:21
	→ justinmburrous joined	07:22
	← simesy left	07:23
	→ gmcastil joined	07:23
	→ robarelli joined	07:25
	← simesy_ left	07:25
	← alexwhitman left	07:25
	← justinmburrous left	07:27
	→ x0s_ joined	07:29
	→ nour joined	07:31
	← jenni_naiaretti left	07:32
	→ alexwhitman joined	07:33
	→ pantsman- joined	07:33
	→ Juzzika joined	07:33
	← morenoh149 left	07:33
	→ jenni_naiaretti joined	07:34
	→ cebor joined	07:34
	→ tristanp joined	07:34
	→ bezet joined	07:35
	→ Celm joined	07:36
	→ EminenceHC joined	07:36
	→ sgen_ joined	07:37
	← tristanp left	07:39
	← bezet left	07:40
	← EminenceHC left	07:40
	← Celm left	07:41
	→ jargon joined	07:41
	← ajustrun\|away left	07:42
	← netameta left	07:42
	← mennea left	07:42
	→ mennea joined	07:43
	← teran left	07:43
	→ ajustrun joined	07:44
	→ simesy joined	07:44
	← irqq left	07:44
	← _thumpba left	07:46
	← alexwhitman left	07:47
	→ BlaXpirit joined	07:48
	← simesy left	07:49
	→ alexwhitman joined	07:50
	→ GRX joined	07:50
	→ vurma joined	07:51
	→ teran joined	07:51
	← alexwhitman left	07:54
	→ justinmb_ joined	07:54
	← justinmb_ left	07:56
	→ justinmburrous joined	07:56
	→ Kicer86 joined	07:59
	← Kicer86 left	08:00
	→ jottr joined	08:01
	← justinmburrous left	08:01
	→ alexwhitman joined	08:03
	→ Kicer86 joined	08:04
	→ Kwpolska joined	08:06
	→ Marcus_ joined	08:06
	→ laserbeam joined	08:07
	← laserbeam left	08:08
	← alexwhitman left	08:10
	← Kwpolska left	08:10
	← _alan_ left	08:11
	← Marcus_ left	08:11
	→ alexwhitman joined	08:11
	← mennea left	08:12
	→ mennea joined	08:13
	→ dregad joined	08:13
	→ a_le joined	08:17
	→ thiago joined	08:19
	← jenni_naiaretti left	08:19
	← ajustrun left	08:20
	→ jenni_naiaretti joined	08:20
	← jenni_naiaretti left	08:21
	← a_le left	08:22
	← mkoskar left	08:22
	→ jenni_naiaretti joined	08:22
	← alexwhitman left	08:22
	← mennea left	08:26
	→ alexwhitman joined	08:27
	→ hexagoxel joined	08:28
	→ kriks joined	08:29
	← alexwhitman left	08:32
	→ Muinasjutuvestja joined	08:34
	→ tristanp joined	08:35
	→ Kwpolska joined	08:36
	→ Celm joined	08:37
	→ EminenceHC joined	08:37
	→ alexwhitman joined	08:37
	→ User458764 joined	08:38
	← NBhosting left	08:39
	→ mkoskar joined	08:39
	← tristanp left	08:40
	→ simesy joined	08:40
	→ CheckDavid joined	08:41
	→ hidekin joined	08:41
	→ mrdraagyn joined	08:41
	← Celm left	08:41
	→ awkwardusername joined	08:42
	← nnyk_ left	08:42
	← simesy left	08:42
	← EminenceHC left	08:42
	→ simesy joined	08:42
	→ mennea joined	08:42
	← mennea left	08:43
	← mrdraagyn left	08:43
	→ mennea joined	08:43
	→ mikiones joined	08:43
	← alexwhitman left	08:44
	→ YourNick joined	08:45
	← robarelli left	08:47
	← Sleepy63 left	08:47
	← simesy left	08:47
	← YourNick left	08:48
	← yarco left	08:48
	← Mobutils left	08:49
	→ laserbeam joined	08:49
	← laserbeam left	08:49
	→ mihaicris joined	08:51
	← joki left	08:51
	← Asenar left	08:52
	→ Asenar joined	08:52
	← vurma left	08:52
	← LLaurent left	08:54
	→ vurma joined	08:55
	→ daedeloth joined	08:56
	← gniourf left	08:56
	→ robbyoconnor joined	08:56
	→ joki joined	08:57
finster	!backup	08:57
gitinfo	Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups	08:57
	→ LLaurent joined	08:57
	→ Oebele joined	08:57
	← vurma left	08:59
	→ Sleepy63 joined	09:01
	→ gniourf joined	09:01
	→ Not_Whatever joined	09:02
	← jenni_naiaretti left	09:03
	→ jenni_naiaretti joined	09:04
	← scottbuckel left	09:04
	← thiago left	09:06
	→ morenoh149 joined	09:07
	→ thiago joined	09:08
	← tinti left	09:09
	→ dangerousdave joined	09:09
	→ tinti joined	09:10
	← dmwit left	09:12
	← rohanrhu left	09:13
	→ laserbea_ joined	09:13
	← laserbea_ left	09:14
	→ leeN joined	09:16
	← Juzzika left	09:17
	→ Mobutils joined	09:19
	← jargon left	09:19
	→ alexwhitman joined	09:21
	→ Suchit joined	09:21
	← Suchit left	09:21
	→ Suchit joined	09:22
	← oskarkv left	09:22
	← mennea left	09:24
	→ mennea joined	09:24
	← Lyqyd left	09:25
	← MutSbeta left	09:25
	← alexwhitman left	09:28
	→ Marcus_ joined	09:29
	← PinkSpecs left	09:29
	→ Gizburdt joined	09:35
	→ _thumpba joined	09:35
	→ NoNMaDDe_ joined	09:35
	→ bezet joined	09:36
	← NoNMaDDeN left	09:38
	→ ockham joined	09:38
	→ NoNMaDDeN joined	09:38
	← _thumpba left	09:39
	→ SonikBoom joined	09:39
	← bezet left	09:40
	← dangerousdave left	09:40
	← _Vi left	09:40
	← NoNMaDDe_ left	09:41
	→ EminenceHC joined	09:41
	→ simesy joined	09:43
	← Gizburdt left	09:45
	→ Gizburdt joined	09:46
	← EminenceHC left	09:46
	→ tokik joined	09:47
	← simesy left	09:47
	← jenni_naiaretti left	09:48
	→ upene joined	09:48
	→ jenni_naiaretti joined	09:49
	← Gizburdt left	09:50
	← LLaurent left	09:51
	← morenoh149 left	09:52
	→ badcom joined	09:53
	← mutley89 left	09:54
	→ sinkensabe joined	09:56
	→ beautifulmind joined	09:56
	← badcom left	09:57
	→ lb1a joined	10:00
	→ alexwhitman joined	10:00
	→ stick-shift joined	10:01
	→ Umeaboy joined	10:04
Umeaboy	Hi!	10:04
gitinfo	Umeaboy: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	10:04
	→ SumDude joined	10:04
	→ irqq joined	10:04
	← alexwhitman left	10:04
Umeaboy	I have managed to push some files to a repository of mine, but I could use some help in adding a folder into the repo and put thoose files in it. How do I do that?	10:05
	← mennea left	10:05
lb1a	Umeaboy, exactly like you added the files !	10:05
	→ mennea joined	10:06
	→ atomx joined	10:06
	→ alexwhitman joined	10:08
	← SumDude left	10:09
	→ stamina joined	10:10
	← kcj left	10:12
	→ endiruna joined	10:14
	← sinkensabe left	10:14
	→ sinkensabe joined	10:15
irqq	!gitolite	10:16
gitinfo	Gitolite is a tool to host git repos on a server. It features fine-grained access control, custom hooks, and can be installed without root. Download: https://github.com/sitaramc/gitolite Docs: http://gitolite.com/gitolite/	10:16
Umeaboy	lbla: Failed.	10:16
	→ wald0 joined	10:17
wald0	i have cloned a git project which has submodules, how i should update them? seems like my last merge from upstream has references to updated submodules	10:18
	→ hebz0rl joined	10:19
	← israelpattison left	10:21
	→ anddam joined	10:21
anddam	I forked a repository and created three branches with different patches	10:21
	now I'd like to merge all in my master branch and keep the original master branch in "upstream" branch	10:21
	→ israelpattison joined	10:22
anddam	is that a reasonable approach?	10:22
wald0	git submodule update, so simple :)	10:23
	← alexwhitman left	10:23
	→ alexwhitman joined	10:23
	← sinkensabe left	10:23
	← thiago left	10:24
	→ sinkensabe joined	10:24
	→ m8 joined	10:24
	→ listochkin joined	10:24
	→ m8tt8 joined	10:25
	→ otakbeku joined	10:26
	← m8tt8 left	10:28
	← sinkensabe left	10:28
	← alexwhitman left	10:29
	← jenni_naiaretti left	10:31
	→ jenni_naiaretti joined	10:32
	→ NoNMaDDe_ joined	10:33
	→ kwc joined	10:33
	← NoNMaDDeN left	10:33
	→ RaceCondition joined	10:33
	→ alexwhitman joined	10:33
anddam	submodule?	10:34
	wald0: oh was that meant for me at all?	10:34
	→ King_Hual joined	10:34
	→ nfk joined	10:35
	← mennea left	10:35
	← hoijuiL left	10:35
	→ mennea joined	10:36
otakbeku	the proper method to update is git pull origin master or git pull?	10:36
	→ tristanp joined	10:36
	← CheckDavid left	10:37
	→ Celm joined	10:38
	← alexwhitman left	10:38
	← fuli left	10:39
	← lb1a left	10:39
osse	depends on what you want to update	10:39
	→ alexwhitman joined	10:40
	← tristanp left	10:41
	→ smerron joined	10:41
	← Celm left	10:42
	→ simesy joined	10:44
	← alexwhitman left	10:45
	← durre left	10:45
	→ EminenceHC joined	10:45
	→ pa3ce joined	10:47
	← irqq left	10:48
	← simesy left	10:48
	→ AKK9 joined	10:49
	→ irqq joined	10:49
	→ alexwhitman joined	10:49
	← EminenceHC left	10:50
	← listochkin left	10:50
	← upene left	10:50
	→ badcom joined	10:51
	← pantsman- left	10:51
	→ autonomousdev joined	10:51
	→ Radivarig joined	10:53
	→ WaReZ joined	10:53
	→ irqq_ joined	10:54
	← irqq left	10:56
	→ listochkin joined	10:57
	← RaceCondition left	10:58
	← alexwhitman left	11:01
	→ alexwhitman joined	11:03
	← listochkin left	11:03
	← mennea left	11:05
	→ mennea joined	11:06
	→ listochkin joined	11:06
	← hebz0rl left	11:07
	← tokik left	11:07
	→ liamkeily joined	11:07
	→ PinkSpecs joined	11:08
	→ onyekaa joined	11:08
	→ freeman42 joined	11:10
	← jottr left	11:10
	← jenni_naiaretti left	11:13
	→ jenni_naiaretti joined	11:14
	→ jottr joined	11:14
	← nour left	11:16
	→ m0viefreak joined	11:16
	← nkouevda left	11:17
	→ sinkensabe joined	11:17
	← kyb3r_ left	11:17
	← listochkin left	11:18
	→ a_le joined	11:19
	→ Lunatrius` joined	11:19
	← morphix0 left	11:21
	← Lunatrius left	11:21
	Lunatrius` → Lunatrius	11:21
	← sinkensabe left	11:21
	→ morphix0 joined	11:22
	← punchagan left	11:24
	→ _thumpba joined	11:24
	← a_le left	11:24
Umeaboy	It still doesn't work.	11:24
	git init && git add i9305/	11:25
	← alexwhitman left	11:25
	← ciampix left	11:26
	← jonmorehouse left	11:28
	← _thumpba left	11:28
	→ alexwhitman joined	11:30
cbreak	Umeaboy: it works.	11:31
frogonwheels	Umeaboy: git doesn't track folders, it tracks content. If you want to move files, then the easiest way to do it is with 'git mv' . Just mkdir i9305, git mv files i9305 and then git commit	11:31
	Umeaboy: unless I'm missing something.	11:31
Umeaboy	Fixed it. Now I just have to find a way to add this into a pull request.	11:31
cbreak	git init will create a new repository, and git add will stage all files for committing	11:31
	that's easy, tell someone "Hey, pull branch Foo from my repository at ssh://user@host/repo.git"	11:32
Umeaboy	cbreak: I'm not talking about the merge, I mean the actual pull request.	11:33
cbreak	a pull is a merge	11:33
	a pull request is a request to merge	11:33
	just ... request it?	11:33
	via e-mail or what ever	11:33
	git doesn't have anything formal for it	11:33
	Umeaboy: maybe man git-request-pull helps you write one	11:34
gitinfo	Umeaboy: the git-request-pull manpage is available at http://jk.gs/git-request-pull.html	11:34
Umeaboy	The folder called i9305 on my github https://github.com/Umeaboy/Samsung is what I want to pull to this fork: https://github.com/Umeaboy/droid-hal-device/tree/hybris-10.1/patterns	11:34
	Can you help me do that?	11:34
cbreak	Umeaboy: so, send yourself an e-mail	11:35
	Umeaboy: tell yourself to pull	11:35
	← alexwhitman left	11:35
	→ palcu joined	11:35
canton7	Umeaboy, it sounds like you want to create a pull request on github? that's a github question - they have good docs on that	11:35
cbreak	if you control both repositories, then that's all that's needed	11:35
	← palcu left	11:35
cbreak	Umeaboy: when you received the request from yourself, just merge, and you're done. Maybe push to the remote if you want	11:36
	→ palcu joined	11:36
canton7	ah, you own both repos? you don't need to send anyone a pull request :P you already know what to pull, because you're you	11:36
	→ alexwhitman joined	11:36
	→ palcu_ joined	11:36
Umeaboy	cbreak: Nope.	11:36
	→ palcu__ joined	11:37
canton7	I like the clarity and descriptiveness here	11:37
cbreak	Umeaboy: yes.	11:37
	→ tokik joined	11:37
canton7	not "that doesn't make sense to me because..."	11:37
	just "nope"	11:37
cbreak	Umeaboy: read the URLs.	11:37
	Umeaboy: you will see the name Umeaboy in both of them	11:37
	which means that you control both.	11:37
Umeaboy	I forked the droid-hal-device repo and then made a branch to commit the dir.	11:37
	→ palcu___ joined	11:37
	→ reyha joined	11:38
	→ Celm joined	11:38
	→ palcu____ joined	11:38
cbreak	it doesn't matter wether you forked it or not, it's your repository.	11:38
	← stamina left	11:39
	← palcu left	11:40
	→ palcu joined	11:41
	← palcu_ left	11:41
	← palcu__ left	11:41
Umeaboy	Right. I can't seem to make theese instructions on https://help.github.com/articles/creating-a-pull-request/ to work.	11:42
	← palcu___ left	11:42
	→ aard_ joined	11:42
	→ ghostlines joined	11:42
	← Celm left	11:43
	← palcu____ left	11:43
	← alexwhitman left	11:43
Umeaboy	In the "Branch" menu, choose the branch that contains your commits.	11:43
	I did that.	11:43
	The green button only gives me this in result:	11:44
	There isn't anything to compare.	11:44
	master and i9305 are identical.	11:44
	→ simesy joined	11:44
cbreak	Umeaboy: are you completely ignoring what I tell you?	11:44
	→ bAnt_ joined	11:44
	→ evildmp joined	11:45
Umeaboy	I read it now.	11:45
	→ alexwhitman joined	11:46
cbreak	just pull. You don't need to bother with clicking on any buttons.	11:46
	→ CheckDavid joined	11:47
	→ alexwhitman_ joined	11:48
	→ Dreamer3__ joined	11:48
	→ toothrot joined	11:49
	→ diegoaguilar joined	11:49
	← simesy left	11:49
	← FunkybAss left	11:49
	← Suchit left	11:50
	→ EminenceHC joined	11:50
	← alexwhitman left	11:51
	→ FunkybAss joined	11:51
	← liamkeily left	11:51
	← autonomousdev left	11:51
	→ alexwhitman joined	11:51
	← subhojit777 left	11:52
	← alexwhitman_ left	11:53
	← evildmp left	11:54
	→ lindenle joined	11:54
	→ autonomousdev joined	11:54
	→ evildmp joined	11:54
	→ alexwhitman_ joined	11:55
	← EminenceHC left	11:55
	← Kitt3n left	11:56
	→ trewe joined	11:56
	← alexwhitman left	11:56
	← tinti left	11:57
	→ liamkeily joined	11:57
	← endiruna left	11:58
	← WaReZ left	11:59
	→ endiruna joined	11:59
	← lindenle left	11:59
	← aard_ left	11:59
	← fstd left	12:00
	← mihaicris left	12:00
	→ fstd joined	12:00
	→ tristanp joined	12:00
	→ sohail joined	12:01
	← jenni_naiaretti left	12:01
	← evildmp left	12:01
qsuscs	lol someone tries to “hack” my git-daemon (on port 63913, even)	12:01
	2014-09-20 17:58:25.189407500 fatal: protocol error: bad line length character: GET	12:02
	→ jenni_naiaretti joined	12:02
	← alexwhitman_ left	12:02
	→ weemsledeux joined	12:04
	← weemsledeux left	12:04
	→ weemsledeux joined	12:04
	→ ferreum joined	12:04
	→ mjuli joined	12:04
	→ alexwhitman joined	12:05
	→ alcocjos joined	12:05
	← mennea left	12:05
	→ mennea joined	12:06
	→ shpoont joined	12:07
	← autonomousdev left	12:08
	← liamkeily left	12:08
	→ autonomousdev joined	12:08
	← sgen_ left	12:08
_ikke_	I guess just scanning for webservers on random ports	12:10
cbreak	hack? :D	12:11
	there's nothing to hack, git is wide open	12:11
	← alcocjos left	12:11
_ikke_	Could still try to exploit it to get access to the systme	12:11
cbreak	it's like hacking open windows... (is there an other kind of windows? :)	12:11
	Yeah, I suppose so.	12:12
qsuscs	hm	12:12
	← mennea left	12:12
	→ kcj joined	12:12
qsuscs	but it only happened on one day, and it was a private customer’s IP address, out of the pool of deutsche telekom	12:12
_ikke_	malware on their pc?	12:12
cbreak	probably a proud member of a botnet.	12:12
qsuscs	if i had a full intercept of the connection …	12:13
	→ ubitux joined	12:13
ubitux	hi	12:13
gitinfo	ubitux: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	12:13
	← sahlberg left	12:13
_ikke_	qsuscs: You'd need to have a packet sniffer runing 24/7	12:14
ubitux	is there a diff --word-diff less greedy, acting at character level instead of space-separated words?	12:14
	← alexwhitman left	12:14
ubitux	typically, to avoid this: http://ubitux.fr/pub/pics/_git-word-diff.png	12:14
	← tristanp left	12:14
ubitux	where the fields (separated by ',') don't change but are marked as changed by git diff --word-diff	12:15
_ikke_	ubitux: there is an option: --word-diff-regex	12:16
	→ alexwhitman joined	12:16
_ikke_	ubitux: see man git diff	12:16
gitinfo	ubitux: the git-diff manpage is available at http://jk.gs/git-diff.html	12:16
	→ dangerousdave joined	12:17
ubitux	oh, i missed that, cool	12:17
	thank you	12:17
	alright, git diff --color-words=. seems to do exactly what i want, thank you	12:19
_ikke_	cool	12:19
	→ mennea joined	12:20
	← wald0 left	12:20
	→ wald0 joined	12:20
	← alexwhitman left	12:21
	→ hahuang65 joined	12:21
	→ mutley89 joined	12:21
	← mkoskar left	12:22
	← x0s_ left	12:23
	← PinkSpecs left	12:24
	→ alexwhitman joined	12:25
	→ Gizburdt joined	12:26
	← hahuang65 left	12:26
	→ ravi_ks__ joined	12:26
	→ devoldmx3 joined	12:27
	→ mihaicris joined	12:28
	← devoldmx left	12:28
	← ravi_ks_ left	12:29
	← Gizburdt left	12:30
	→ tristanp joined	12:33
qsuscs	sigh finally got that programming lesson stuff in git	12:33
	← jenni_naiaretti left	12:33
qsuscs	hint: put *.lps in .gitignore, it’s actually IDE data (like “what files were open, where was my cursor” and stuff)	12:34
	→ upene joined	12:35
	→ jenni_naiaretti joined	12:35
	← otakbeku left	12:36
	→ evildmp joined	12:36
	→ Wiz_KeeD joined	12:36
	→ liamkeily joined	12:37
	← dangerousdave left	12:37
	→ nour joined	12:38
	← mutley89 left	12:39
	← palcu left	12:39
	→ Celm joined	12:39
qsuscs	in case somebody is interested what out somewhat stupid teacher makes us do: https://bitbucket.org/qsuscs/informatik/src/7d01f9ec9527af38e8342085c8da4bca5aeb22fb/Stopwatch/?at=master	12:40
	→ zoso joined	12:40
qsuscs	(this is already sanitized, e.g. i introduced a coding style, english as a language (she actually uses german variable names and stuff), etc. pp.)	12:40
	→ moritzschaefer joined	12:41
	← jenni_naiaretti left	12:42
	← Celm left	12:43
	→ jenni_naiaretti joined	12:43
	← ockham left	12:45
	→ simesy joined	12:45
	← tristanp left	12:47
	← devoldmx3 left	12:47
	→ devoldmx joined	12:47
	→ arvind_k joined	12:48
	← mennea left	12:49
	← liamkeily left	12:49
	← simesy left	12:50
	→ mennea joined	12:50
	← arvind_k left	12:50
	← zoso left	12:50
	→ dangerousdave joined	12:50
	→ Gizburdt joined	12:51
	← Gizburdt left	12:51
	→ Gizburdt joined	12:51
	← ToxicFrog left	12:52
	→ Kitt3n joined	12:54
	← dangerousdave left	12:54
	→ intellix joined	12:55
	→ lindenle joined	12:55
	← sohail left	12:55
	→ ToxicFrog joined	12:55
	→ kiran joined	12:56
	← lindenle left	12:59
	→ Advocation joined	13:01
	→ eliasr joined	13:02
	→ tubaman joined	13:02
	→ Noldorin joined	13:02
	→ atlantan joined	13:03
	← beautifulmind left	13:06
	→ lindenle joined	13:07
	← lindenle left	13:08
	← NoNMaDDe_ left	13:08
	→ LeMike joined	13:08
	→ Nizumzen joined	13:10
	→ _thumpba joined	13:13
	→ jottr_ joined	13:13
	← LucasTT left	13:13
	→ sahlberg joined	13:13
	→ justinmburrous joined	13:13
	← jottr left	13:13
	← Gizburdt left	13:16
	← _thumpba left	13:17
	← jottr_ left	13:18
	→ colona joined	13:18
	← atlantan left	13:18
	→ Gizburdt_ joined	13:19
	← pa3ce left	13:19
	← irqq_ left	13:19
	← mennea left	13:19
	← colona left	13:19
	→ mennea joined	13:20
	→ deuti joined	13:20
	→ colona joined	13:21
	→ jargon joined	13:23
	← jenni_naiaretti left	13:24
	→ ravi_ks_ joined	13:25
	← jimmyy left	13:25
	→ dccc_ joined	13:25
	← Gizburdt_ left	13:27
	→ Gizburdt joined	13:27
	→ zivester joined	13:28
	← ravi_ks__ left	13:28
	← bAnt_ left	13:28
	← justinmburrous left	13:30
	→ gonzzor joined	13:30
	→ YourNick joined	13:30
gonzzor	Can I get git to ignore certain refs when doing git push --prune 'refs/heads/:refs/heads/'?	13:32
	if refs/heads/foo exists on my remote, but not locally, can I get git to not prune that branch?	13:32
	Without downloading the refs first?	13:32
	→ PinkSpecs joined	13:32
	→ ciampix joined	13:32
	← rivarun_ left	13:33
	→ rivarun joined	13:33
	← mihaicris left	13:35
	← Gizburdt left	13:37
	← ubitux left	13:38
	→ jottr_ joined	13:40
	→ Trudko joined	13:40
	→ ravi_ks__ joined	13:41
	→ segfalt joined	13:42
	→ CKyle joined	13:42
	→ liamkeily joined	13:43
	→ WaReZ joined	13:44
	← teran left	13:44
	← jottr_ left	13:45
	→ justinmburrous joined	13:45
	← endiruna left	13:45
	← ravi_ks_ left	13:45
	→ simesy joined	13:46
	→ ehmatthes joined	13:46
	← CheckDavid left	13:47
	← zivester left	13:47
	→ ravi_ks_ joined	13:47
	← ravi_ks__ left	13:48
	← mennea left	13:49
	→ mennea joined	13:50
	← simesy left	13:51
	→ mechanicalduck joined	13:51
	← CKyle left	13:52
	← Umeaboy left	13:53
	← evildmp left	13:54
	← neversleepz left	13:54
	→ EminenceHC joined	13:54
	→ jenni_naiaretti joined	13:56
	→ Gizburdt joined	13:56
	← justinmburrous left	13:57
	→ evildmp joined	13:58
	← Advocation left	13:58
	← mennea left	13:59
	← EminenceHC left	14:00
	→ Advocation joined	14:01
	← anddam left	14:03
	→ teran joined	14:03
	→ pantsman- joined	14:04
	→ tristanp joined	14:06
	→ mennea joined	14:06
	← ecky--ptang-zoob left	14:07
	→ ecky--ptang-zoob joined	14:07
	← teran left	14:07
	← ghostlines left	14:08
	→ lindenle joined	14:09
	← tristanp left	14:10
	← refried_ left	14:12
	← petersr left	14:13
	← lindenle left	14:13
	← cagedwisdom left	14:14
	→ Dougie187 joined	14:14
	← kwc left	14:16
	→ jottr_ joined	14:16
	→ sinkensabe joined	14:17
	→ atomx_ joined	14:17
_ikke_	gonzzor: I don't think there is a way	14:18
	← atomx_ left	14:18
	← atomx left	14:18
gonzzor	_ikke_: Suspected that as well, thought I asked at least..	14:19
	→ atomx joined	14:19
	← kiran left	14:20
	← GRX left	14:21
	→ tgunr joined	14:24
	→ thiago_ joined	14:24
	← evildmp left	14:31
	→ vurma joined	14:32
	→ W0rmDr1nk joined	14:32
grawity	hmm, if it exists on the remote but not locally	14:33
	← mennea left	14:33
grawity	isn't pruning it in that case the whole point of `push --prune`?	14:33
	← reyha left	14:34
	→ mennea joined	14:34
	→ polyzen joined	14:35
	→ kiran joined	14:35
	← alexwhitman left	14:36
	← Advocation left	14:36
	→ teran joined	14:36
	→ alexwhitman joined	14:37
	← zumba_addict left	14:40
	→ martinklepsch joined	14:41
	→ zumba_addict joined	14:41
	← thiago_ left	14:42
	← zumba_addict left	14:42
	← Wiz_KeeD left	14:43
	→ thiago_ joined	14:44
	← teran left	14:44
	← freeman42 left	14:45
	→ gurke_ joined	14:45
	→ freeman42 joined	14:45
	→ evildmp joined	14:46
gurke_	hello.. is it recommended as a single person developer to use github?	14:46
	→ Goplat joined	14:46
	→ teran joined	14:46
	→ simesy joined	14:47
bremner	shrug if you want.	14:47
	gurke_: what are your alternatives?	14:47
	→ metRo_ joined	14:47
gurke_	bremner, well i have no alternative... i just wonder why i should use git when iam a single person	14:47
	→ codeman joined	14:48
bremner	gurke_: yes, you should use version control as a single developer.	14:48
	gurke_: no non-trivial software should be developed without version control.	14:49
gurke_	bremner, for what reason?	14:49
	→ eXpl0it3r joined	14:49
gurke_	dont i enhance my application whenever i update stuff to it?	14:50
	← ferreum left	14:50
	→ kwc joined	14:50
eXpl0it3r	Whould the following be the right approach to forcing LF for all the files and does the exclude work that way? - https://github.com/LaurentGomila/SFML/pull/712/files	14:50
_ikke_	gurke_: git != github	14:50
gurke_	_ikke_, well... then my own git	14:51
	but why	14:51
_ikke_	What is your question exactly? Why you should use version control?	14:52
	← simesy left	14:52
bremner	gurke_: the same reason you should write comments in your code.	14:52
	← evildmp left	14:52
bremner	so you can understand it later.	14:52
gurke_	yes _ikke_ :D	14:52
_ikke_	gurke_: read !parable	14:52
gitinfo	gurke_: 'The git parable' provides some good reasoning behind git. http://tom.preston-werner.com/2009/05/19/the-git-parable.html	14:52
gurke_	ill check that link	14:53
_ikke_	gurke_: It explains the basic principles for version control and git	14:53
gurke_	thanks	14:53
eXpl0it3r	Am I understanding it right that "* text=auto eol=lf" will force LF line endings when added in a .gitattributes file?	14:53
_ikke_	eXpl0it3r: it converts crlf to lf when adding files to the index	14:55
	→ tristanp joined	14:56
_ikke_	and it doesn't convert back to crlf when checking out	14:56
	→ eletuchy joined	14:56
	← autonomousdev left	14:56
eXpl0it3r	Good, and does "extlibs export-ignore" ignore the directory extlibs and the containing files from being converted when added to the index?	14:56
_ikke_	no	14:57
	export-ignore is for git archive	14:57
	→ prest joined	14:58
eXpl0it3r	How would one then ignore a certain file or directory?	14:58
_ikke_	By removing those specific attributes again	14:58
thiago_	eXpl0it3r: add to .gitignore and git rm those files	14:59
_ikke_	extlib -text -eol	14:59
	thiago_: wrong context	14:59
eXpl0it3r	thiago_: context :D	14:59
	_ikke_: Thanks, I'll try that	14:59
	→ autonomousdev joined	15:00
	← freeman42 left	15:01
	→ fuli joined	15:01
	→ evildmp joined	15:02
	→ fuli_ joined	15:02
	← fuli left	15:02
	← sinkensabe left	15:03
	← evildmp left	15:03
_ikke_	eXpl0it3r: one tip, make sure line endings are already correct in the index	15:03
	← mennea left	15:03
	→ Manny joined	15:03
	← Dougie187 left	15:03
	← gonzzor left	15:04
	→ sinkensabe joined	15:04
_ikke_	So make sure no crlf is present in the index before using this	15:04
eXpl0it3r	_ikke_: We did, we just want to prevent new ones to introduce crlf again	15:04
	→ mennea joined	15:04
_ikke_	right	15:04
xender	gurke_: I can say that I think using git has really changed my coding style, the good way	15:04
	← markovh left	15:05
xender	gurke_: When using version control, you don't have to be afraid of screwing code up, as you have backups (commits), and each of them is (should be, it's up to you) described in some meaningful way	15:05
_ikke_	It's also a history for yourself	15:06
xender	gurke_: For me it's not even like writing comments; It's more like naming variables semantically instead of int a; int b;	15:06
_ikke_	gurke_: If you add good commit messages, you can later look back and figure out why something was done.	15:06
gurke_	hmm	15:06
xender	_ikke_, gurke_: Ayep, looking back after ~half a year can be full of surprises. Certainly easier with commit messages.	15:08
	→ Advocation joined	15:08
	← sinkensabe left	15:08
	→ madewokherd joined	15:08
gurke_	okay	15:08
_ikke_	But like xender said, the biggest advantage, even when you are alone, is that you can experiment what you want, because you can always get the previous version back	15:08
gurke_	sounds fair	15:08
xender	gurke_: As for Github - if you think your program can be in any way useful for anyone, not just you - go for it ;)	15:09
gurke_	but how to git startet? :D haha	15:09
_ikke_	gurke_: git init	15:09
xender	gurke_: !book	15:09
gitinfo	gurke_: 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	15:09
	→ evildmp joined	15:09
_ikke_	in a project directory	15:09
	→ m0ltar joined	15:09
	→ sinkensabe joined	15:09
_ikke_	gurke_: git is not a program that you start. It's a command line tool that you give commands	15:09
	← liamkeily left	15:09
gurke_	yea i have figured that out	15:10
	← Manny left	15:10
xender	_ikke_: I think gurke_ was asking how to get (git :P) started with it (tutorial), not how to start the program	15:10
	→ Manny joined	15:10
_ikke_	right	15:10
	← mennea left	15:10
	→ ravi_ks__ joined	15:11
gurke_	is it worth spending money on codeschool for git real?	15:11
xender	gurke_: Dunno, but Pro Git is free and I think it's good - try it first ;)	15:11
	← sahlberg left	15:12
gurke_	oh okay :)	15:12
	→ CheckDavid joined	15:13
	→ ajustrun joined	15:13
xender	gurke_: I would recommend you to both learn the commandline and use git gui and gitk. Or some other GUI if you prefer, but those 2 are distributed with standard git installation.	15:13
	Those basic GUIs are handy for graphs, adding patch lines to commit and stuff, but to really understand how git works, you have to know commandline	15:14
eXpl0it3r	_ikke_: Seems to work, thanks again :)	15:14
	← ravi_ks_ left	15:15
xender	gurke_: Ok, going AFK now. Feel free to ask questions anytime, but I can respond with some big delay.	15:15
	\o	15:15
	thiago_ → thiago	15:15
	← ajustrun left	15:15
gurke_	thanks xender	15:15
	← pantsman- left	15:16
	→ mihaicris joined	15:16
	← weemsledeux left	15:17
	→ weemsledeux joined	15:17
	← weemsledeux left	15:17
	→ weemsledeux joined	15:17
	← souther left	15:17
	→ souther joined	15:19
	← LeMike left	15:19
	← WaReZ left	15:20
	← m0ltar left	15:21
	→ ockham joined	15:22
	→ Celm joined	15:23
	→ mkoskar joined	15:23
	← sinkensabe left	15:23
	← zhangxaochen_ left	15:24
	→ zhangxaochen_ joined	15:24
	→ a_le joined	15:25
_ikke_	nee	15:27
	eXpl0it3r: yw	15:27
	← weemsledeux left	15:27
	← prest left	15:28
	← a_le left	15:29
	→ a_le joined	15:29
	← mikiones left	15:30
	← a_le left	15:30
	← dccc_ left	15:31
	→ hydrozen joined	15:31
	→ ghostlines joined	15:34
	→ prest joined	15:34
	← tristanp left	15:35
	→ zoso joined	15:36
	→ x0s_ joined	15:37
	→ bezet joined	15:37
	← zoso left	15:37
	← PinkSpecs left	15:37
	→ dccc_ joined	15:38
	← jottr_ left	15:38
	→ zumba_addict joined	15:38
	← smerron left	15:39
	→ zoso joined	15:40
	→ kukks joined	15:40
	← Tuna-Fish left	15:41
	← mihaicris left	15:41
	← bezet left	15:41
	→ Tuna-Fish joined	15:42
	→ shigosei joined	15:44
	← atomx left	15:45
	← alexwhitman left	15:46
	← fuli_ left	15:46
	→ tristanp joined	15:47
	← msonntag left	15:47
	→ simesy joined	15:47
	→ zumba_ad_ joined	15:50
	← zumba_addict left	15:52
	→ Kayra joined	15:52
	← simesy left	15:52
	→ Rastus_Vernon joined	15:54
	← Radivarig left	15:54
	→ Radivarig joined	15:55
	← glebihan left	15:55
	→ irqq joined	15:55
	← martinklepsch left	15:56
	← mkoskar left	15:58
	← ehmatthes left	15:58
	→ mkoskar joined	15:58
	→ a_le joined	16:03
	→ EminenceHC joined	16:04
	← irqq left	16:04
	→ irqq joined	16:05
	→ frsk joined	16:07
	→ lindenle joined	16:07
	← juvenal left	16:07
	→ sohail joined	16:07
	→ Tondinahk joined	16:08
	→ juvenal joined	16:08
	← EminenceHC left	16:09
	← Muinasjutuvestja left	16:09
	→ Amandil joined	16:11
	← lindenle left	16:11
	→ joo-_ joined	16:11
	→ _thumpba joined	16:12
	→ weemsledeux joined	16:12
	← weemsledeux left	16:12
	→ weemsledeux joined	16:12
	→ PinkSpecs joined	16:13
	← Kayra left	16:13
	← jdmf left	16:13
	→ zacktu joined	16:14
	← zacktu left	16:14
	← Advocation left	16:16
	→ Gamecubic joined	16:17
	→ jeffreylevesque joined	16:18
	← jeffreylevesque left	16:18
	← joelm left	16:18
	← dccc_ left	16:19
	→ Advocation joined	16:19
	→ dccc_ joined	16:20
	← tokik left	16:22
	→ martinklepsch joined	16:22
	← zumba_ad_ left	16:24
	→ zumba_addict joined	16:25
	→ Skapadapaduu joined	16:25
	← shinnya left	16:27
	← w0bni left	16:28
	← _thumpba left	16:28
	→ subhojit777 joined	16:28
	→ w0bni joined	16:28
	← martinklepsch left	16:29
	← frsk left	16:29
	← zumba_addict left	16:30
	← PaulCapestany left	16:30
	→ PaulCapestany joined	16:32
	← morphix0 left	16:32
	→ martinklepsch joined	16:33
	→ autochthon joined	16:33
	→ jpf joined	16:34
	← Celm left	16:34
	← sohail left	16:35
	→ sohail joined	16:36
	→ voiceofgrog joined	16:40
	→ jottr_ joined	16:40
	← Trudko left	16:41
	← intellix left	16:43
	→ _Atom_ joined	16:44
	← Xiti left	16:44
	← awkwardusername left	16:44
	→ morphix0 joined	16:44
	← tristanp left	16:45
	← jottr_ left	16:45
	→ jenia joined	16:45
	← zhangxaochen_ left	16:48
	← thiago left	16:48
	→ zhangxaochen_ joined	16:48
	→ simesy joined	16:48
	→ thiago joined	16:49
	→ m0ltar joined	16:49
	→ tristanp joined	16:50
	← zoso left	16:51
	← wookienz left	16:51
	→ msonntag joined	16:51
	→ wookienz joined	16:51
	→ listochkin joined	16:52
	→ nkouevda joined	16:52
	→ koderok joined	16:52
	← simesy left	16:53
	← nkouevda left	16:56
	← evildmp left	16:57
	← hydrozen left	16:57
	← martinklepsch left	16:57
	← skylite left	16:57
	→ Celm joined	17:00
	← kukks left	17:01
	→ hoijuiL joined	17:01
	← msonntag left	17:02
	← Advocation left	17:02
	← j416 left	17:02
	← metRo_ left	17:02
	→ evildmp joined	17:03
	← eXpl0it3r left	17:04
	← shpoont left	17:04
	→ j416 joined	17:05
	→ zivester joined	17:06
	→ EminenceHC joined	17:07
	→ darkangel joined	17:07
	→ kukks joined	17:07
	→ jatt joined	17:08
	← jatt left	17:08
	→ jatt joined	17:08
	→ therealGent joined	17:09
	← therealGent left	17:09
	→ therealGent joined	17:09
	← fstd left	17:09
darkangel	(new to Git) ... if I want to clone a repo and make some changes to it, and integrate changes made to the origin repo as they occur, should I make my changes on master or on a branch?	17:09
	→ j416_ joined	17:09
	← Manny left	17:10
moritz	darkangel: typically on a branch	17:10
	→ Manny joined	17:10
darkangel	moritz: Thanks, is there a reason for this?	17:10
moritz	darkangel: it doesn't matter all that much how you do it, but the potential for confusion is lower if you do it on a separate branch	17:10
darkangel	moritz: Gotcha. Thanks.	17:11
	← johtso left	17:11
	← darkbasic left	17:11
	← stick-shift left	17:12
	← EminenceHC left	17:12
	← j416 left	17:12
	→ darkbasic joined	17:12
	gitinfo set mode: +v	17:13
skorgon	master is just a branch	17:13
pekster	The advantage of your own branch is that you can commit as much (or little) as you need, and it stays as it is even if mater changes	17:14
skorgon	master is just a local branch that does not change more than any other local branch	17:15
	← autonomousdev left	17:15
qsuscs	!master_branch	17:15
gitinfo	'master' is the default name for the first branch created by git, and it is in no way special. You can just delete it, and use more meaningful names such as 'dev' 'stable' 'unstable' 'bug/001' etc. If this is a bare repo, you will want to change the default branch(`git symbolic-ref HEAD refs/heads/somebranch`) first.	17:15
skorgon	don't confuse your local master with origin/master or any other remote's master brranch, they are different things	17:15
	→ donmichelangelo joined	17:15
qsuscs	.trigger_edit master @!master_branch	17:15
gitinfo	qsuscs: Okay.	17:15
pekster	My point was more about flexible workflow; even in a single-dev project where others won't be commiting to a common remote, the possibility of needing to shelve a task to work on a higher-priority one is eased by keeping new features on branches	17:16
	If you don't need to do a full merge back in, it'll resolve as a fast-forward and you can then delete the branch, pretending it never happened. You lose nothing besides a command to branch, to merge, and destroy it	17:17
	← michelangelo left	17:17
	← Gizburdt left	17:18
	← listochkin left	17:18
	← a_le left	17:18
	← ravi_ks__ left	17:19
	→ j416__ joined	17:19
	j416__ → j416	17:19
	→ a_l_e joined	17:21
	← j416_ left	17:22
	← madewokherd left	17:23
	→ BSaboia joined	17:24
	← m0ltar left	17:24
	← shigosei left	17:25
	← joo-_ left	17:26
	← _Atom_ left	17:26
	← User458764 left	17:27
	← iH8Pickles left	17:27
	→ rohanrhu joined	17:29
	→ sysvalve joined	17:29
	→ _Atom_ joined	17:29
	← _Atom_ left	17:29
	← therealGent left	17:30
	→ mellernoia joined	17:30
	→ ianbrandt joined	17:30
	→ nettoweb joined	17:30
	← nettoweb left	17:31
	→ nettoweb joined	17:31
	← prest left	17:31
	→ Bpit joined	17:32
	← ecky--ptang-zoob left	17:33
	← m0viefreak left	17:33
	→ ecky--ptang-zoob joined	17:33
	→ Advocation joined	17:37
	→ shpoont joined	17:37
	→ bezet joined	17:37
	← Nizumzen left	17:38
	→ mennea joined	17:38
	← Bpit left	17:39
	→ mezod joined	17:40
	→ btree joined	17:41
	← bezet left	17:42
	→ freeman42 joined	17:42
	→ joo-_ joined	17:42
	← Ornacia left	17:43
	→ EminenceHC joined	17:43
	← przemoc left	17:43
	← ciampix left	17:44
	← Celm left	17:44
	→ APerson_ joined	17:46
	← kiran left	17:46
	→ fstd joined	17:46
	→ przemoc joined	17:46
	← przemoc left	17:46
	→ przemoc joined	17:46
	← toothrot left	17:47
	→ _alan_ joined	17:47
	← EminenceHC left	17:48
	→ simesy joined	17:49
	→ toothrot joined	17:50
	← rohanrhu left	17:50
	← jpf left	17:50
	→ rohanrhu joined	17:51
darkangel	Hmm. So there's really no reason for a separate branch unless it's multiple devs working on changes?	17:51
	→ msonntag joined	17:52
	← Advocation left	17:52
	→ kaendfinger joined	17:53
cbreak	darkangel: it's also nice ifyou work on changes	17:53
	→ Xiti joined	17:53
cbreak	darkangel: or if you want to merge branches with --no-ff for history preservation	17:53
	← simesy left	17:53
darkangel	cbreak: We're going to clone a GitHub repo, apply our changes, and keep the branch up-to-date with the origin, and possibly add more customizations. Right now, it's just myself working on the customizations.	17:54
	→ listochkin joined	17:55
	→ frsk joined	17:55
	frsk → Guest40266	17:55
	← tristanp left	17:55
	Guest40266 → frsk	17:56
faheem___	is a similar workflow to this hg one posible in git? hg up earlier_rev, apply patches, rebase commits corresponding to patches to tip? the scenario is where we have patches that don't apply to tip, but apply to an earlier version, and we want to invoke merge machinery to help us.	17:56
	← Rastus_Vernon left	17:57
	→ Celm joined	17:58
	→ jpf joined	17:58
	→ giusef joined	17:59
	← kaendfinger left	18:00
	← albel727 left	18:03
	← BlakeRG left	18:03
	← Not_Whatever left	18:04
	→ thumpba_ joined	18:05
	← evildmp left	18:05
	→ kaendfinger joined	18:06
	← gurke_ left	18:07
	→ prest- joined	18:07
	← mennea left	18:07
	← King_Hual left	18:08
	→ mennea joined	18:08
	→ EminenceHC joined	18:08
	→ maestrojed joined	18:08
	→ King_Hual joined	18:08
charon	faheem___: git am -3 uses a 3-way merge while applying patches	18:09
	if that doesn't work, you can git checkout -b branchname oldcommit; git am patches; git rebase master	18:09
	← listochkin left	18:10
	→ a_le joined	18:10
	← a_le left	18:10
charon	am -3 relies on 'index' lines and the base version being available in your repo. then again if the base version is not available, finding a suitable 'oldcommit' may be tricky	18:10
	→ evildmp joined	18:11
	→ kiran joined	18:12
	→ rfk joined	18:12
	← Akagi201_ left	18:12
darkangel	I'm trying to do this: "Move an existing Git repository" (http://support.beanstalkapp.com/customer/portal/articles/75767-getting-started-with-git-creating-your-repository) -- when I do so, it says "No refs in common and none specified; doing nothing."	18:12
	→ Akagi201 joined	18:12
rfk	trying to execute a git subtree split, but one of the commits apparently has an empty ident, which fails the command - possible to 'force' the subtree split?	18:13
	← EminenceHC left	18:13
	← segfalt left	18:14
darkangel	I assume I'm supposed to use --all, but if the docs don't say that then I hope I'm not screwing something up.	18:14
	← evildmp left	18:15
	→ oriba joined	18:15
	→ mechanicalduck_ joined	18:15
charon	darkangel: "moving" is a funny verb to use for pushing	18:15
darkangel	charon: I cloned a GH repo which I'm trying to get into Beanstalk	18:16
	→ daito joined	18:16
	→ evildmp joined	18:16
	← evildmp left	18:16
darkangel	charon: So I should all --all ?	18:17
	*use	18:17
	← maestrojed left	18:17
	→ fstd_ joined	18:18
	← mechanicalduck left	18:18
	→ evildmp joined	18:18
	← evildmp left	18:18
	→ evildmp joined	18:18
	← fstd left	18:18
	fstd_ → fstd	18:18
	→ endiruna joined	18:19
	→ Gizburdt joined	18:19
	→ anaran joined	18:20
	→ ArSn joined	18:22
	← Gizburdt left	18:23
	→ magic_ joined	18:24
	→ Amandil\|2 joined	18:24
	→ tristanp joined	18:24
	← daito left	18:24
	← onyekaa left	18:24
	← Amandil left	18:26
	← thumpba_ left	18:26
	→ il joined	18:27
	Xack → CaveJohnson	18:28
	→ stick-shift joined	18:29
	← tristanp left	18:29
	→ mihaicris joined	18:29
	→ Zupoman joined	18:29
	← Amandil\|2 left	18:29
	← giusef left	18:29
	← mihaicris left	18:29
	→ Gizburdt joined	18:30
	→ Amandil joined	18:32
	→ Lyqyd joined	18:33
	← mkoskar left	18:35
	→ _thumpba joined	18:35
	← JEEB left	18:35
	→ autonomousdev joined	18:36
	← ghostlines left	18:36
	→ CraigyDavi joined	18:37
	→ JEEB joined	18:37
	← mennea left	18:37
	→ mennea joined	18:38
	← Vinnie_win left	18:38
	→ splud joined	18:38
	← splud left	18:39
charon	darkangel: yes, why not... at least if you want to push all branches :-)	18:40
	→ outreach joined	18:41
darkangel	charon: Yep, it works. I was just confused by the Beanstalk docs. :)	18:41
	← Gizburdt left	18:42
	← jargon left	18:42
	← moritzschaefer left	18:43
	← waveclaw left	18:43
	→ iH8Pickles joined	18:43
	→ jargon joined	18:43
	← outreach left	18:45
	← _thumpba left	18:45
	→ pothibo joined	18:46
	← jatt left	18:47
	→ mkoskar joined	18:47
	→ _Atom_ joined	18:48
	← diegoaguilar left	18:49
	→ simesy joined	18:50
	→ albel727 joined	18:50
	← badcom left	18:51
	→ jceb joined	18:51
	← raijin left	18:52
	← x0s_ left	18:53
	→ _thumpba joined	18:53
	← simesy left	18:54
	→ starkhalo joined	18:55
	← pothibo left	18:55
	← morphix0 left	18:56
	← _thumpba left	18:56
	→ raijin joined	18:57
	→ Walex2 joined	18:58
	← Walex2 left	18:59
	→ Advocation joined	18:59
	← teran left	18:59
	← Glitches left	19:00
	→ tristanp joined	19:00
	→ unixpro1970 joined	19:01
	→ watabou joined	19:01
	→ nour_ joined	19:01
	← Goplat left	19:02
	← codeman left	19:02
	→ CKyle joined	19:02
	← nour left	19:05
	← kukks left	19:06
	→ giusef joined	19:06
	← AKK9 left	19:07
	← mennea left	19:07
	→ mennea joined	19:08
	→ morphix0 joined	19:10
	← Manny left	19:10
	→ EminenceHC joined	19:10
	→ Manny joined	19:10
	← upene left	19:10
	→ upene joined	19:10
	→ jottr_ joined	19:11
	← Sleepy63 left	19:13
	← koderok left	19:13
	→ upene1 joined	19:14
	← Junior left	19:14
	← EminenceHC left	19:14
	→ mikiones joined	19:15
	← anaran left	19:15
	← upene left	19:15
	← CKyle left	19:16
	← kaendfinger left	19:17
	← a_l_e left	19:17
	→ listochkin joined	19:17
	→ ajustrun joined	19:17
	→ Xethron joined	19:19
	← Xethron left	19:19
	→ Xethron joined	19:19
	→ pantsman- joined	19:20
	← Xethron left	19:20
	← kiran left	19:21
	→ Nizumzen joined	19:23
	→ Xethron joined	19:24
	← Xethron left	19:24
	→ Xethron joined	19:24
	← tristanp left	19:25
	← upene1 left	19:26
	← Xethron left	19:27
	← devoldmx left	19:28
	← sohail left	19:28
	← jenni_naiaretti left	19:29
	← endiruna left	19:30
	→ sebumd joined	19:30
	→ kaendfinger joined	19:30
	sebumd → scottbuckel	19:31
	← _Atom_ left	19:32
	← zhangxaochen_ left	19:32
	→ dreiss joined	19:33
	→ zhangxaochen_ joined	19:33
	→ badcom joined	19:34
	→ upene joined	19:35
	← shpoont left	19:35
	→ boombatower joined	19:36
	← angelsl left	19:36
	← mennea left	19:37
	→ bezet joined	19:37
	→ mennea joined	19:38
	→ onyekaa joined	19:38
	← upene left	19:39
	← Tuna-Fish left	19:42
	← bezet left	19:42
	→ Tuna-Fish joined	19:42
	← kaendfinger left	19:43
	→ Gizburdt joined	19:43
	→ kyb3r_ joined	19:43
	→ tristanp joined	19:45
	← zivester left	19:45
	← mjuli left	19:45
	← dreiss left	19:46
	← nettoweb left	19:46
	→ mutley89 joined	19:46
	← weemsledeux left	19:47
	← Gizburdt left	19:48
	→ jonmorehouse joined	19:48
	→ simesy joined	19:50
	→ devoldmx joined	19:54
	← autochthon left	19:54
	← toothrot left	19:54
	← simesy left	19:55
	→ madewokherd joined	19:56
	→ dreiss joined	19:58
	← tristanp left	20:00
	→ cagedwisdom joined	20:02
	→ desposo joined	20:04
	→ shpoont joined	20:04
	← il left	20:05
	→ refried_ joined	20:07
	← mennea left	20:08
	→ mennea joined	20:08
	← ItSANgo_ left	20:08
	→ ItSANgo joined	20:08
	← ItSANgo left	20:09
	→ teran joined	20:09
	→ ItSANgo__ joined	20:09
	← unixpro1970 left	20:10
	→ aidalgol joined	20:12
	→ rt joined	20:13
	rt → Guest35080	20:13
	→ EminenceHC joined	20:13
	→ tristanp joined	20:14
	← Manny left	20:16
	← ecky--ptang-zoob left	20:16
	→ ecky--ptang-zoob joined	20:16
	← BSaboia left	20:17
	→ Manny joined	20:17
	← stick-shift left	20:18
	← EminenceHC left	20:18
	→ nnyk_ joined	20:18
Remram	How can I tell whether the working directory is clean, from a script?	20:20
qsuscs	Remram: git status --porcelain	20:20
	← Advocation left	20:20
	← PinkSpecs left	20:20
Remram	Should I just look for an empty output?	20:20
	→ PinkSpecs joined	20:21
qsuscs	yes	20:22
	or if you care about ignored files, add --ignored, see man git status	20:22
gitinfo	the git-status manpage is available at http://jk.gs/git-status.html	20:22
	→ Skvoretz joined	20:22
	→ FooDStamP joined	20:23
	← freeman42 left	20:24
	→ nettoweb joined	20:25
	← nettoweb left	20:25
	→ freeman42 joined	20:26
	← desposo left	20:26
	← Guest35080 left	20:26
	← subhojit777 left	20:26
Remram	I don't ignore files	20:26
	→ Guest35080 joined	20:26
	→ nettoweb joined	20:26
	→ rtabarna joined	20:26
	← darkangel left	20:27
	← APerson_ left	20:27
	← rtabarna left	20:27
	→ rtabarna joined	20:27
	→ codeman joined	20:27
	← freeman42 left	20:28
	← ivanshmakov left	20:30
Remram	hmm I kinda wanted to ignore the index	20:30
	← Guest35080 left	20:30
	gitinfo set mode: +v	20:31
	← moshR left	20:32
rtabarna	is it possible to update a file in a pre-receive hook?	20:33
	← hoijuiL left	20:33
	← giusef left	20:35
	→ errietta joined	20:35
	→ Guest35080 joined	20:36
Remram	rtabarna: If you change files you will change the commit hash	20:36
	← Skvoretz left	20:36
	← badcom left	20:36
	→ ivanshmakov joined	20:36
	← phantombeta left	20:37
	→ treaki_icedove joined	20:37
	← mennea left	20:37
	← rtabarna left	20:38
	→ mennea joined	20:38
	gitinfo set mode: +v	20:38
	gitinfo set mode: +v	20:38
treaki_icedove	hi folks	20:38
gitinfo	treaki_icedove: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	20:38
treaki_icedove	i like using git-svn to use svn repositorys as they where gitones	20:39
	but can i do that also with mercury repros?	20:39
	← tristanp left	20:39
	→ tristanp joined	20:41
Guest35080	git-remote-hg	20:42
	→ phantombeta joined	20:44
	→ Gizburdt joined	20:44
	← BlaXpirit left	20:44
	← jjardon left	20:44
	← Guest35080 left	20:45
	→ Guest35080 joined	20:45
	← Amandil left	20:47
	← vurma left	20:48
	← Gizburdt left	20:49
	→ xxtjaxx joined	20:49
	→ vurma joined	20:50
	← jonmorehouse left	20:50
	→ simesy joined	20:51
	← Guest35080 left	20:52
	→ jonmorehouse joined	20:53
	→ corni joined	20:55
	← Radivarig left	20:55
	← simesy left	20:55
	→ Radivarig joined	20:56
xxtjaxx	Hi! Maybe I've misunderstood a couple of things about merging/branches/git. So I have a clone of a repositories branch (gh-pages) and added a new branch to that clone called gh-pages-merge that is based on gh-pages. after that I went and add a remote from another repository named arnaud, from that I fetched the branch gh-pages into my gh-pages-merge branch. after resolving the problems presented to me I commited the merge changes and	20:57
	wanted to push them but it says everything up to date but I can't see my gh-pages-merge branch in my origin repository.	20:57
	← skered left	20:57
	→ jimmyy joined	20:57
	← jimmyy left	20:58
	→ simesy joined	20:58
	→ jimmyy joined	20:58
	→ BlaXpirit joined	20:58
	← simesy left	21:02
	← jpf left	21:03
	→ neversleepz joined	21:04
	← Tuna-Fish left	21:04
	← ajustrun left	21:08
	→ mennea_ joined	21:08
	← mennea left	21:08
	→ MutSbeta joined	21:09
	← errietta left	21:09
	← Manny left	21:10
	→ Manny joined	21:10
	→ livingstn joined	21:10
	← Jackneill left	21:11
	← prest- left	21:11
	← jceb left	21:13
	→ toothrot joined	21:13
	→ Tuna-Fish joined	21:15
	→ yates joined	21:16
yates	is there a way to get the revision number and/or hash number from a tag?	21:16
	i sure don't see how with git tag	21:16
	that's frustrating. i would expect to be able to pull this info as well as date somehow with the git tag -l <tag-name> command	21:17
	← evildmp left	21:18
	← mennea_ left	21:19
	← Oebele left	21:20
	→ evildmp joined	21:21
	→ tener joined	21:22
	← morphix0 left	21:22
	← BlaXpirit left	21:23
	→ Goplat joined	21:23
skorgon	yates: git show?	21:24
	→ hydrozen joined	21:24
	← hydrozen left	21:25
yates	does git fetch retrieve tags?	21:25
	→ BlaXpirit joined	21:25
	→ mihaicris joined	21:25
	→ devoldmx3 joined	21:25
	← evildmp left	21:26
yates	skorgon: yes, but that's a crazy user interface: git tag let's you do everything with tags except show the complete info?!?	21:26
	← devoldmx left	21:27
	→ evildmp joined	21:27
	← dreiss left	21:28
	← nnyk_ left	21:29
	← fstd left	21:29
	→ Sleepy63 joined	21:31
	→ hahuang65 joined	21:31
	→ behem0th joined	21:31
	← evildmp left	21:32
	← tristanp left	21:32
	→ evildmp joined	21:32
	→ whitby joined	21:33
	→ fstd joined	21:35
	← whitby left	21:35
	← hahuang65 left	21:36
	← jonmorehouse left	21:37
	→ bezet joined	21:38
	← xxtjaxx left	21:38
	← fstd left	21:38
	→ skylite joined	21:38
	→ jast joined	21:39
	← mihaicris left	21:40
	→ Mannequin joined	21:40
	→ jonmorehouse joined	21:40
	← behem0th left	21:40
	→ fstd joined	21:41
	← bezet left	21:42
	→ dreiss joined	21:44
rfk	trying to split a directory off into its own branch with git subtree split. however one of my commits seems to have an empty ident, and this seems to be causing the split command to fail. is there any way around this?	21:45
	i could just splice that commit out, i doubt it's important in this case, but thought i'd ask in case there's a better way	21:45
	→ devoldmx joined	21:45
	→ jpf joined	21:46
	← fstd left	21:46
	← jpf left	21:46
skorgon	yates: well, tags just point to commits and to look at a commit you use show...	21:46
	→ jpf joined	21:47
	← Mannequin left	21:47
	← devoldmx3 left	21:47
	← Zupoman left	21:48
	→ devoldmx3 joined	21:49
	← danillonunes left	21:49
	→ danillonunes joined	21:49
	← deuti left	21:49
	← jimmyy left	21:49
	← devoldmx left	21:50
	← livingstn left	21:51
	← shpoont left	21:51
	→ _thumpba joined	21:52
	← nour_ left	21:54
yates	is there a rev number associated with each hash?	21:54
	← Nizumzen left	21:55
	→ fatalhalt joined	21:55
	← _thumpba left	21:56
kadoban	yates: The only identifying number is the hash itself. Some usages you may be looking for one for can be handled by some usage of 'git describe'	21:56
ToxicFrog	yates: SVN or P4 style? No.	21:56
	→ therebel joined	21:57
	→ ajustrun joined	21:57
	→ tristanp joined	21:58
	→ simesy joined	21:59
	→ mscook joined	21:59
yates	ok, thanks	22:00
	← skylite left	22:00
	→ _thumpba joined	22:00
	→ ciampix joined	22:01
	→ it0a joined	22:01
yates	how do i see the log information of just one commit instead of a range? git log seems to only operate on a range	22:01
skorgon	git show	22:02
yates	-n	22:02
skorgon	or git log with a range expression that includes only one commit	22:02
	or that	22:02
kadoban	Or just git log and don't look down...	22:02
	← mscook left	22:03
skorgon	so many options :)	22:03
	→ DanMAbraham joined	22:03
	← simesy left	22:03
	← dreiss left	22:03
yates	i find gits commands unorganized and illogical. i'm going to ask for my money back.	22:04
skorgon	yates: you're not alone http://stevelosh.com/blog/2013/04/git-koans/	22:04
	← ajustrun left	22:04
	← Noldorin left	22:04
	→ badcom joined	22:05
	→ ajustrun joined	22:06
	→ Noldorin joined	22:06
	→ wakd_ joined	22:07
yates	me and the Hobgoblin?	22:07
	→ nkouevda joined	22:07
yates	cute	22:07
	← fatalhalt left	22:08
	← wakd left	22:09
	→ kukks joined	22:09
	→ fatalhalt joined	22:10
	→ robarelli joined	22:10
	← ajustrun left	22:10
	→ WaReZ joined	22:11
	← Skapadapaduu left	22:11
	→ lindenle joined	22:12
	← irqq left	22:12
	← duckydan left	22:13
	→ irqq joined	22:13
	→ prest- joined	22:13
	→ Mannequin joined	22:13
	← jave left	22:14
	← Kwpolska left	22:15
	← therebel left	22:15
	← leeN left	22:16
	→ mikiones_ joined	22:16
	← lindenle left	22:17
	→ stick-shift joined	22:17
	← irqq left	22:18
	→ jave joined	22:18
	← mikiones left	22:19
	← jonmorehouse left	22:19
	→ ag4ve joined	22:19
	→ EminenceHC joined	22:19
	→ duckydan joined	22:20
	→ BlaXpirit-UA joined	22:20
	← WaReZ left	22:21
	← Radivarig left	22:21
	→ Radivarig joined	22:21
	→ therealGent joined	22:21
	→ Kwpolska joined	22:22
	← BlaXpirit left	22:22
qsuscs	git is only really illogical if you’re used to something else (e.g. !svn)	22:22
gitinfo	[!notsvn] This is not Subversion. Forget your old habits, the only thing it’ll get you is pain and other people laughing at you.	22:22
qsuscs	see, i find mercurial sort of confusing	22:22
kadoban	It has quite a few inconsistant parts at the very least.	22:23
	→ bollullera joined	22:23
	→ mscook joined	22:23
	← Mannequin left	22:23
	→ roknir joined	22:23
	← onyekaa left	22:24
	→ onyekaa joined	22:24
qsuscs	probably, i find it very usable nevertheless	22:24
kadoban	Sure, me too.	22:24
	← EminenceHC left	22:24
	← onyekaa left	22:24
Remram	Does the update hook run for local pushs?	22:25
	→ onyekaa joined	22:25
	← mscook left	22:26
	→ jrahmy joined	22:27
	← m8 left	22:29
	← robbyoconnor left	22:29
	→ irc_smirk joined	22:29
irc_smirk	hello	22:29
	← it0a left	22:30
irc_smirk	im new to git and i had a question on how poeple use it	22:30
	→ it0a joined	22:30
irc_smirk	so basically i do web development and so sometimes i do some php some times some node some times some js etc	22:30
	← jottr_ left	22:30
	← it0a left	22:30
	← _alan_ left	22:30
irc_smirk	now what i like about git is you can go into any directory and type 'git' and it will track just that directory	22:31
	so how would i use git in various different dirrectories	22:31
	if i want to use these unrelated projects in one project then i update the other projectxs how would i do a git refresh	22:32
	sorry if i dont explain myself right	22:32
	basically i want to independently upate other projects/folders but have the one project that uses them to also update	22:33
	← oriba left	22:33
skorgon	!subprojects	22:34
gitinfo	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.	22:34
	→ m0viefreak joined	22:35
	← jargon left	22:35
irc_smirk	ack this can get confusing	22:35
	→ dreiss joined	22:37
	→ Vivekananda_y510 joined	22:37
	← tener left	22:38
kadoban	irc_smirk: Generally it's not that complicated. Usually you just have one repo per project, whatever you consider a project, and some kind of links between them, largely without embedding projects	22:38
	← evildmp left	22:38
irc_smirk	yes . in my case i have some front end code and various backend pieces	22:39
	and i want them to be updated on my various deploy points	22:39
	maybe this is out of the scope of git and i need to look into an organizing script	22:39
	→ msmith_ joined	22:40
pekster	Depends a bit how related the components are. Usually you want things realted to each logical purpose in a single repo, but it depends greatly on your workflow and deployment needs	22:40
	→ Mannequin joined	22:40
	→ jottr_ joined	22:40
	→ simesy joined	22:40
	← ArSn left	22:40
qsuscs	!deploy	22:41
gitinfo	Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html	22:41
	← zhangxaochen_ left	22:41
	← thiago left	22:41
	→ evildmp joined	22:41
	→ irc_smirk_ joined	22:42
	← evildmp left	22:43
	← irc_smirk_ left	22:43
	→ evildmp joined	22:43
	← irc_smirk left	22:43
	← listochkin left	22:44
qsuscs	a .gitignore in a SVN repo	22:44
	wtf openwrt	22:44
	← simesy left	22:45
kadoban	Hah	22:45
	→ jonmorehouse joined	22:45
qsuscs	they recommend git to get the sources, but obviously use SVN	22:45
	the git mirrors are a single repo for every branch and trunk	22:46
	*are single repos	22:46
	← Mannequin left	22:46
	← King_Hual left	22:47
	← ianbrandt left	22:47
	← corni left	22:47
	→ MattMaker joined	22:48
	← pantsman- left	22:48
	→ ianbrandt joined	22:49
	→ jimmyy joined	22:52
	→ irc_smirk joined	22:52
	← jimmyy left	22:52
	← ianbrandt left	22:52
	→ jimmyy joined	22:53
	← jrahmy left	22:55
irc_smirk	browser crashed	22:55
	so would i get my externally hosted server grab code off my local git repository	22:56
	or my local box has to be externally accessible?	22:57
	→ Mannequin joined	22:57
	→ sinkensabe joined	22:58
	→ smerron joined	22:58
	→ zumba_addict joined	22:58
	← fatalhalt left	23:00
	← hidekin left	23:01
	← nettoweb left	23:02
	← Kicer86 left	23:02
	← Tondinahk left	23:03
	→ fuli joined	23:03
	→ maqr joined	23:05
	→ Juzzika joined	23:05
	→ a_le joined	23:09
	← fuli left	23:10
	← Manny left	23:10
	→ fuli joined	23:10
	→ Manny joined	23:10
	→ fatalhalt joined	23:12
	← Mixologic left	23:12
	← stick-shift left	23:12
	→ Mixologic joined	23:13
	← msmith_ left	23:17
	← dsdeiz left	23:17
	→ dsdeiz joined	23:17
	← bdavenport left	23:18
	← fuli left	23:18
	← sinkensabe left	23:18
	← evildmp left	23:18
	→ randiman joined	23:23
	→ _Atom_ joined	23:23
	← tristanp left	23:25
	→ hexagoxel_ joined	23:26
	← ag4ve left	23:26
	→ tristanp joined	23:26
	→ _alan_ joined	23:26
	← prest- left	23:28
	← zumba_addict left	23:29
	← hexagoxel left	23:29
	← toothrot left	23:29
	→ zumba_addict joined	23:29
	← mkoskar left	23:30
	← randiman left	23:32
	← vurma left	23:33
irc_smirk	how do i get "git log" to show me the file names not the object id	23:34
	never mind	23:34
pekster	qsuscs: Yea, the one advantage is that you can query history offline after you do a git clone. Depends a bit on how you intend to use the sources	23:36
	The "stick the svn rev into the git log" is rather odd, though. git seems to be a snapshot mechanism, and some of the docs suggest using svn if git things don't work for some reason, such as the feeds	23:36
	→ robbyoconnor joined	23:37
	← robbyoconnor left	23:37
	→ bezet joined	23:38
	← Marcus_ left	23:38
	→ kadoban_ joined	23:39
	→ Marcus_ joined	23:39
	→ robbyoconnor joined	23:39
	→ jontmorehouse joined	23:39
	← jonmorehouse left	23:41
	← frsk left	23:41
	→ simesy joined	23:41
	← kadoban left	23:41
	← bezet left	23:42
	← Marcus_ left	23:44
	← simesy left	23:46
	← gdoteof left	23:46
	← onyekaa left	23:46
	← zumba_addict left	23:47
	→ onyekaa joined	23:47
	→ zumba_addict joined	23:48
	← _Atom_ left	23:49
	← oojacoboo left	23:49
	→ jacobt joined	23:49
	← jottr_ left	23:50
	← refried_ left	23:50
irc_smirk	how do i undo this git commit -m "playlist function"	23:51
	i think it added a bunch of files in my directory	23:51
jast	git reset --soft HEAD~	23:51
	throws away the commit but not the changes in your working tree and index	23:52
irc_smirk	ah green again thank you	23:52
jast	unlike --hard (which does throw those away and they tend to be impossible to restore) :)	23:52
	→ tener joined	23:53
irc_smirk	ah you are kind then	23:53
	← tristanp left	23:54
irc_smirk	* scratches head on how all this stuff is working under the hood (!!)	23:54
	← tener left	23:54
	← robbyoconnor left	23:55
	→ shinnya joined	23:55
	← FooDStamP left	23:55
jast	it's not so complicated, really	23:55
	here's what happens in a nutshell: 'git add' and friends add a copy of your physical file(s) to the index/staging area, for inclusion in your next commit	23:56
	committing takes the index and makes a commit out of all the stuff in it	23:56
	then the commit is put on top of your branch (e.g. master), by changing the branch "pointer" to point to that commit instead of the previous topmost one	23:56
irc_smirk	you lost me already lol	23:56
jast	heh	23:56
	oh well	23:57
	here's some pictures: !gcs	23:57
gitinfo	[!concepts] "Git Concepts Simplified" explains the basic structures used by git, which is very helpful for understanding its concepts. http://gitolite.com/gcs.html	23:57
irc_smirk	haha	23:57
	← kriks left	23:57
irc_smirk	if its simple then its genius	23:57
	so i think i get the branch thing	23:58
	but why would i use tag	23:58
jast	well... suppose you're developing a piece of software, and you have a main branch	23:58
	every now and then you cut a release from it and give it a version number	23:58
	e.g. 1.0, 1.1, 1.2, whatever	23:58
	you don't necessarily want to make a branch for each of those, but maybe you want to remember exactly what was in each version. that's basically the main purpose of tagging.	23:59
	→ fstd joined	23:59
jast	you tag whatever's on top of the branch at the time you release, and put the version number in the tag name (for example). now you have a complete history of all versions you ever released.	23:59

Logs Search ←Prev date Next date→

Channels Documentation