IRCloggy #git 2015-07-14

Provider of IRC logs since 2005.

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

	2015-07-14
	← Nizumzen left	00:00
	→ Jsy joined	00:02
	← Jsy left	00:03
	→ jsnowball joined	00:04
	→ fumihiro joined	00:05
	→ pol joined	00:06
	← pol left	00:06
	← scottbot84 left	00:06
	← nfk left	00:06
	← quazimodo left	00:08
	→ quazimodo joined	00:09
	→ jottr_ joined	00:09
	→ dgutierrez1287 joined	00:10
	→ nfk joined	00:10
	→ Xiwuj joined	00:10
	← Xiwuj left	00:10
	→ CKyle joined	00:10
	→ Euuuu joined	00:11
	← Euuuu left	00:11
	→ SimonNa joined	00:12
	→ radialneon joined	00:12
	→ ayte joined	00:12
	← ayte left	00:13
	→ CEnnis91 joined	00:13
	→ Maple__ joined	00:13
	← jottr_ left	00:14
	→ darkschneider joined	00:14
	→ nnyk joined	00:15
	→ linuxboytoo joined	00:16
	→ Xeega joined	00:17
	← Xeega left	00:17
	→ enkus joined	00:18
	← enkus left	00:18
	→ faux___ joined	00:18
	← theCole left	00:19
	← dgutierrez1287 left	00:20
	→ fatalhalt joined	00:20
	← linuxboytoo left	00:20
	→ SpeakerToMeat joined	00:22
	→ tgunr joined	00:23
	← fumihiro left	00:24
	→ Sly_1986 joined	00:24
	→ Dougie187 joined	00:24
	→ fstd joined	00:25
	→ Zamyatin joined	00:25
	← Zamyatin left	00:26
	→ pqcpx joined	00:27
	→ Zamyatin joined	00:27
	← pqcpx left	00:27
	← Sly_1986 left	00:29
	→ GPrime joined	00:29
	← GPrime left	00:30
	→ phantombeta joined	00:30
	→ owf joined	00:32
	← owf left	00:32
	→ pm90_ joined	00:33
	→ tristanp joined	00:34
	← stantonk left	00:34
	→ ekain joined	00:34
	→ stantonk joined	00:36
	← stantonk left	00:36
	→ jimmiejohnson joined	00:36
	← foist left	00:36
	← jimmiejohnson left	00:37
	→ jimmiejohnson joined	00:37
	→ linuxboytoo joined	00:37
	→ Maple___ joined	00:37
	→ mrhariseldon joined	00:38
	← Maple___ left	00:38
	→ Maple___ joined	00:38
	← Maple__ left	00:38
	← phantombeta left	00:39
	← mrhariseldon left	00:39
	→ dgutierrez1287 joined	00:39
	→ Iniglo joined	00:41
	→ phantombeta joined	00:41
	→ francjay_ joined	00:41
	← Iniglo left	00:41
	← tristanp left	00:45
	← jimmiejohnson left	00:46
	→ tristanp joined	00:46
	→ jimmiejohnson joined	00:46
	← francjay_ left	00:48
	→ francjay_ joined	00:49
	→ neanderslob joined	00:50
	→ fumihiro joined	00:51
	← tristanp left	00:51
	← thedodd left	00:51
	→ tristanp joined	00:51
	← phantombeta left	00:52
	→ Orbitrix joined	00:52
	← Orbitrix left	00:52
	→ xcesariox joined	00:52
	→ ArchDebian joined	00:52
	← fatalhalt left	00:52
	→ Orbitrix joined	00:53
	← Orbitrix left	00:53
	→ Orbitrix joined	00:53
	← jteneyck left	00:53
	→ jteneyck joined	00:54
	← gutocarvalho left	00:54
	← tristanp left	00:55
	→ tristanp joined	00:56
	→ jfran joined	00:57
	→ EricPoe joined	00:57
	← francjay_ left	00:57
	→ nickypesos joined	00:58
	← fstd left	00:58
	← jteneyck left	00:58
	← nfk left	00:59
	→ pullphinger joined	00:59
	→ fstd joined	00:59
	→ Sly_1986 joined	01:00
	→ francjay_ joined	01:00
	← jfran left	01:00
	← dgutierrez1287 left	01:01
	← francjay_ left	01:01
	→ Lyqyd joined	01:01
	→ dgutierrez1287 joined	01:01
	← jimmiejohnson left	01:01
	→ francjay_ joined	01:01
	→ unreal joined	01:02
	→ axsuul joined	01:04
	← eletuchy left	01:04
	← axsuul left	01:04
	→ ibxr joined	01:04
	← ibxr left	01:04
	← pr0metheu5 left	01:05
	→ therealssj joined	01:05
	← duderonomy left	01:05
	← Voyage left	01:08
	→ Iict joined	01:08
	← Iict left	01:08
	→ jfran joined	01:09
	→ ascarter joined	01:09
	← francjay_ left	01:09
	→ espindola joined	01:10
	← tristanp left	01:11
	← jfran left	01:11
	→ jfran joined	01:11
	→ jufoo joined	01:12
	→ jimmiejohnson joined	01:12
	← jufoo left	01:12
	← nickypesos left	01:14
	← espindola left	01:14
	→ m0ltar joined	01:17
	→ daito joined	01:17
	→ osxi joined	01:17
	→ scottbot84 joined	01:18
	← daito left	01:18
	← jfran left	01:18
	← _Atom_ left	01:19
	→ daito joined	01:19
	→ jfran joined	01:19
	← daito left	01:19
	→ daito joined	01:19
	← Orbitrix left	01:19
	← pm90_ left	01:20
	→ francjay_ joined	01:21
	← jfran left	01:21
	← nnyk left	01:21
	→ tomog999 joined	01:21
	→ ropav joined	01:22
	← francjay_ left	01:22
	← osxi left	01:23
	→ francjay_ joined	01:23
	← mscook left	01:23
	← francjay_ left	01:23
	← dgutierrez1287 left	01:24
	→ dgutierrez1287 joined	01:25
	→ osxi joined	01:25
	→ eqc joined	01:25
	← eqc left	01:25
	← jsnowball left	01:26
	→ gopar joined	01:27
	→ Orbitrix joined	01:27
	← Orbitrix left	01:27
	→ Orbitrix joined	01:27
	← fission6 left	01:27
	→ mscook joined	01:28
	→ Goplat joined	01:29
	→ Nick-S joined	01:31
	→ nobso joined	01:31
	→ jsnowball joined	01:31
	← radialneon left	01:32
	→ Uycua joined	01:32
	← Uycua left	01:32
	→ JosephSilber joined	01:33
	← JosephSilber left	01:33
	→ phantombeta joined	01:33
	→ JosephSilber joined	01:34
	→ maletor joined	01:34
	→ ghanima joined	01:34
	→ radialneon joined	01:34
	→ radialneon_ joined	01:35
	← radialneon_ left	01:35
	← radialneon left	01:35
	→ radialneon joined	01:36
	→ Miesco joined	01:36
	← pheaver left	01:37
	← faux___ left	01:37
	→ jfran joined	01:37
	← jimmiejohnson left	01:38
	→ pks joined	01:39
	→ otter768 joined	01:40
	← jfran left	01:42
	→ jfran joined	01:42
	→ francjay_ joined	01:43
	→ duderonomy joined	01:43
	← jfran left	01:44
	→ Vampire0 joined	01:44
	← scottbot84 left	01:45
	← otter768 left	01:45
	← Oog left	01:45
	→ jokester joined	01:46
	→ fission6 joined	01:46
	→ stantonk joined	01:47
	← EricPoe left	01:47
	→ EricPoe joined	01:49
	← SimonNa left	01:49
	→ durham joined	01:49
	← francjay_ left	01:49
	→ jfran joined	01:49
	← CKyle left	01:49
	→ gutocarvalho joined	01:50
	→ nobso_ joined	01:51
	← fayimora left	01:51
	→ _Atom_ joined	01:52
	→ Poio joined	01:52
	← Poio left	01:52
	← nobso left	01:53
	nobso_ → nobso	01:53
	← stantonk left	01:53
	→ Pkpi joined	01:54
	← Pkpi left	01:54
	→ dreiss joined	01:54
	← maletor left	01:54
	→ snthsnth joined	01:54
	→ ClearC2 joined	01:55
	→ rpg joined	01:56
	→ gamename joined	01:56
	→ ojacobson joined	01:57
	→ lolmac joined	01:57
	→ dwz joined	01:57
	← ropav left	01:58
	← durham left	01:59
	← dwz left	01:59
	→ MattMake_ joined	01:59
	← m0ltar left	02:00
	← ClearC2 left	02:00
	→ eletuchy joined	02:00
	← ntio left	02:00
	→ ntio joined	02:00
	→ ajyb joined	02:00
	→ Thra11 joined	02:01
	← ajyb left	02:01
	← jsnowball left	02:03
	→ harish joined	02:03
	← dgutierrez1287 left	02:05
	→ dcpc0072 joined	02:05
	→ fahadash joined	02:06
	← fahadash left	02:06
	→ fahadash joined	02:06
	← fahadash left	02:06
	→ fahadash joined	02:06
	→ s8321414 joined	02:06
	→ mizu_no_oto joined	02:06
	→ waveclaw joined	02:06
	← gamename left	02:07
	→ gamename joined	02:08
	→ jottr_ joined	02:09
	← MattMake_ left	02:10
	← therealssj left	02:10
	→ faux___ joined	02:11
	← ojacobson left	02:12
	→ gbit86 joined	02:12
	→ ojacobson joined	02:12
	→ cmoneylulz joined	02:14
	← jottr_ left	02:14
	→ variable joined	02:15
	→ francjay_ joined	02:15
	← ascarter left	02:15
	← jfran left	02:15
	→ aia joined	02:16
	← aia left	02:16
	← dreiss left	02:16
	→ pcypher joined	02:17
	→ Ujrlq joined	02:18
	← osxi left	02:18
	← Ujrlq left	02:18
	← faux___ left	02:18
	→ durham joined	02:19
	← francjay_ left	02:19
	→ faux___ joined	02:19
	→ MattMaker joined	02:19
	→ jfran joined	02:20
	→ Iqw joined	02:20
	← durham left	02:20
	← Iqw left	02:20
	→ durham joined	02:21
	← jfran left	02:21
	→ jfran joined	02:22
	← gamename left	02:22
	→ bronson joined	02:23
	← variable left	02:23
	→ gamename joined	02:23
	← gamename left	02:23
	← faux___ left	02:24
	→ variable joined	02:24
	← nb_bez___ left	02:25
	→ pwnz0r joined	02:25
	→ dreiss joined	02:25
	→ treim joined	02:26
	← treim left	02:26
	← eletuchy left	02:27
	→ pm90_ joined	02:27
	→ faux___ joined	02:27
	→ CKyle joined	02:27
	← jfran left	02:27
	← bronson left	02:27
	→ jfran joined	02:28
	→ hiug joined	02:28
	← gutocarvalho left	02:28
	→ chernjie joined	02:29
	← hiug left	02:29
	← _Atom_ left	02:29
	← fenugrec left	02:29
	→ jsnowball joined	02:29
	→ thiago joined	02:30
	← mizu_no_oto left	02:31
	→ Vavz joined	02:31
	← Vavz left	02:32
	← jfran left	02:32
	→ francjay_ joined	02:32
	→ gutocarvalho joined	02:32
	← francjay_ left	02:33
	→ jfran joined	02:33
	← jsnowball left	02:34
	← rpg left	02:37
	← jfran left	02:37
	← eggoez left	02:37
	→ Beea joined	02:37
	→ gfixler joined	02:38
	→ jfran joined	02:38
	← Beea left	02:38
	← pcypher left	02:38
	→ mizu_no_oto joined	02:39
	← jfran left	02:39
	→ jfran joined	02:40
	← Miesco left	02:40
	← jfran left	02:40
	→ jfran joined	02:40
	← hcavalle left	02:41
	← jfran left	02:41
	→ jfran joined	02:42
	← cmoneylulz left	02:42
	→ cmoneylulz joined	02:42
	→ ascarter joined	02:43
	← jfran left	02:43
	→ jfran joined	02:44
	→ weiyang joined	02:44
	← Dougie187 left	02:44
	← nobso left	02:44
	→ pcypher joined	02:45
	← jfran left	02:45
	→ jfran joined	02:46
	← jfran left	02:48
	→ nnyk joined	02:48
	→ luriv_ joined	02:48
	→ jfran joined	02:48
	→ rvzb joined	02:48
	→ nobso joined	02:48
	→ _Atom_ joined	02:48
	← rvzb left	02:49
	→ tristanp joined	02:50
	← mscook left	02:51
	→ zumba_ad_ joined	02:51
	→ eletuchy joined	02:51
	→ eggoez joined	02:51
	→ jeffklex joined	02:51
	→ dserodio_ joined	02:52
	→ Iniglo joined	02:52
	← gutocarvalho left	02:52
	← nnyk left	02:52
	← Iniglo left	02:53
	← zumba_ad_ left	02:53
	← jfran left	02:54
	← ntio left	02:54
	→ jfran joined	02:54
	→ akushner joined	02:54
	→ gutocarvalho joined	02:55
	← gutocarvalho left	02:55
	→ m0viefreak joined	02:56
	← jeffklex left	02:57
	→ jeffklex joined	02:57
	← ascarter left	02:57
	→ oojacoboo joined	02:58
	→ darkbasic joined	02:58
	→ terminal_echo joined	02:58
	→ fyiow joined	02:59
	← fyiow left	02:59
	→ LWade joined	03:00
	→ gutocarvalho joined	03:00
	→ mscook joined	03:00
	→ leoo0088 joined	03:01
	← jfran left	03:01
	← mscook left	03:01
	→ jfran joined	03:02
	→ mscook joined	03:02
	→ rpg joined	03:02
	→ jjcv joined	03:02
	← jjcv left	03:02
	← Nick-S left	03:02
	← durham left	03:03
	← mscook left	03:03
	← linuxboytoo left	03:03
	← jfran left	03:03
	→ vbiou joined	03:03
	→ durham joined	03:03
	→ jfran joined	03:04
	← vbiou left	03:04
	← ekain left	03:04
	← _Atom_ left	03:04
	← mizu_no_oto left	03:05
	← jfran left	03:05
	→ tjmzg joined	03:05
	→ jfran joined	03:05
	→ boombatower joined	03:05
	← tjmzg left	03:05
	→ stantonk joined	03:07
	→ Padawan joined	03:08
	→ osxi joined	03:14
	← jfran left	03:14
	→ jfran joined	03:14
	← pcypher left	03:15
	← jfran left	03:15
	→ jfran joined	03:16
	→ petersson joined	03:16
	→ loocsinus joined	03:16
	→ pcypher joined	03:17
	→ zumba_ad_ joined	03:17
	← irc-5225225 left	03:17
	← zumba_ad_ left	03:18
	← jfran left	03:18
	→ jfran joined	03:18
	← osxi left	03:19
	← jfran left	03:20
	→ jfran joined	03:21
	← dreiss left	03:21
	← jfran left	03:21
	← loocsinus left	03:21
	→ jfran joined	03:22
	← oojacoboo left	03:23
	← gutocarvalho left	03:23
	← cagedwisdom left	03:24
	→ sly__1986 joined	03:24
	← jeffklex left	03:24
	← cmoneylulz left	03:24
	← jfran left	03:26
	→ jfran joined	03:26
	← Sly_1986 left	03:26
	→ gutocarvalho joined	03:27
	← durham left	03:28
	→ mscook joined	03:28
	→ arup_r joined	03:29
	← pcypher left	03:30
	← ahr3n left	03:30
	← franl left	03:30
	← pm90_ left	03:30
	→ Nizumzen joined	03:30
	← arup_r left	03:30
	← CKyle left	03:31
	← tristanp left	03:31
	→ irc-5225225 joined	03:31
	← jfran left	03:31
	→ jfran joined	03:32
	← mscook left	03:33
	→ mscook joined	03:33
	← radialneon left	03:33
	→ pcypher joined	03:33
	← jfran left	03:34
	→ jfran joined	03:34
	← fission6 left	03:35
	→ radialneon joined	03:35
	← terminal_echo left	03:35
	← gutocarvalho left	03:36
	→ linuxboytoo joined	03:37
	→ cagedwisdom joined	03:37
	→ pm90_ joined	03:38
	→ francjay_ joined	03:40
	← jfran left	03:40
	← linuxboytoo left	03:41
	→ otter768 joined	03:41
	→ wagle joined	03:42
	← xlegoman left	03:45
	← otter768 left	03:45
	→ xlegoman joined	03:45
	→ loocsinus joined	03:45
	← loocsinus left	03:46
	← daito left	03:46
	→ daito joined	03:47
	→ loocsinus joined	03:47
	← dodobrain left	03:47
	← loocsinus left	03:48
	→ nnyk joined	03:49
	← xlegoman left	03:49
	→ xlegoman joined	03:49
	← s8321414 left	03:50
	→ jfran joined	03:50
	← francjay_ left	03:50
	← m0viefreak left	03:50
	→ dreiss joined	03:51
	← daito left	03:51
	← LWade left	03:51
	→ Consuela joined	03:51
	→ LWade joined	03:51
	← LWade left	03:52
	→ moretti joined	03:52
	← jfran left	03:53
	→ jfran joined	03:53
	← nnyk left	03:53
	← faux___ left	03:53
	→ NimeshNeema joined	03:54
	→ faux___ joined	03:54
	→ fracting joined	03:55
	→ ClearC2 joined	03:56
	← jfran left	03:57
	→ jfran joined	03:57
	→ zivester joined	03:59
	← jfran left	04:00
	→ jfran joined	04:00
	← petersson left	04:00
	← ClearC2 left	04:00
	← ghanima left	04:02
	← faux___ left	04:03
	→ uueuh joined	04:03
	← radialneon left	04:04
	→ durham joined	04:04
	← uueuh left	04:04
	→ cool^tom joined	04:05
cool^tom	Hi. Is it possible to git --shortstats --oneline in one line?	04:05
	→ lindenle joined	04:06
	→ ouuwp joined	04:06
	→ foist joined	04:07
	← ouuwp left	04:07
cool^tom	More specifically can I get a csv output of the log with the files changed, lines added, lines deleted, date and author of commit.	04:07
milki	cool^tom: you can play around with PRETTY FORMATS, man git log	04:07
gitinfo	cool^tom: the git-log manpage is available at http://jk.gs/git-log.html	04:07
	← jfran left	04:07
	→ jfran joined	04:07
	← jfran left	04:08
	→ Eux joined	04:09
	→ jfran joined	04:09
	← Eux left	04:09
cool^tom	milki: I could not find any reference to stats placeholders in pretty format documentation.	04:09
	← arescorpio left	04:10
	→ skorgon joined	04:10
	← skorgon left	04:10
	→ skorgon joined	04:10
	→ orw joined	04:10
	← orw left	04:10
	← jfran left	04:10
	→ jottr_ joined	04:10
	→ jfran joined	04:11
	→ polyzen_ joined	04:11
	→ bfho joined	04:11
	← bfho left	04:12
	polyzen_ → oplyzen	04:12
	← dreiss left	04:12
	oplyzen → polyzen	04:12
cool^tom	gitinfo: the git log -stat places the stats info on a new line. Is it possible to print it on the same line?	04:12
	→ Hqo joined	04:13
	← eletuchy left	04:13
	← Hqo left	04:13
	← madewokherd left	04:14
	→ ekox joined	04:14
	→ petersson joined	04:14
	← jfran left	04:14
	→ jfran joined	04:15
	← ekox left	04:15
	← jottr_ left	04:16
	→ Fiuf joined	04:16
	→ dgutierrez1287 joined	04:16
	← jfran left	04:17
	← Fiuf left	04:17
	→ jfran joined	04:17
	→ arnaud___ joined	04:17
	← boombatower left	04:17
	← jfran left	04:17
	→ jfran joined	04:18
	→ ome joined	04:19
	← lindenle left	04:20
	→ andrewvttran joined	04:21
	← andrewvttran left	04:21
	← dgutierrez1287 left	04:21
	← skorgon left	04:21
	← Wetmelon left	04:22
	← jfran left	04:22
	→ jfran joined	04:22
milki	aw, thats unfortunate	04:22
	→ ropav joined	04:22
	milki wonders why	04:23
	→ bronson joined	04:23
	← jfran left	04:24
	→ Ayon joined	04:24
	→ jfran joined	04:24
	← Ayon left	04:24
	← jfran left	04:25
	→ skorgon joined	04:25
	→ jfran joined	04:25
	← ojacobson left	04:26
	→ osxi joined	04:26
	→ ojacobson joined	04:26
	→ eletuchy joined	04:26
	← cool^tom left	04:26
	← ropav left	04:27
	→ Ica joined	04:27
	← rpg left	04:27
	← ojacobson left	04:27
	← bronson left	04:28
	← toothrot left	04:28
	→ terminal_echo joined	04:28
	← Ica left	04:29
	→ ojacobson joined	04:30
	← Zamyatin left	04:30
	→ elsevero joined	04:30
	← osxi left	04:30
	← elsevero left	04:31
	→ veusz joined	04:31
	→ elsevero joined	04:31
	← elsevero left	04:31
	← veusz left	04:31
	→ Zbv joined	04:32
	← Zbv left	04:32
	← pm90_ left	04:33
	← jfran left	04:33
	→ jfran joined	04:33
	→ Quevin_ joined	04:34
	→ fcsf joined	04:34
	← fcsf left	04:34
	← Quevin_ left	04:34
	→ Milos joined	04:34
	← xlegoman left	04:34
	← jfran left	04:34
	→ kp666 joined	04:35
	→ xlegoman joined	04:35
	→ jfran joined	04:35
	→ fuko joined	04:35
	→ bronson joined	04:35
	← fuko left	04:35
	← zivester left	04:35
	→ ymto joined	04:37
	→ osxi joined	04:37
	← moretti left	04:38
	→ nnyk joined	04:38
	← pcypher left	04:39
	← ymto left	04:39
	← xlegoman left	04:39
	← ojacobson left	04:39
	← Maple___ left	04:40
	← leoo0088 left	04:40
	→ Laeq joined	04:40
	→ francjay_ joined	04:40
	← jfran left	04:41
	← Laeq left	04:41
	→ pm90_ joined	04:42
	→ daito joined	04:42
	← francjay_ left	04:42
	→ francjay_ joined	04:42
	← francjay_ left	04:43
	← eggoez left	04:43
	→ francjay_ joined	04:43
	← mscook left	04:43
	→ ojacobson joined	04:43
	→ mscook joined	04:43
	→ genbu joined	04:44
	← genbu left	04:44
	→ eunea joined	04:45
	← eunea left	04:45
	← scientes left	04:45
	← francjay_ left	04:46
	→ francjay_ joined	04:46
	→ Ioaa joined	04:46
	→ eggoez joined	04:46
	← francjay_ left	04:47
	→ espindola joined	04:47
	→ francjay_ joined	04:47
	← Ioaa left	04:47
	← pm90_ left	04:48
	→ Hua joined	04:48
	← Hua left	04:49
	→ cool^tom joined	04:50
	→ rpg joined	04:50
	→ Aeeu joined	04:51
	→ nadim_ joined	04:51
	← Aeeu left	04:52
	← espindola left	04:52
	→ espindola joined	04:53
	← rpg left	04:54
	← eggoez left	04:54
	← NeverDie left	04:54
	← gopar left	04:54
	→ umnf joined	04:55
	→ sazed__ joined	04:55
	→ rockstar_ joined	04:55
	← umnf left	04:56
	→ raven-au joined	04:56
	→ ahr3n joined	04:56
	→ pcypher joined	04:56
	← cool^tom left	04:57
	← pcypher left	04:57
	→ fiv joined	04:58
	→ mscook_ joined	04:58
	→ jfran joined	04:59
	← francjay_ left	05:00
	→ faux___ joined	05:00
	← fiv left	05:00
	→ mscook__ joined	05:01
	← jfran left	05:01
	← mscook left	05:02
	→ jfran joined	05:02
	← mscook_ left	05:02
felipedvorak	Today I had a friend with more experience correct some of my code in a project, and he commited them after he finished. When I got home, I was working in the master and to save what I had so far I branched it to a backup branch. I came back to master and git pulled. How do I diff them in the best way?	05:02
	→ Ohcu joined	05:03
	→ eggoez joined	05:04
	← Ohcu left	05:04
	← blackwind_123 left	05:04
	→ sachin joined	05:05
	← espindola left	05:08
	→ francjay_ joined	05:08
	→ Ebokc joined	05:08
	← Ebokc left	05:08
	← jfran left	05:08
	← francjay_ left	05:09
	→ francjay_ joined	05:09
	→ jceb joined	05:09
	→ skcin7 joined	05:09
	← raven-au left	05:09
	→ Qaao joined	05:09
	← Qaao left	05:10
	→ MechtiIde joined	05:10
	← variable left	05:11
	← francjay_ left	05:11
	← sly__1986 left	05:11
	→ iuhe joined	05:11
	← iuhe left	05:11
	→ francjay_ joined	05:11
	→ settermjd joined	05:12
	→ raven-au joined	05:12
ojacobson	what is best? for that matter, what is wrong with the simplest option -- `git diff master yourbranch`	05:13
	→ Ifa joined	05:13
	→ JohnBat26 joined	05:13
	→ pheaver joined	05:14
	← Ifa left	05:14
	← francjay_ left	05:14
	→ francjay_ joined	05:14
	← lolmac left	05:15
	→ Terabyte joined	05:15
	→ tehtraveler joined	05:15
	← skcin7 left	05:15
	← jceb left	05:16
	→ Kjuo joined	05:16
	← Kjuo left	05:16
deltab	is there anything wrong with it?	05:16
	→ Vqfa joined	05:18
	← francjay_ left	05:19
	→ francjay_ joined	05:19
	← Vqfa left	05:19
	→ pantsman- joined	05:19
	→ macabre joined	05:20
	← neanderslob left	05:21
	→ neanderslob_ joined	05:21
	→ ascarter joined	05:21
	← faux___ left	05:22
	← ascarter left	05:23
	← macabre left	05:25
	← settermjd left	05:25
	← ahr3n left	05:25
	→ jfran joined	05:26
	← francjay_ left	05:26
	← stantonk left	05:27
	← petersson left	05:28
	→ petersson joined	05:28
	← osxi left	05:30
	← pwnz0r left	05:30
	← Boobuigi left	05:31
	→ jseplae joined	05:33
	← jfran left	05:34
	→ pwnz0r joined	05:34
	→ Error404NotFound joined	05:34
	← Palmer11 left	05:34
milki	"yes"	05:34
catern	dear #git	05:34
	I made a branch B off of A with some commits on it	05:35
	← MattMaker left	05:35
catern	A has had its history rewritten since I branched off it	05:35
	how should I rebase only my commits back on top of A?	05:35
milki	catern: man git rebase does exactly that	05:36
gitinfo	catern: the git-rebase manpage is available at http://jk.gs/git-rebase.html	05:36
	→ xlegoman joined	05:37
	→ netj joined	05:37
catern	milki: no, since history has been rewritten I think it will try to rebase more than just my "interesting" commits	05:37
	it would also, say, try to rebase now-deleted-in-A commits on top of A	05:38
	right?	05:38
	← jseplae left	05:38
_ikke_	catern: !situation	05:39
gitinfo	catern: Please pastebin the relevant output of `git log -n 20 --all --graph --format="%h %p %d"` to give us an idea about what your situation is (increase the -n argument if your problem is more complex than 20 commits can explain)	05:39
Eugene	That's a new one	05:39
_ikke_	It's been there quite some time	05:39
	→ ghanima joined	05:41
Eugene	New to me	05:41
catern	_ikke_: hmm? surely there's just a generic solution you can suggest? i was anticipating an argument to rebase or something that would let me specify the range of commits that should be included in the rebase	05:41
	→ leoo0088 joined	05:41
catern	wait... is that just the ordinary argument to rebase?	05:41
	→ otter768 joined	05:42
	→ jontmorehouse joined	05:43
	→ ThomasLocke joined	05:44
	→ martiis joined	05:44
	→ blackwind_123 joined	05:45
	← xlegoman left	05:45
	→ tverr joined	05:45
	← otter768 left	05:47
_ikke_	catern: git rebase --onto <commit> <from> <to>	05:47
catern	yeah	05:48
	I realized that	05:48
	when I looked at the manpage :)	05:48
	thanks again, #git!	05:48
	(for telling me to read the manpage)	05:48
bremner	the _fine_ manpage ;)	05:49
	→ linuxmint2 joined	05:50
	← durham left	05:51
	← linuxmint2 left	05:51
	→ linuxmint2 joined	05:52
	→ overCrone joined	05:52
	← linuxmint2 left	05:53
	← arnaud___ left	05:53
	→ linuxmint2 joined	05:53
	→ dc5ala joined	05:54
	← Milos left	05:54
	→ Milos joined	05:54
	→ ClearC2 joined	05:57
	← MechtiIde left	06:01
	← ClearC2 left	06:01
	← NimeshNeema left	06:03
	→ Silmarilion joined	06:03
	→ scientes joined	06:03
	← scientes left	06:03
	→ scientes joined	06:03
	← CEnnis91 left	06:04
	→ durham joined	06:04
	← scientes left	06:04
	← mscook__ left	06:04
	→ scientes joined	06:04
	→ PCatinean joined	06:05
	← durham left	06:06
	← neanderslob_ left	06:06
	→ dreiss joined	06:06
	→ mscook_ joined	06:07
	→ Azuvector joined	06:07
	gitinfo set mode: +v	06:07
	← pwnz0r left	06:07
	← jonno11 left	06:08
	→ Qantourisc joined	06:08
	← Lyqyd left	06:08
	→ freimatz joined	06:08
	→ flowinho joined	06:10
	→ dev_node_dbs joined	06:10
	→ arup_r joined	06:11
	→ skylite joined	06:11
	→ jottr_ joined	06:11
	→ sailorswift joined	06:11
	→ Gama11 joined	06:11
	→ nilg joined	06:12
	→ haha1 joined	06:12
	← maestrojed left	06:12
	→ izhak joined	06:13
	← pheaver left	06:13
	→ roelmonnens joined	06:13
	← haha1 left	06:15
	← jottr_ left	06:15
	→ Gama11_ joined	06:16
	← Gama11 left	06:16
	← sachin left	06:17
	→ settermjd joined	06:18
	→ arup_r_ joined	06:18
	→ faux___ joined	06:19
	→ sachin_ joined	06:19
	← nilg left	06:19
	→ rchavik joined	06:20
	→ nilg joined	06:20
	→ macabre joined	06:21
	→ johnkevinmbasco joined	06:21
	→ dlitz joined	06:22
	← arup_r left	06:22
	→ jceb joined	06:22
	→ niels_ joined	06:23
	← nilg left	06:23
	← terminal_echo left	06:24
	→ nilg joined	06:24
	→ ra0 joined	06:24
	→ ICantCook joined	06:25
	← macabre left	06:25
	→ theredaaron joined	06:26
	→ barduck joined	06:27
	→ admin___ joined	06:28
ICantCook	I run a git server behind an nginx server. Yesterday, I setup an additional nginx server with DNS round-robin. Today, I shutdown the first nginx server, and everything is fine accessing my git server (web interface, linux client, etc). One of our developers is running git.exe on windows and is now getting timeouts trying to pull/clone. He has no issues with the web interface though.	06:28
	→ terminal_echo joined	06:28
	← terminal_echo left	06:28
	→ terminal_echo joined	06:28
ICantCook	Does git.exe on windows do something silly like resolve/cache remotes independant of the OS?	06:28
	→ EvanDotPro joined	06:29
	→ stantonk joined	06:29
	← dreiss left	06:30
	← Goplat left	06:31
	→ b100s joined	06:31
	→ Gizburdt joined	06:32
	← faux___ left	06:33
	→ pwnz0r joined	06:35
	← stantonk left	06:36
	→ arnaud___ joined	06:36
	→ masasin joined	06:37
	← theredaaron left	06:38
	← daito left	06:38
	→ daito joined	06:39
	← daito left	06:39
	→ LearningCN joined	06:39
	← skorgon left	06:39
	→ daito joined	06:40
	→ Alienpruts joined	06:40
	→ gej joined	06:41
	← gej left	06:42
	→ jseplae joined	06:42
	→ Fvtf joined	06:44
	← Fvtf left	06:44
	→ endiruna joined	06:45
	← nadim_ left	06:45
	→ elsevero joined	06:45
	← admin___ left	06:46
	← petersson left	06:46
	← Qantourisc left	06:47
	→ elsevero_ joined	06:47
	← pantsman- left	06:49
	← elsevero left	06:50
	elsevero_ → elsevero	06:50
	← Azuvector left	06:52
	← nilg left	06:53
	→ tilpner joined	06:54
	← b100s left	06:55
	→ frisk joined	06:55
	→ Spriz joined	06:56
	← LearningCN left	06:56
	← foist left	06:56
	← Spriz left	06:57
	← gbit86 left	06:58
	→ Spriz joined	06:58
	← arnaud___ left	06:58
	→ Brain joined	06:58
	→ gbit86 joined	06:59
	→ osxi joined	07:00
	→ macabre joined	07:00
	← nobso left	07:01
	→ gua_ould joined	07:01
	→ katherine joined	07:01
	← jontmorehouse left	07:02
grawity	no	07:02
	your web browser, however, does	07:02
	→ cvanball joined	07:03
	→ maestrojed joined	07:04
	← osxi left	07:05
	→ rasto joined	07:05
	← macabre left	07:05
	← nnyk left	07:06
	← Terabyte left	07:07
	→ bvi joined	07:07
	→ Terabyte joined	07:08
	→ ilmgb joined	07:08
	← Spriz left	07:10
	→ momken joined	07:11
	→ Spriz joined	07:12
	← irc-5225225 left	07:13
	→ eGGsha joined	07:13
	→ TomyWork joined	07:14
	→ maxorator joined	07:14
	→ petersson joined	07:15
	← Spriz left	07:16
	→ mscook joined	07:16
	← harish left	07:16
	→ nadim joined	07:17
	→ dgutierrez1287 joined	07:17
	→ LearningCN joined	07:17
	→ rsmarshall joined	07:17
	← Milos left	07:17
	← sazed__ left	07:18
	← mscook_ left	07:19
	← mscook left	07:20
	← dgutierrez1287 left	07:21
	→ triton joined	07:23
	→ SimonNa joined	07:24
	→ irc-5225225 joined	07:24
	→ Amandil joined	07:26
	← Error404NotFound left	07:26
	→ Err404NotFound joined	07:26
	← niels_ left	07:30
	→ workerbeetwo joined	07:30
	→ faux___ joined	07:30
	→ niels_ joined	07:30
	→ Rhonda joined	07:30
Rhonda	Who was this godless spammer at 2 in the morning? >.>	07:30
	→ Amandil\|2 joined	07:31
	← gbit86 left	07:31
	← thiago left	07:31
	← maestrojed left	07:31
	← Amandil left	07:33
	→ niels__ joined	07:33
	← niels_ left	07:35
	→ Milos joined	07:35
	← jceb left	07:35
	→ Error404NotFound joined	07:35
	← bronson left	07:36
	→ cdown joined	07:37
	← Milos left	07:37
	→ gbit86 joined	07:37
	→ neanderslob joined	07:37
	← Err404NotFound left	07:38
	→ aspiers joined	07:38
	→ CySnap joined	07:38
	→ D30 joined	07:38
	→ zumba_ad_ joined	07:38
	← CySnap left	07:39
	← cvanball left	07:39
	← eGGsha left	07:39
	→ blinkdesign joined	07:41
	← D30 left	07:42
	→ xlegoman joined	07:42
	← zumba_ad_ left	07:42
	← arup_r_ left	07:42
	→ otter768 joined	07:43
	← clarkpan left	07:43
	→ Balliad joined	07:44
	← faux___ left	07:44
	→ Hounddog joined	07:45
	→ heroux joined	07:46
	→ Nindustries joined	07:47
	← triton left	07:47
	← rockstar_ left	07:47
	← tgunr left	07:47
	→ eGGsha joined	07:47
	← otter768 left	07:47
	← xlegoman left	07:48
Nindustries	So I just found this; https://github.com/github/backup-utils . Could I use this without github enterprise?	07:48
	→ arup_r joined	07:48
	→ ropav joined	07:48
	← snthsnth left	07:48
	← luriv_ left	07:49
	← petersson left	07:49
	→ jceb joined	07:49
	→ Liberation joined	07:50
	→ bongjovi joined	07:52
	→ howlymowly joined	07:52
	← ropav left	07:53
	← pwnz0r left	07:53
	→ pwnz0r joined	07:54
	← Nindustries left	07:55
	→ ClearC2 joined	07:57
	← JanC left	07:58
	← pwnz0r left	07:58
	← niels__ left	07:58
	→ encod3 joined	07:59
	→ niels_ joined	07:59
	← cdown left	08:00
	→ niels__ joined	08:00
	→ cdown joined	08:00
	→ _0xAX joined	08:01
	→ osxi joined	08:01
	→ macabre joined	08:02
	← ClearC2 left	08:02
	← niels_ left	08:03
	← jceb left	08:03
	→ a3Dman joined	08:04
	← roelmonnens left	08:05
	→ roelmonnens joined	08:06
	→ linjie joined	08:06
	← macabre left	08:07
	← osxi left	08:07
	← endiruna left	08:07
	→ dreiss joined	08:08
	→ kurkale6ka joined	08:08
	gitinfo set mode: +v	08:08
linjie	hi	08:09
gitinfo	linjie: 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.	08:09
	→ psoo joined	08:09
	← frisk left	08:09
	→ nobso joined	08:09
linjie	what can i do here	08:10
	→ freestyl3r joined	08:10
	← daito left	08:10
linjie	!backup	08:10
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:10
	← nobso left	08:10
	→ jottr_ joined	08:12
	→ rockstar_ joined	08:12
	→ Nindustries joined	08:12
	← linjie left	08:13
Nindustries	Hello, will a git fetch from a bundle skip the unnecessary commits?	08:13
	← rockstar_ left	08:13
	→ JanC joined	08:13
	← darkschneider left	08:13
	← Amandil\|2 left	08:14
	→ darkschneider joined	08:14
	→ kcj joined	08:15
	← freimatz left	08:16
	→ jceb joined	08:17
	← jottr_ left	08:17
	→ harish joined	08:20
	→ marcogmonteiro joined	08:22
	→ rockstar_ joined	08:23
	→ ilmgb_ joined	08:23
	→ skullcrasher joined	08:23
	→ Milos joined	08:26
	← ilmgb left	08:27
	→ pwnz0r joined	08:28
	← katherine left	08:29
	→ daito joined	08:29
	← Milos left	08:32
	← pwnz0r left	08:33
	← rockstar_ left	08:33
	→ ropav joined	08:34
	← ropav left	08:34
	→ Milos joined	08:34
	→ wicope joined	08:35
	← encod3 left	08:37
	← cdown left	08:37
	→ aidalgol joined	08:38
	→ encod3 joined	08:39
	→ faux___ joined	08:41
	→ upene joined	08:43
	→ zadock joined	08:44
	→ nnyk joined	08:44
	← martiis left	08:44
	← workerbeetwo left	08:45
	← leoo0088 left	08:45
	→ Vadimus joined	08:45
	← dev_node_dbs left	08:46
	→ chronos_ joined	08:46
	→ Boobuigi joined	08:46
	→ simesy joined	08:48
	→ Dragooon joined	08:49
	← ArchDebian left	08:49
	← upene left	08:50
	→ CustosL1men joined	08:52
	← EricPoe left	08:52
	← scientes left	08:54
	→ mikecmpbll joined	08:55
	← faux___ left	08:55
	← rasto left	08:56
	→ eletuchy_ joined	08:57
	← eletuchy left	08:57
	← Vadimus left	08:58
	→ martiis joined	08:58
	← zadock left	09:00
	← eGGsha left	09:02
	← overCrone left	09:02
	→ rob_w joined	09:04
	→ cdown joined	09:04
	→ xk_id joined	09:05
	→ jottr_ joined	09:05
	→ jackneill joined	09:05
	→ abrrs joined	09:06
	← eletuchy_ left	09:07
	→ b100s joined	09:07
	→ ilmgb joined	09:08
	← jottr_ left	09:08
	→ jottr_ joined	09:09
	→ rasto joined	09:10
	→ bernalex joined	09:10
	← arup_r left	09:11
	→ dev_node_dbs joined	09:11
	← bernalex left	09:11
	→ bernalex joined	09:11
	← dev_node_dbs left	09:11
	← johnkevinmbasco left	09:11
	← ilmgb left	09:11
	→ ilmgb joined	09:12
	→ dev_node_dbs joined	09:12
	← ilmgb_ left	09:12
	← dev_node_dbs left	09:12
	→ dev_node_dbs joined	09:13
	← terminal_echo left	09:13
	← quazimodo left	09:14
	← masasin left	09:15
	← weiyang left	09:15
	→ jokajak joined	09:15
	→ dangerousdave joined	09:16
	← jottr_ left	09:16
	→ Amandil\|2 joined	09:16
	→ jottr_ joined	09:17
	→ terminal_echo joined	09:19
	→ niels_ joined	09:20
	← niels__ left	09:20
	→ awkwardusername joined	09:21
	← Amandil\|2 left	09:22
	← cdown left	09:23
	→ cdown joined	09:24
	→ King_Hual joined	09:24
	← izhak left	09:25
	→ eGGsha joined	09:25
	→ lindenle joined	09:26
	← freestyl3r left	09:27
	← cdown left	09:28
	→ fenugrec joined	09:29
	← lindenle left	09:31
	→ stamina joined	09:31
	← Terabyte left	09:33
	→ Terabyte joined	09:34
	← dreiss left	09:34
	← awkwardusername left	09:35
	← irc-5225225 left	09:35
	← mikecmpbll left	09:37
	← kcj left	09:37
	→ mikecmpbll joined	09:38
	→ arup_r_ joined	09:39
	← arup_r_ left	09:39
	→ arup_r_ joined	09:41
	→ algernon__ joined	09:41
	← arup_r_ left	09:42
	→ arup_r joined	09:43
	→ otter768 joined	09:44
	→ dgutierrez1287 joined	09:44
	→ Spriz joined	09:44
	→ Zoddo joined	09:44
	→ xlegoman joined	09:45
	← otter768 left	09:48
	← dgutierrez1287 left	09:48
	→ irc-5225225 joined	09:48
	← xlegoman left	09:50
	→ faux___ joined	09:52
Nindustries	And any idea why a git init test && git status test returns an error code ?	09:52
	I just initialized it	09:52
	← algernon__ left	09:52
j416	Nindustries: git init test && cd test && git status	09:52
	← sailorswift left	09:55
	→ rzeka joined	09:55
	→ algernon1986 joined	09:55
	→ gutocarvalho joined	09:55
Nindustries	ah.	09:56
	← eGGsha left	09:57
	→ Kulrak joined	09:58
	← Kulrak left	09:58
	→ Kulrak joined	09:58
	→ ClearC2 joined	09:58
	← xk_id left	09:59
	→ cdown joined	10:00
	← algernon1986 left	10:00
	→ algernon__ joined	10:01
	← faux___ left	10:01
	← terminal_echo left	10:01
	→ leeyaa joined	10:02
leeyaa	hello	10:03
	how to show git commits from yesterday for specific branch ?	10:03
	→ terminal_echo joined	10:03
	← terminal_echo left	10:03
	← ClearC2 left	10:03
	→ VictorCL joined	10:03
	→ terminal_echo joined	10:03
	← terminal_echo left	10:03
	→ terminal_echo joined	10:03
matthiaskrgr	leeyaa: git log --since=yesterday <branchname>	10:04
leeyaa	matthiaskrgr: what about remote branch >	10:04
	?	10:04
	→ xk_id joined	10:04
matthiaskrgr	origin/<branchname>	10:04
	→ amcsi_work joined	10:04
	→ sailorswift joined	10:04
matthiaskrgr	or whatever the remote name is	10:05
	see "git branch -a"	10:05
amcsi_work	anyone have experiences with rerere? Is it a good idea to leave on?	10:05
matthiaskrgr	it will show all branches including remotes	10:05
leeyaa	ah thanks matthiaskrgr	10:05
	→ eGGsha joined	10:05
	→ hyperair joined	10:06
	→ eletuchy joined	10:08
	→ Vadimus joined	10:08
	← LearningCN left	10:09
	← xk_id left	10:09
	→ Mega joined	10:10
leeyaa	one more thing, do you think git push origin --all --force -u is enough to sync local repository with remote repository along with all branches ?	10:10
	i am using this to send all commits to a backup remote server	10:10
	→ Adaulfo joined	10:11
	← ome left	10:12
	→ lucha joined	10:12
	← eletuchy left	10:13
	→ xk_id joined	10:13
	→ Dorf joined	10:15
	← Dragooon left	10:17
	← fenugrec left	10:19
	→ creep joined	10:19
	← blinkdesign left	10:19
	← Dorf left	10:20
	← darkbasic left	10:21
	← Adaulfo left	10:21
	→ darkbasic joined	10:21
	← aidalgol left	10:22
	→ blinkdesign joined	10:22
	→ nfk joined	10:24
	← terminal_echo left	10:25
	→ tom_thumb joined	10:27
tom_thumb	Hi	10:27
gitinfo	tom_thumb: 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:27
	→ beckyconning_ joined	10:27
	→ voodo joined	10:28
	→ Douhan joined	10:28
tom_thumb	!backup	10:28
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	10:28
	← SimonNa left	10:28
	→ ntwari joined	10:28
Douhan	is there a way to change the message of an old commit?	10:28
	← gutocarvalho left	10:28
	→ terminal_echo joined	10:29
	→ sdothum joined	10:29
blr	Douhan: if you use interactive rebase you get an option for 'reword'	10:30
Douhan	is there a tutorial for that? because i'm a total git noob	10:30
blr	Douhan: git rebase -i <sha of wonky commit>	10:30
Douhan	okay i will try that i hope i won't mess up	10:31
	blr: then i will do git push -f right?	10:31
blr	Douhan: if you have pushed, you'll have to force yep	10:31
Douhan	yeah i pushed it long time ago	10:31
	→ ExeciN joined	10:33
Douhan	blr: i don't know how to use git rebase -i :(	10:33
	it says if i remove a line commit will be lost	10:33
	it opened up vim, i can't use vim at all	10:34
	I did ":q" then it said "Successfully rebased and updated refs/heads/master."	10:34
	I didn't change anything but I'm worried	10:34
blr	Douhan: good idea to export EDITOR as something you're familiar with	10:35
	think you can also set that in your git config	10:35
	yeah, git config --global core.editor "emacs" for example	10:36
	→ iooner joined	10:36
	← ghanima left	10:36
Douhan	how about notepad?	10:36
	→ timini joined	10:36
blr	hmm not sure how that works on windows	10:36
	← daito left	10:36
Douhan	blr: I did what you said git rebase -i 500e8c0	10:37
timini	Hey I think i have lost some commits , how can i show all commits not on master?	10:37
Douhan	but I can't see my 500e8c0 commit	10:37
	← Milos left	10:37
blr	instead of "emacs" in the example, you can provide a path to an editor for windows apparently	10:37
Douhan	I see the newest commits	10:37
blr	sorry need to get to bed, hopefully someone can help you further - don't worry, it is reasonably hard to actually lose data.	10:38
	→ marscher joined	10:39
	← a3Dman left	10:39
	← blinkdesign left	10:40
	← nfk left	10:40
	← lucha left	10:40
	→ clarkpan joined	10:40
Douhan	blr: wait	10:41
	blr: http://cl.ly/image/3R340S3Q3I2q	10:41
	← jottr_ left	10:41
Douhan	blr: how does it look?	10:41
	← heroux left	10:41
_ikke_	Douhan: What commit do you want to change the message of?	10:42
Douhan	500e8c0	10:42
_ikke_	ok	10:42
	then you're good	10:42
Douhan	should I remove "pick" lines?	10:42
_ikke_	save and close this file	10:42
	no	10:43
	→ xlegoman joined	10:43
Douhan	Why?	10:43
_ikke_	otherwise you would loose those commits	10:43
Douhan	oohhh	10:43
_ikke_	Any commit not mentioned is dropped	10:43
	→ a3Dman joined	10:43
_ikke_	So pick means, just apply, don't change	10:43
	→ eperez joined	10:43
Douhan	_ikke_: I change this message, will my commit go to top of the commit order?	10:43
	→ ome joined	10:43
_ikke_	Douhan: It will apply those commits in order, first mentioned first	10:44
Douhan	Like I pushed a new commit but I don't	10:44
	500e is the oldest commit, ff358d4 is the newest	10:44
_ikke_	Yes, it will apply those commits in the original order	10:44
Douhan	okay thank you	10:45
	← clarkpan left	10:45
Douhan	_ikke_: got this error http://cl.ly/image/2Q0P430D2w13	10:46
	← Nindustries left	10:46
Douhan	somehow HEAD moves itself to commit 500e.....	10:47
	→ juril joined	10:48
_ikke_	yes, that's during the rebase	10:48
	git rebase --abort	10:48
	git rebase -i 500e8c0~1	10:48
Douhan	Why did it fail? I saved as you said	10:48
_ikke_	You need to use the parent of the commit you want to rebase, not the commit itself	10:48
Douhan	Wait	10:49
	← timini left	10:49
Douhan	_ikke_: http://cl.ly/image/0m2H1d1i1u1I --> so I do: git rebase -i 2a22d75 ?	10:51
_ikke_	yes, that should work. That's the same as 500e8c0~1	10:51
	→ ahr3n joined	10:52
	← Boobuigi left	10:53
	→ mixandgo joined	10:53
Douhan	_ikke_: http://cl.ly/image/0W2R0N1s2H1X	10:54
	I will push -f now	10:54
_ikke_	Ok, so you changed the message?	10:54
Douhan	yeah	10:54
	I added "(#4)" at end	10:54
	to commit 500e	10:55
	→ ki0 joined	10:55
Douhan	Hopefully Github will see this	10:55
	and add the reference to the issue	10:55
_ikke_	Douhan: Changing the commit message in the editor is not enoug	10:56
	enough	10:56
	You have to change pick to reword, and then in the editor, that shows up, there you can change it	10:57
	← terminal_echo left	10:57
Douhan	_ikke_: Does this look okay to you? http://cl.ly/image/0Y1l082S111z	10:57
	I don't know why git can't simply change the commit message and commits another 5 commit	10:58
	→ faux___ joined	10:58
canton7	because a commit's hash relies on several things, including its message and the hash of its parent	10:59
	this means that given a single hash, you can verify the entire history (and make sure it hasn't been corrupted, that no-one's meddled with it, etc)	10:59
	but it also means that if you change a commit's message, all commits since it need to be rewritten	10:59
	← ahr3n left	10:59
canton7	the act that you've rewritten something which has been tagged is probably quite a bad thing	10:59
Douhan	how much space does this waste?	11:00
	→ sarrri joined	11:00
	← sarrri left	11:00
	→ sarrri joined	11:00
canton7	it's not about space	11:00
Douhan	since all commits are rewritten	11:00
canton7	(old commits will be cleaned up after time)	11:00
	it's about other things	11:00
	!rewrite	11:00
gitinfo	Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	11:00
Douhan	Okay I really don't want to mess it's history	11:00
	← Mega left	11:01
	→ Corey84 joined	11:01
canton7	and tags really don't like being moved, so you'd have to delete and re-create them as well... etc	11:01
	it's painful	11:01
	for the sake of adding an issue reference to something a few versions ago, I really wouldn't bother	11:01
Douhan	Yeah I just realized I can add a commit reference to a issue from commit's page (in Github)	11:02
	← jceb left	11:03
	← Corey84 left	11:03
Douhan	Here's a picture to show what I mean: http://cl.ly/image/2b3f3Z1B2915	11:03
canton7	taht works	11:03
Douhan	On commit's page there's a comments section below.	11:03
	→ jottr_ joined	11:03
	→ notebox joined	11:04
Douhan	Yeah.. much better...	11:04
	← eGGsha left	11:04
	← VictorCL left	11:07
	← pullphinger left	11:07
	→ prasad18241 joined	11:08
	→ rnsanchez joined	11:10
	→ eGGsha joined	11:11
	← prasad18241 left	11:11
	← irc-5225225 left	11:12
	← faux___ left	11:12
	← nnyk left	11:13
	← nadim left	11:14
brontosaurusrex	with gitlab, can I use user:pass instead of ssh keys?	11:14
	→ nadim joined	11:14
	→ m0viefreak joined	11:15
	← xlegoman left	11:15
	← dsdeiz left	11:16
	→ xlegoman joined	11:16
	← voodo left	11:16
	→ jceb joined	11:17
	← xlegoman left	11:20
	→ Saturn812 joined	11:21
	← arup_r left	11:21
	→ sinkensabe joined	11:21
	→ johtso joined	11:25
	→ irc-5225225 joined	11:25
	→ lindenle joined	11:26
	→ nfk joined	11:27
	← cdown left	11:28
	→ cdown joined	11:29
	→ Boobuigi joined	11:30
	→ Milos joined	11:31
	← momken left	11:31
	← nfk left	11:31
	← lindenle left	11:31
	← nadim left	11:32
	← xk_id left	11:32
	→ dgutierrez1287 joined	11:33
	← tom_thumb left	11:34
	→ arup_r joined	11:36
	→ brule joined	11:36
	← Vadimus left	11:38
	→ nadim joined	11:38
	← Milos left	11:39
	→ Milos joined	11:39
	← abrrs left	11:41
greppy	brontosaurusrex: yes	11:41
	→ abrrs joined	11:42
	← simesy left	11:42
	← stamina left	11:44
	→ otter768 joined	11:44
	→ xudongz joined	11:45
	→ NimeshNeema joined	11:45
	← notebox left	11:47
	← xudongz left	11:47
	← darkbasic left	11:47
	→ darkbasic joined	11:48
	→ s8321414 joined	11:48
	← eggoez left	11:48
	→ notebox joined	11:48
	← otter768 left	11:49
	→ dougsland joined	11:49
	→ eggoez joined	11:52
	← jackneill left	11:53
	→ Amandil\|2 joined	11:53
	← niels_ left	11:54
	→ CEnnis91 joined	11:56
	→ mostlybadfly joined	11:56
	→ niels_ joined	11:57
	→ ClearC2 joined	11:59
	→ voodo joined	11:59
	→ linuxboytoo joined	12:00
	← sailorswift left	12:00
	→ fstd_ joined	12:00
	← bongjovi left	12:00
	→ fission6 joined	12:01
	→ greggynapalm joined	12:01
	→ xk_id joined	12:01
	← linuxboytoo left	12:02
	→ linuxboy_ joined	12:02
	← fstd left	12:03
	fstd_ → fstd	12:03
	← ClearC2 left	12:04
	→ VictorCL joined	12:05
	← fracting left	12:06
	← m0viefreak left	12:06
	← xk_id left	12:06
	→ Thorax15 joined	12:06
	→ faux___ joined	12:07
	→ CKyle joined	12:07
	→ eletuchy joined	12:09
	→ bongjovi joined	12:09
	→ quazimodo joined	12:11
	→ theCole joined	12:12
	← eletuchy left	12:13
	→ rwb joined	12:15
	→ simesy joined	12:15
	← eGGsha left	12:15
	→ cbonobo joined	12:16
	← Amandil\|2 left	12:16
	→ xlegoman joined	12:18
	→ cavallari joined	12:18
	→ tvw joined	12:19
	← faux___ left	12:20
	← cagedwisdom left	12:22
	→ toothrot joined	12:22
	→ eGGsha joined	12:23
	→ ig0r_ joined	12:23
	→ faux___ joined	12:24
	← xlegoman left	12:24
	← dangerousdave left	12:24
	→ gutocarvalho joined	12:26
	← rzeka left	12:26
	→ dangerousdave joined	12:26
	← darkbasic left	12:26
	← Milos left	12:26
	→ darkbasic joined	12:26
	→ Milos joined	12:26
	← Milos left	12:27
	→ Milos joined	12:27
	→ Dorf joined	12:27
	→ fracting joined	12:27
	← b100s left	12:28
	← faux___ left	12:29
	→ pwnz0r joined	12:29
	← fracting left	12:29
	→ sanketdg joined	12:30
	→ linkedinyou joined	12:31
	→ fracting joined	12:32
	→ Vadimus joined	12:32
	← arup_r left	12:34
	← pwnz0r left	12:34
	→ Zupoman joined	12:34
	← Nizumzen left	12:35
	→ aretecode joined	12:35
	→ Kicer86 joined	12:35
	→ sgambino joined	12:35
	→ nnyk joined	12:36
	→ sfeinste joined	12:36
	← VictorCL left	12:37
	→ rzeka joined	12:37
	→ darkbasic_ joined	12:37
	← darkbasic left	12:37
	← fracting left	12:38
	← gutocarvalho left	12:39
	→ yac joined	12:39
	→ SirRetnuh joined	12:40
	→ Kully3xf joined	12:41
	→ jteneyck joined	12:41
	← fahadash left	12:42
	← eperez left	12:43
	→ eperez joined	12:43
	→ MinetestForFun joined	12:44
	← eperez left	12:44
	→ eperez joined	12:45
	← SirRetnuh left	12:45
	← irc-5225225 left	12:45
marscher	situation: HEAD is a sucessfully cherry-picked commit, which I want to edit via "git reset HEAD~1 --soft; # do something; git commit --amend"; but the amend commit will be put into the HEAD before the cherry-pick	12:45
	what am I missing?	12:45
	→ livingstn joined	12:45
	→ gutocarvalho joined	12:45
	← fission6 left	12:45
moritz	marscher: after the git reset, do a commit instead of commit --amend	12:46
marscher	I'd expecting the amend commit to commit the edited cherry-picked one.	12:46
moritz	or leave out the reset, and stick with commit --amend	12:46
marscher	ah alright.	12:46
moritz	--amend changes HEAD	12:46
marscher	thank you	12:46
moritz	but the git reset HEAD~1 moved HEAD already	12:46
	oh, btw you can also cherry-pick with --no-commit	12:47
	rchavik → rchavik_zap	12:47
	→ bsanford joined	12:47
	← voodo left	12:47
marscher	what would be the effect of that?	12:47
	→ osxi joined	12:47
	→ Maple__ joined	12:48
moritz	putting the changes into the index, but not creating the commit	12:49
	same as cherry-pick followed by a git reset --soft HEAD~1	12:49
	→ bitkiller joined	12:49
	← nnyk left	12:50
polyzen	Your branch and 'origin/firefox-extension-https-everywhere' have diverged,	12:50
	and have 10 and 10 different commits each, respectively.	12:50
	how the heck...	12:50
	→ nfk joined	12:51
polyzen	there are only 10 commits	12:51
	somehow all the hahes are different?	12:51
	hashes*	12:52
	→ fracting joined	12:52
	← CKyle left	12:52
	← Consuela left	12:53
	← osxi left	12:53
	→ Zamyatin joined	12:53
moritz	polyzen: sounds like somebody (you?) rewrote history (rebase?)	12:53
	→ szmq joined	12:53
	→ macabre joined	12:54
	← gutocarvalho left	12:54
	→ clmsy joined	12:54
	→ Amandil joined	12:54
	← Zamyatin left	12:54
	← bsanford left	12:55
polyzen	if so, it was mistakingly, and i have no idea how i would've done that ...	12:55
	sleep rebasing..	12:55
	will just delete the local branch and check it out again	12:55
	gitinfo set mode: +v	12:55
	→ Zamyatin joined	12:55
	→ arup_r joined	12:55
	→ mizu_no_oto joined	12:55
	→ espindola joined	12:56
szmq	how i can remove 2 last commit?	12:56
	http://scr.hu/0oin/j0uet	12:56
	← Zamyatin left	12:57
	← eperez left	12:57
	→ Zamyatin joined	12:57
	→ eperez joined	12:57
	→ nnyk joined	12:58
	→ Anonymous joined	12:58
polyzen	szmq, you can use `git reset`	12:59
	→ tristanp joined	12:59
	→ irc-5225225 joined	12:59
polyzen	or git rebase	12:59
szmq	http://scr.hu/0oin/jca8o	12:59
	← niels_ left	12:59
	← Amandil left	12:59
polyzen	the initial commits? use --rot	13:00
	--root*	13:00
	→ niels_ joined	13:00
	→ faux___ joined	13:00
polyzen	git reset apparently doesn't have --root	13:00
	← faux___ left	13:00
	→ faux___ joined	13:00
	→ mellernoia joined	13:00
	← niels_ left	13:00
	→ niels_ joined	13:01
	→ SirRetnuh joined	13:02
	→ Amandil joined	13:02
szmq	not work	13:02
	http://scr.hu/0oin/tmbu4	13:02
	← Anonymous left	13:03
	→ xudongz joined	13:03
	→ Anonymous joined	13:03
szmq	sry	13:03
	http://scr.hu/0oin/nbk9m	13:03
	→ pm90_ joined	13:03
	gitinfo set mode: +v	13:04
	→ victortyau joined	13:04
	← pm90_ left	13:04
Anonymous	What can we ask here?	13:04
	→ crose joined	13:04
szmq	how i cam remove 2 last commits ;/	13:05
	→ pm90_ joined	13:05
	← sinkensabe left	13:05
	← Anonymous left	13:05
Eugene	Anonymous - the only limit is yourself	13:05
	← niels_ left	13:05
	→ gutocarvalho joined	13:05
Eugene	szmq - !fixup	13:05
gitinfo	szmq: 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!	13:05
	← Zamyatin left	13:05
	← dgutierrez1287 left	13:05
	→ Diabolik joined	13:05
	→ CantFindTheNickn joined	13:06
	→ prefixed joined	13:06
	gitinfo set mode: +v	13:06
CantFindTheNickn	What can we ask here?	13:06
	← kp666 left	13:07
	→ Miesco joined	13:07
bremner	CantFindTheNickn: you can ask about the version control system git.	13:07
	if you don't know what that is, we probably can't help you.	13:07
	ChanServ set mode: +o	13:07
	→ bsanford joined	13:07
	→ diegoaguilar joined	13:07
	← nfk left	13:08
	Eugene changed the topic to: Welcome to #git, the place for git help and circular directory structures \| Current stable version: 2.4.5 \| Start here: http://jk.gs/git \| Getting "cannot send to channel"? /msg gitinfo .voice \| Yo dawg we heard you like commits so we put some commits in your tree so you can add submodules while you commit	13:08
	← jseplae left	13:08
	Eugene set mode: -o	13:08
	→ felipedvorak joined	13:08
CantFindTheNickn	I was asking that if there are any formal ways to ask?	13:08
Eugene	!ask	13:08
gitinfo	Yes, it's okay to ask questions here.... in fact, you just asked one! ;-) Pretty much any question is fine. We're not terribly picky, but we might be asleep. Please be patient and you should get an answer soon.	13:08
	← jteneyck left	13:08
	→ freimatz joined	13:08
	→ mscook joined	13:08
	← diegoaguilar left	13:09
	→ jteneyck joined	13:09
	→ buffal0 joined	13:09
	← szmq left	13:09
	→ knownasilya joined	13:12
	→ niels_ joined	13:13
	→ ClearC2 joined	13:13
	← jteneyck left	13:13
	→ pungi-man joined	13:14
	← Amandil left	13:14
	→ nfk joined	13:15
	→ jason237 joined	13:16
	← toothrot left	13:17
	→ zivester joined	13:17
	→ jerius joined	13:18
CantFindTheNickn	away CantFindTheNickn	13:18
	← jerius left	13:18
	← CantFindTheNickn left	13:18
	→ jerius joined	13:19
	← a3Dman left	13:19
bremner	!next	13:19
gitinfo	Another satisfied customer. NEXT!	13:19
	→ jerius_ joined	13:20
	→ a3Dman joined	13:21
	← theCole left	13:21
	← rasto left	13:21
	← nfk left	13:21
	→ theCole joined	13:22
	→ peconi joined	13:22
	← jerius left	13:23
	← theCole left	13:24
	→ osxi joined	13:24
	→ nfk joined	13:24
	→ arup_r_ joined	13:24
	← gutocarvalho left	13:24
	← nadim left	13:26
	→ theCole joined	13:26
	→ Spacew00t joined	13:27
	→ lindenle joined	13:27
	→ gutocarvalho joined	13:28
	← arup_r left	13:28
	→ nadim joined	13:28
	→ ashwink005 joined	13:29
	→ EricPoe joined	13:29
	← EricPoe left	13:29
	← arup_r_ left	13:29
	→ EricPoe joined	13:30
	← notebox left	13:30
	← mikecmpbll left	13:31
	→ notebox joined	13:31
	→ mikecmpbll joined	13:31
	← lindenle left	13:32
	← sachin_ left	13:33
	← osxi left	13:34
	← theCole left	13:34
	→ rasto joined	13:34
	← crose left	13:34
	→ stantonk joined	13:34
	← rchavik_zap left	13:35
	← pm90_ left	13:35
	← mscook left	13:36
	← nnyk left	13:36
	← eperez left	13:38
	← EricPoe left	13:38
	→ jamn joined	13:38
	→ nnyk joined	13:38
	→ osxi joined	13:38
	← notebox left	13:38
	→ eperez joined	13:38
	← stantonk left	13:39
	→ grill joined	13:40
	← grill left	13:40
	→ grill joined	13:40
	← gutocarvalho left	13:40
	← nfk left	13:40
	← dev_node_dbs left	13:40
	→ kpease joined	13:41
	← darkbasic_ left	13:41
	→ nfk joined	13:41
	← peconi left	13:41
	→ theCole joined	13:41
	→ peconi joined	13:41
	← mixandgo left	13:42
	→ gutocarvalho joined	13:42
	← osxi left	13:43
	← prefixed left	13:43
	→ darkbasic joined	13:43
	← theCole left	13:44
	→ gamename joined	13:44
	→ otter768 joined	13:45
	← Terabyte left	13:46
	← eperez left	13:47
	→ Terabyte joined	13:48
	→ khmarbaise joined	13:48
	→ interrobangd joined	13:48
	→ _Atom_ joined	13:48
	→ eperez joined	13:49
	← eperez left	13:49
brontosaurusrex	what are "circular directory structures"?	13:49
	→ Dougie187 joined	13:49
	→ eperez joined	13:50
	→ Phoenixz joined	13:50
	→ BlessJah joined	13:50
	← otter768 left	13:50
	← pungi-man left	13:50
	→ zumba_addict joined	13:51
	→ dgutierrez1287 joined	13:51
bremner	bad	13:51
BlessJah	after creating clone with --bare --shared, is it possible to fetch all locally required objects so I could remove upstream repository/clone?	13:51
	← eGGsha left	13:51
	→ jsnowball joined	13:52
	← Phoenixz left	13:54
	→ VictorCL joined	13:55
	→ charginghawk joined	13:55
	→ peconi_ joined	13:55
	→ kadoban joined	13:56
charginghawk	how can I bring one branch into another without committing the changes, like some sort of soft merge?	13:56
	→ Nindustries joined	13:56
Nindustries	Will git bundle --all contain all branches?	13:56
BlessJah	or get hardlinks as ifI've used --local, so removing upstream wouldn't render my repo unusable	13:57
	→ Kully3xf_ joined	13:57
	→ Phoenixz joined	13:57
BlessJah	charginghawk: git merge nocommit?[D[D[D[D	13:57
	meh, dash key borken	13:57
	→ Gamecubic joined	13:57
	→ oojacoboo joined	13:57
charginghawk	yasssssss thanks BlessJah	13:57
	← peconi left	13:57
	→ AaronMT joined	13:58
	→ notebox joined	13:58
	← zumba_addict left	13:58
	← leeyaa left	13:58
	← Kully3xf left	13:58
	← rzeka left	13:59
	→ jseplae joined	13:59
	← jseplae left	13:59
	→ eGGsha joined	14:00
	← faux___ left	14:00
	→ jseplae joined	14:00
BlessJah	Nindustries: it doesn't seem to bundle other branches	14:01
	→ Kully3xf joined	14:01
Nindustries	hmmm.. damn	14:01
	I'm looking at generating incremental dumps for all branches of a repo	14:01
	← Kully3xf_ left	14:01
	← nfk left	14:01
	← charginghawk left	14:01
	← grill left	14:02
	→ fahadash joined	14:02
	→ IrishPrime joined	14:02
	→ faux___ joined	14:02
	← fahadash left	14:02
	→ fahadash joined	14:02
	← fahadash left	14:02
	→ fahadash joined	14:02
	→ Rodya__ joined	14:03
BlessJah	Nindustries: oh, I'm wrong	14:03
	→ pm90_ joined	14:03
BlessJah	Nindustries: it does inlude those,	14:03
	→ prefixed joined	14:03
	← NimeshNeema left	14:03
	→ epitron joined	14:03
BlessJah	Nindustries: I should've used git budle listheads instead of cloning and listing git branch	14:04
Nindustries	aha! :D	14:04
	← darkbasic left	14:04
	→ EricPoe joined	14:04
	← amcsi_work left	14:04
	→ darkbasic joined	14:05
	← prefixed left	14:05
	→ muhaha03__ joined	14:06
	← nadim left	14:06
	← kpease left	14:07
	→ kpease joined	14:07
	← ilmgb left	14:07
	← MinetestForFun left	14:07
	← s8321414 left	14:07
	→ MinetestForFun joined	14:07
	→ CKyle joined	14:08
	→ ilmgb_ joined	14:08
	→ mbrzuzy joined	14:08
	← rasto left	14:08
	→ eletuchy joined	14:09
	→ Zamyatin joined	14:10
	← jamn left	14:11
	← khmarbaise left	14:11
	→ t-mart_ joined	14:13
Nindustries	Thanks for checking BlessJah. How come clone did not list the branches?	14:14
	← eletuchy left	14:14
	← zivester left	14:15
bremner	I missed context, but did you try "git branch -r" ?	14:15
	→ justtobe joined	14:17
	→ nfk joined	14:17
	← justtobe left	14:17
	→ amcsi_work joined	14:17
	→ osxi joined	14:18
	→ daivyk joined	14:18
	← martiis left	14:19
	← gutocarvalho left	14:19
	→ zumba_addict joined	14:20
	→ Malsasa_ joined	14:20
	Malsasa_ → Malsasa	14:20
	→ xlegoman joined	14:22
	→ rasto joined	14:22
	→ diegoviola joined	14:22
	→ weiyang joined	14:22
	→ gutocarvalho joined	14:22
	← weiyang left	14:23
	← kpease left	14:23
	→ happy-dude joined	14:23
	→ weiyang joined	14:24
	← weiyang left	14:24
	→ weiyang joined	14:24
	← IrishPrime left	14:24
	← dgutierrez1287 left	14:25
	→ gargola joined	14:25
	← xlegoman left	14:26
	→ beaconwriter joined	14:26
	→ tgunr joined	14:27
	← eggoez left	14:27
	← espindola left	14:28
	→ stantonk joined	14:29
	← eperez left	14:29
	← beckyconning_ left	14:29
	← Rodya__ left	14:29
	← _0xAX left	14:30
	→ eperez joined	14:30
	← zumba_addict left	14:30
	← Nindustries left	14:30
	→ zumba_addict joined	14:30
	→ kpease joined	14:31
	→ eggoez joined	14:32
	→ Dragooon joined	14:33
	← eperez left	14:33
	→ eperez joined	14:33
	→ chitopunk joined	14:33
	← Spacew00t left	14:33
	← Alienpruts left	14:34
	← stantonk left	14:35
	→ xk_id joined	14:35
	← zumba_addict left	14:35
	→ ArSn joined	14:36
	→ sheilong joined	14:36
	→ NeverDie joined	14:37
	→ Rodya_ joined	14:40
	← clmsy left	14:40
	← rsmarshall left	14:41
	→ cllamas joined	14:41
	→ Milos_ joined	14:41
	← NeverDie left	14:41
	→ iamjarvo joined	14:42
	← Milos left	14:42
	→ NeverDie joined	14:42
	← jceb left	14:43
	→ Milos joined	14:44
	← CKyle left	14:45
	← niels_ left	14:45
	→ jeffklex joined	14:45
	→ niels_ joined	14:45
	← Milos left	14:45
	→ espindola joined	14:46
	← jeffklex left	14:46
	← Milos_ left	14:46
	→ niels__ joined	14:47
	→ Spacew00t joined	14:48
	→ crose joined	14:49
	→ rwb1 joined	14:49
	→ dreiss joined	14:49
	→ Milos joined	14:49
	← peconi_ left	14:49
	← Milos left	14:49
	→ Milos joined	14:49
	← ilmgb_ left	14:50
	← niels_ left	14:50
	← crose left	14:50
	→ crose joined	14:50
	→ zumba_addict joined	14:50
	→ ilmgb joined	14:51
	← rwb left	14:51
	rwb1 → rwb	14:51
	← duderonomy left	14:51
	→ matleh joined	14:52
	→ lindenle joined	14:53
	→ uri_ joined	14:53
	→ PaulCapestany joined	14:54
	← jottr_ left	14:54
	→ ilmgb_ joined	14:54
	← lindenle left	14:54
	← roelmonnens left	14:55
	→ jeffklex joined	14:55
	← ilmgb left	14:55
	← jeffklex left	14:56
	→ jeffklex joined	14:57
	← gambl0re left	14:57
	← ilmgb_ left	14:58
	← jeffklex left	14:58
	→ zumba_ad_ joined	14:58
	← eperez left	14:58
	→ jeffklex joined	14:59
	← zumba_addict left	14:59
	← dreiss left	14:59
	← simesy left	14:59
	← weiyang left	15:00
	← jeffklex left	15:00
	→ jeffklex joined	15:00
	← sheilong left	15:01
	← niels__ left	15:01
	← interrobangd left	15:01
	→ niels_ joined	15:01
	→ sheilong joined	15:01
	← Boobuigi left	15:01
	← Silmarilion left	15:02
	← gua_ould left	15:03
	← zumba_ad_ left	15:03
	← fracting left	15:03
	← nfk left	15:04
	← kpease left	15:04
	→ kpease_ joined	15:04
	← eGGsha left	15:04
	← CustosL1men left	15:04
	→ Bootinbull joined	15:04
	→ niels__ joined	15:05
	← niels_ left	15:06
	← xk_id left	15:06
	→ nfk joined	15:07
	← nnyk left	15:07
	← flowinho left	15:08
	→ niels_ joined	15:08
	→ d10n-work joined	15:09
	→ diegoaguilar joined	15:10
	→ ig0r__ joined	15:10
	→ ehmatthes joined	15:10
	→ m0ltar joined	15:10
	← ig0r_ left	15:10
	← niels__ left	15:11
	← abrrs left	15:11
	← xudongz left	15:13
	← VictorCL left	15:13
	→ CKyle joined	15:13
	← niels_ left	15:14
	→ lindenle joined	15:15
	→ xudongz joined	15:15
	← nfk left	15:15
	→ VictorCL joined	15:15
	→ zumba_addict joined	15:15
	← ThomasLocke left	15:15
	→ nfk joined	15:15
	→ the_cybersphinx joined	15:15
	→ bakhtiya joined	15:16
	→ ig0r_ joined	15:17
	→ chrisgeorge joined	15:17
	← aspiers left	15:18
	chrisgeorge → Guest62493	15:18
	← Guest62493 left	15:18
	← Gizburdt left	15:18
	→ rwb1 joined	15:18
	← ig0r__ left	15:19
	← iooner left	15:19
	→ stantonk joined	15:20
	→ danzilio joined	15:20
	← jeffklex left	15:20
	← rwb left	15:20
	← rwb1 left	15:22
	→ dsop joined	15:23
	→ iooner joined	15:23
	→ IrishPrime joined	15:23
	→ dreiss joined	15:23
	→ mikecmpb_ joined	15:24
	→ learnme_ joined	15:24
	→ Ouuo joined	15:25
	← Ouuo left	15:25
learnme_	If I accidentally submitted a pull request to master, how can I close that request and resubmit it to a different branch	15:25
	← mikecmpbll left	15:25
	→ mikecmpbll joined	15:25
	← xudongz left	15:26
	→ sixtyten joined	15:27
	→ rwb joined	15:27
	→ fracting joined	15:27
	← mikecmpb_ left	15:29
	→ xudongz joined	15:29
	← MinetestForFun left	15:30
	→ thiago_ joined	15:31
	→ eob joined	15:32
	→ CustosL1men joined	15:32
	→ tyreld joined	15:32
	← eob left	15:33
	→ eperez joined	15:33
	← eperez left	15:33
BlessJah	bremner: yes, you missed the context, but git branch -r was the answer	15:34
	→ eperez joined	15:34
	← xudongz left	15:34
	→ xudongz joined	15:34
	→ skcin7 joined	15:35
	← Error404NotFound left	15:35
	→ Err404NotFound joined	15:35
BlessJah	bremner: question was whether git bundle --all will include branches, I've created bundle, cloned from it and did git branch, while the correct way to check would be either git brach -r or git bundle list-heads	15:35
	← dangerousdave left	15:36
	← Err404NotFound left	15:36
	→ dangerousdave joined	15:37
	← danzilio left	15:37
	← amcsi_work left	15:37
kadoban	learnme_: #github	15:37
	→ phryk joined	15:38
	← xudongz left	15:39
BlessJah	is it possible to turn clone created with --shared (a.k.a. objects/info/alternatives) into --local (hardlinks to objects)?	15:39
learnme_	kadoban: aight	15:39
	thanks :)	15:39
	← learnme_ left	15:39
	→ bronson joined	15:39
	→ xudongz joined	15:39
	← matleh left	15:40
	→ ig0r__ joined	15:40
	→ Mixologic joined	15:40
	← SirRetnuh left	15:41
	← eperez left	15:41
	← Balliad left	15:41
grawity	BlessJah: not sure about an automatic tool, but a manual `ln` would work	15:42
	← ig0r_ left	15:43
	← bronson left	15:44
	→ eperez joined	15:45
	→ oxem joined	15:46
	→ eka joined	15:46
	→ Oog_ joined	15:46
	← oxem left	15:46
	→ otter768 joined	15:46
	→ youser joined	15:47
	← NeverDie left	15:47
	← dangerousdave left	15:47
	→ SimonNa joined	15:47
	← AaronMT left	15:48
	← gfixler left	15:48
	→ dangerousdave joined	15:48
	→ AaronMT joined	15:48
	← Thorax15 left	15:51
	← otter768 left	15:51
	→ aspiers joined	15:51
	← VictorCL left	15:53
	→ revision joined	15:53
	→ Gama11 joined	15:54
	→ m0viefreak joined	15:55
	← brule left	15:55
	← chronos_ left	15:55
	← elsevero left	15:55
	← rasto left	15:55
	← Gama11_ left	15:55
	→ Thorax15 joined	15:56
	→ jfran joined	15:56
	← bvi left	15:58
	→ aaynd joined	15:58
	← aaynd left	15:58
	→ amcsi_work joined	15:58
	→ ule joined	15:59
ule	hello my friends	15:59
	I'm trying to understand git merge --no-ff	15:59
	so.. what's the differece using --no-ff and just git merge my-branch ?	15:59
	both creates a commit about the merge	15:59
Dougie187	ule: `git merge --no-ff` forces the creation of a merge commit (i.e. a commit with two parents)	15:59
	→ eGGsha joined	16:00
Dougie187	ule: `git merge my-branch` can sometimes perform a fast-forward merge, which doesn't create a new commit	16:00
	← psoo left	16:00
	→ Gama11_ joined	16:00
ule	Dougie187: so..	16:01
	If I understdood well..	16:01
	← cdown left	16:01
ule	using only git merge.. I have a commit with the message that I used to commit in my branch	16:01
	→ jceb joined	16:01
	→ pm90__ joined	16:02
ule	and using --no-ff I have a commit with the default message: Merge branch 'xxxx'	16:02
	→ cdown joined	16:02
Dougie187	Here is an example.	16:02
	→ mflow joined	16:02
	← Gama11 left	16:02
Dougie187	If you do `git checkout -b my-branch origin/master`	16:02
ule	Dougie187: ok..	16:02
Dougie187	`<make some change>; git commit -a -m "My new commit"`	16:03
ule	it will create a new branch and switch to it	16:03
	→ reim joined	16:03
Dougie187	you now have a new commit on a branch	16:03
	Then you `git checkout master`	16:03
ule	ok..	16:03
	ok...	16:03
	now you have to merge from my-branch	16:03
Dougie187	Now, if you do `git merge my_branch`, it will merge the branch in a way that looks like you just committed you changes to master to begin with	16:03
	i.e. there is no merge commit	16:03
	(at least depending on your default settings)	16:03
ule	yeah..	16:03
Dougie187	The equivalent "force" command is `git merge --ff-only`	16:03
	If you `git merge --no-ff my-branch`	16:04
	← pm90__ left	16:04
Dougie187	it creates a new commit, that has two parents and says "Merge branch ..."	16:04
ule	only with git merge my-branch we'll see "My new commit"	16:04
	→ jottr_ joined	16:04
	→ kongthap joined	16:04
	→ pm90__ joined	16:04
ule	Dougie187: gotcha!!	16:05
	Dougie187: so..	16:05
	I believe it's better to always use --no-ff right?	16:05
Dougie187	It depends on workflow.	16:05
	I like --no-ff personally, because you can hide the commits that were on a branch and get a list of features that have been merged recently	16:05
	← pm90_ left	16:05
Dougie187	Some workflows like --ff-only more	16:05
ule	so.. when you say two parents.. one parent will be on master and another one is going to be from my-branch ?	16:05
Dougie187	Yup, one is the last commit on master, (i.e. the first parent) and the other is the last commit on your branch.	16:06
ule	Dougie187: but what happens if I delete my-branch?	16:06
kongthap	i still confuse about using pointer in git, i have 3 commits, "git cat-file -p HEAD" shows me latest commit, "git cat-file -p HEAD^" i got More? in response, HEAD^^ show me the 2nd commit, and HEAD^^^^ show me the first commit, is this the way it is what wrong with ^ and ^^^ and may be ^^^^^ ?	16:06
Dougie187	So, I like to describe a branch as kind of like a postit on a specific commit.	16:07
	When you delete a branch, you're just deleting the post-it.	16:07
	So, if you've already merged, nothing really happens.	16:07
ule	Dougie187: cool	16:07
	Dougie187: thanks so much for your explanation	16:07
	:)	16:07
_ikke_	kongthap: Your question is not clear to me	16:07
ule	kongthap: you can pass the commit hash.. I don't need to use always HEAD	16:08
_ikke_	You can also use HEAD~n, where n is the number of commits to go back	16:09
	← jottr_ left	16:09
	→ gbci joined	16:09
	→ rasto joined	16:09
	← gbci left	16:10
kongthap	_ikke_, ule, i though ^ is kind of step ^ = one step, ^^ = 2 steps	16:10
	→ drewo joined	16:10
	→ eletuchy joined	16:10
	→ nadim joined	16:10
kongthap	_ikke_, HEAD~1, HEAD~2 works well	16:11
	← Miesco left	16:11
_ikke_	kongthap: ^ == ^1 == first parent	16:12
	^2 == second parent	16:12
	^^ is the first parent of the first parent	16:12
	which is equal to ~2	16:13
	see man gitrevisions	16:13
gitinfo	the gitrevisions manpage is available at http://jk.gs/gitrevisions.html	16:13
	→ nokio joined	16:13
BlessJah	grawity: yep, ln would work, but it's not the tool I'd use on busy production server	16:13
kongthap	_ikke_, i always misunderstand about this, thanks	16:13
	PerlJam waits for the ^2~3 description from _ikke_ ;)	16:13
	← howlymowly left	16:13
	← darkschneider left	16:13
	→ darkschneider joined	16:14
	→ johnflux joined	16:14
	← eletuchy left	16:15
	← eka left	16:15
	→ triton joined	16:15
	← m0viefreak left	16:15
johnflux	I'm trying to do: git review -s but it's not asking me questions to set up	16:15
	it just complains "No '.gitreview' file found in this repository"	16:16
	→ Ungj joined	16:16
	← ntwari left	16:16
	← greggynapalm left	16:16
	← faux___ left	16:16
	← systmkor left	16:16
	→ faux___ joined	16:16
	← Ungj left	16:16
ule	Dougie187: so.. I tested here..	16:17
	Created a branch	16:17
	created 2 commits	16:17
	→ eka joined	16:17
ule	went back to master and merge without --no-ff	16:17
	so.. I had to git push	16:17
	so.. I did the same thing	16:17
	→ imachuchu joined	16:17
ule	and went back to master.. and when I used --no-ff It requested the Merge message	16:18
	so.. ok...	16:18
	← daivyk left	16:18
	← nokio left	16:18
ule	but I have all the history about the commits in my branch in both cases	16:18
	→ nokiomanz joined	16:18
	← faux___ left	16:18
	→ faux___ joined	16:18
ule	so.. --no-ff didn't hide my branch commits.. it only added a new commit saying.. "Merge branch 'my-branch'	16:18
	← dreiss left	16:18
	← eggoez left	16:19
ule	and I wasn't able to see where is the two-parents	16:19
	← skullcrasher left	16:19
	→ Xxozc joined	16:19
ule	maybe because I didn't push the local branches to my github?	16:19
	← Xxozc left	16:19
	← nadim left	16:19
	→ systmkor joined	16:19
	→ Amandil joined	16:20
	← Malsasa left	16:20
	→ pheaver joined	16:20
	→ ulds joined	16:20
	← ulds left	16:21
	→ SirRetnuh joined	16:21
	→ TomyLobo joined	16:21
ule	Yeah	16:21
_ikke_	PerlJam: ^2~3 means the parent of the parent of the parent of the second parent :P	16:21
ule	Dougie187: after pushing the local branches to remote now I can see	16:21
	cool..	16:22
	→ Amandil\|2 joined	16:22
_ikke_	johnflux: That's not a default git command	16:22
	→ danzilio joined	16:22
ule	gonna create a post on my blog to memorize all learned stuffs	16:22
	← eka left	16:22
johnflux	_ikke_: I know	16:23
	← m0ltar left	16:23
_ikke_	ule: What dougie meant is that with actual merge commits, you can do git log --first-parent, and only see the features	16:23
	johnflux: Perhaps you can provide some context at least	16:23
Dougie187	ule: nice. :D	16:23
kongthap	_ikke_, i'm reading the link you sent, if my first's commit's hash was A, can i use "git cat-file -p A^" to display 2nd commit (B) ? (the link says B = A^ = A^1 = A~1)	16:23
	→ xlegoman joined	16:23
	→ m0viefreak joined	16:23
	← mflow left	16:24
	← freimatz left	16:24
_ikke_	kongthap: Yes	16:24
	← cdown left	16:24
	← Amandil left	16:24
	← iamjarvo left	16:24
	→ eka joined	16:24
johnflux	_ikke_: git review -s is supposed to prompt you for the gerrit server name, but it doesn't anymore :-)	16:25
	→ admin___ joined	16:25
	→ petersson joined	16:25
kongthap	_ikke_, please look at this http://i.cubeupload.com/sguO0o.png	16:25
_ikke_	kongthap: try to escape the ^, it has meaning in some shells	16:26
	kongthap: Note that it's easier to use HEAD instead of specifying the full commit hash	16:27
kongthap	_ikke_ that's was why i just use ^^ ?	16:27
	→ eggoez joined	16:28
kongthap	_ikke_, i agree to use HEAD instead but just really curious what i did wrong	16:28
	→ Apru joined	16:28
	← Apru left	16:28
_ikke_	ok	16:28
	← xlegoman left	16:29
	← kurkale6ka left	16:29
	← settermjd left	16:30
	→ Kmepz joined	16:30
	← Kmepz left	16:31
	→ Una joined	16:31
	→ duderonomy joined	16:31
	→ yqt joined	16:31
nokiomanz	Hi all, I want to have a central linux web server. I have a lot of developer who want to work on code localy with git. They cant have a web server localy. What would be an interesting way to set things up so that they can work localy but have the code on the server to be able to test small change before pushing to the git server. If i make any sense.	16:31
	← Hounddog left	16:33
	→ Nikhil_D joined	16:33
PerlJam	nokiomanz: If I understand you correctly, you don't have a git problem :)	16:33
	→ maestrojed joined	16:33
	→ maletor joined	16:34
	← johnflux left	16:34
	→ Gizburdt joined	16:34
	→ Lzufg joined	16:35
ule	_ikke_: ohhh.. nice.. so.. you can isolate only what you wanna see.. I definatelly will start using --no-ff always here	16:35
	← mikecmpbll left	16:36
	← Lzufg left	16:36
	→ dgutierrez1287 joined	16:36
nokiomanz	+PerlJam, well not really. But i was curious if people had interesting tough on the subject. What I am trying right not is to have the code on the server shared via samba. But when I run git command localy on top of the share it is super slow. Which is why I can here	16:37
_ikke_	ule: Use it when it makes sense	16:38
	→ Pkije joined	16:38
_ikke_	ule: see also !workflow	16:38
gitinfo	ule: Finding the right workflow for you is critical for the success of any SCM project. Git is very flexible with respect to workflow. See http://sethrobertson.github.com/GitBestPractices/#workflow for a list of references about choosing branching and distributed workflows.	16:38
	← Gama11_ left	16:38
	→ freestyl3r joined	16:39
_ikke_	nokiomanz: I use sftp (automated by my ide) to synchronize files with a remote server	16:39
	← Oog_ left	16:39
	← faux___ left	16:40
	← Pkije left	16:40
PerlJam	nokiomanz: you could setup the webserver such that /developer/site is a branch of the repo of the developer's choosing. Then they do their work in that branch and test it on that path of the server.	16:40
	→ madewokherd joined	16:40
	← dgutierrez1287 left	16:41
	→ axji joined	16:41
	→ jontmorehouse joined	16:42
	← Rodya_ left	16:42
	→ Gama11 joined	16:43
	→ upene joined	16:43
	← axji left	16:43
	→ theredaaron joined	16:43
	← eperez left	16:44
	← Gizburdt left	16:44
	→ Qaano joined	16:44
	→ eperez joined	16:44
	← drewo left	16:44
	← Qaano left	16:45
	→ durham joined	16:45
	← theredaaron left	16:46
	→ ProT-0-TypE joined	16:46
nokiomanz	+_ikke_ interesting, i need to think about that	16:46
	→ bronson joined	16:46
	← pm90__ left	16:47
nokiomanz	+PerlJam, meaning they would be working on the dev server via ssh. so they could not work localy with their ide of choosing. Sorry if i dont understand correctly english is not my main language :p	16:47
	← eka left	16:47
_ikke_	nokiomanz: You can use inotifywait to do something similar	16:47
	→ pm90_ joined	16:47
	→ goyg joined	16:47
	← eperez left	16:48
	→ skylite_ joined	16:48
	← goyg left	16:48
	→ eperez joined	16:49
	→ Gizburdt joined	16:49
	→ eka joined	16:49
	← JanC left	16:49
	→ codetroll joined	16:49
nokiomanz	+_ikke_, noted I will read about that. At this point im mostly trying to gather ideas. They really want to keep working locally so that they can have tools of their choosing. But there is 1 thing that they cant have localy and it's a web server.	16:50
kongthap	can i list all objects (tree, blobl) related to a specified commit ? i tried git rev-list --objects HEAD but i got all objects in the repository	16:50
	→ Khisanth joined	16:50
	← nfk left	16:50
	→ sross07 joined	16:52
	← eka left	16:52
	→ uish joined	16:53
	← Terabyte left	16:53
	→ MinetestForFun joined	16:53
	← uish left	16:54
	→ nadim joined	16:54
	→ Terabyte joined	16:54
	→ drewo joined	16:55
	→ shinnya joined	16:55
	← upene left	16:56
	→ nfk joined	16:56
	→ frobware_ joined	16:57
	← frobware_ left	16:57
	→ kzeij joined	16:58
	→ katherin_ joined	16:58
	katherin_ → katherine	16:58
	← encod3 left	16:58
	← kzeij left	16:58
	→ theCole joined	16:59
	← jsnowball left	17:00
	→ MattMaker joined	17:01
	→ ufp joined	17:01
	← CKyle left	17:01
	← thiago_ left	17:02
	→ a-l-e joined	17:02
	← eperez left	17:02
	← ufp left	17:02
	← ki0 left	17:02
	← iooner left	17:03
	← fumihiro left	17:03
	← CustosL1men left	17:03
	← Una left	17:03
	→ JanC joined	17:04
	→ iooner joined	17:04
	→ Sasazuka joined	17:04
	← ProT-0-TypE left	17:05
	← ashwink005 left	17:05
	→ dreiss joined	17:05
	→ jottr_ joined	17:05
	← Sasazuka left	17:05
	← kpease_ left	17:07
	→ Sasazuka joined	17:07
	→ Gama11_ joined	17:07
	← kongthap left	17:07
	→ Rnfc joined	17:08
	← Rnfc left	17:08
	→ sailorswift joined	17:08
	← Gama11 left	17:09
	← notebox left	17:09
	→ kpease joined	17:09
	→ upene joined	17:09
	← upene left	17:09
	← jottr_ left	17:10
	← aspiers left	17:10
	→ angelsl joined	17:10
	→ mikecmpbll joined	17:11
	→ romangineer joined	17:12
	→ Noldorin joined	17:13
	→ nettoweb joined	17:13
	→ sinkensabe joined	17:13
	← maestrojed left	17:14
	← durham left	17:15
	← _Atom_ left	17:15
	→ Una joined	17:16
	← ule left	17:16
	← amcsi_work left	17:17
	→ durham joined	17:17
	← bongjovi left	17:17
	→ Famk joined	17:17
	→ dsop_ joined	17:17
	← dsop left	17:17
	← dsop_ left	17:17
	← Famk left	17:17
	→ dsop joined	17:17
	→ upene joined	17:17
	→ ascarter joined	17:17
	→ maestrojed joined	17:18
	→ Arle joined	17:18
	← Arle left	17:18
	← ascarter left	17:19
	→ hahuang61 joined	17:19
	→ Gama11 joined	17:19
	← hahuang61 left	17:19
	→ ascarter joined	17:19
	← sixtyten left	17:19
	→ faux___ joined	17:19
	→ Wii joined	17:20
	→ pantsman- joined	17:20
	← Wii left	17:20
	← sinkensabe left	17:20
	← ascarter left	17:20
	← espindola left	17:21
	→ ascarter joined	17:21
	→ Ywlai joined	17:21
	→ sinkensabe joined	17:21
	← Ywlai left	17:22
	← Gama11_ left	17:22
	→ avinash joined	17:22
	→ jottr_ joined	17:22
	→ eperez joined	17:22
	→ hahuang65 joined	17:22
	→ eka joined	17:23
	→ gambl0re joined	17:24
	→ jeffklex joined	17:24
	← sinkensabe left	17:24
	← cllamas left	17:24
	→ buffffal00 joined	17:24
	→ NeverDie joined	17:25
	→ axisys joined	17:25
	→ sinkensabe joined	17:25
	← jeffklex left	17:25
	→ jsnowball joined	17:26
	→ devoldmx joined	17:26
	→ jeffklex joined	17:26
	→ Kully3xf_ joined	17:27
	← jottr_ left	17:27
	← buffal0 left	17:27
	→ ProT-0-TypE joined	17:27
	← Kully3xf left	17:27
	→ espindola joined	17:27
	← jeffklex left	17:27
	→ HelloShitty- joined	17:27
	← triton left	17:27
	← xcesariox left	17:28
EvilDMP	I made a commit that deleted a file, https://github.com/aldryn/aldryn-jobs/pull/79/files, but I've changed my mind and would like that back. Is there a command that can do that?	17:28
	→ jeffklex joined	17:28
BlessJah	EvilDMP: it's either git revert to revert commit or git checkout to restore previous version of file and commit it	17:29
	← jeffklex left	17:29
EvilDMP	BlessJah: it's only one file, out of many other changes	17:29
	→ encod3 joined	17:29
	→ jeffklex joined	17:30
	→ Muhannad joined	17:30
	← jeffklex left	17:30
	← admin___ left	17:30
	→ jottr_ joined	17:30
	← maestrojed left	17:30
BlessJah	then git checkot	17:30
	← Una left	17:31
	→ Klae joined	17:31
	← Klae left	17:31
BlessJah	EvilDMP: git checkout <tree-ish> -- <paths>	17:31
EvilDMP	thnaks, BlessJah	17:32
BlessJah	no problem	17:32
	← danzilio left	17:32
	← dangerousdave left	17:33
	← fracting left	17:33
	→ Miesco joined	17:33
	→ CKyle joined	17:33
	→ jeffklex joined	17:33
	→ gdsl joined	17:34
	→ radialneon joined	17:34
	← gdsl left	17:34
	← jeffklex left	17:34
	← Muhannad left	17:35
	← nadim left	17:35
	← jottr_ left	17:35
	← mellernoia left	17:35
	→ Una joined	17:36
	→ jteneyck joined	17:36
	→ oenrh joined	17:36
	→ jeffklex joined	17:36
	← oenrh left	17:36
	→ MattMake_ joined	17:37
	← EricPoe left	17:37
	← MattMaker left	17:37
	→ dangerousdave joined	17:37
	→ maestrojed joined	17:37
	← bronson left	17:38
	← Terabyte left	17:40
	← encod3 left	17:40
	→ Terabyte joined	17:40
	← Una left	17:40
	→ Pseudocrat joined	17:40
	← Amandil\|2 left	17:41
	→ joki joined	17:41
	← polyzen left	17:42
	→ radialneon_ joined	17:42
	← Dougie187 left	17:43
	← sailorswift left	17:43
	→ BonKurei joined	17:43
	← ehmatthes left	17:44
	→ Kully3xf joined	17:44
	← radialneon left	17:44
	← Kully3xf_ left	17:46
	← ProT-0-TypE left	17:46
	← dlitz left	17:47
	← MinetestForFun left	17:47
	→ otter768 joined	17:47
	→ MinetestForFun joined	17:48
	← jeffklex left	17:48
	→ polyzen joined	17:48
	← JanC left	17:50
	← marcogmonteiro left	17:50
	→ dlitz joined	17:51
	→ dgutierrez1287 joined	17:51
	← otter768 left	17:52
	→ paddymahoney joined	17:52
	← jsnowball left	17:52
	→ ProT-0-TypE joined	17:54
	← ascarter left	17:54
	→ encod3 joined	17:54
	→ thiago joined	17:55
	→ JanC joined	17:55
	← guampa left	17:56
	→ sailorswift joined	17:56
	← petersson left	17:56
	← uri_ left	17:57
	→ michelangelo joined	17:57
	→ danzilio joined	17:57
	→ ascarter joined	17:58
	← eperez left	17:58
	← muhaha03__ left	17:59
	→ eperez joined	17:59
	→ guampa joined	17:59
	→ abacuspowers joined	17:59
	→ ntwari joined	17:59
	→ ehmatthes joined	17:59
	← BonKurei left	18:01
	→ snthsnth joined	18:03
	← eperez left	18:03
	→ eperez joined	18:04
	← freestyl3r left	18:06
	← angelsl left	18:06
	→ ekain joined	18:07
	→ greggynapalm joined	18:07
	→ bronson joined	18:09
	← ProT-0-TypE left	18:10
	← jteneyck left	18:10
	← xudongz left	18:10
	← danzilio left	18:11
	→ eletuchy joined	18:11
	→ EricPoe joined	18:12
	← stantonk left	18:13
	→ iamjarvo joined	18:13
	← HelloShitty- left	18:13
	← dlitz left	18:13
	→ HelloAtMega joined	18:14
	→ stantonk joined	18:14
	→ stantonk_ joined	18:16
	← eletuchy left	18:16
	→ dlitz joined	18:16
	→ danzilio joined	18:17
	MattMake_ → MattMaker	18:18
	→ tpollard joined	18:18
	← stantonk left	18:19
	← iooner left	18:19
	→ petersson joined	18:20
	← Brain left	18:21
	← gambl0re left	18:22
	← tvw left	18:23
	→ ChangChong joined	18:23
	← rob_w left	18:23
	→ VictorCL joined	18:24
	→ benishor_ joined	18:24
	→ gambl0re joined	18:24
	→ wagle_ joined	18:24
	→ Thorax15_ joined	18:24
	→ marko__ joined	18:24
	→ wcpan_ joined	18:24
	← ehmatthes left	18:25
	← nokiomanz left	18:25
	← iamjarvo left	18:25
	→ atrioom_ joined	18:25
	← VictorCL left	18:25
	→ dsop_ joined	18:25
	→ sunny256 joined	18:25
	→ plasticb1y joined	18:26
	→ zequence_ joined	18:26
	→ dropdriv1 joined	18:26
	→ nowox_ joined	18:26
	→ BlessJah_ joined	18:26
	→ thearthu1 joined	18:26
	→ ixian8 joined	18:26
	→ xlegoman joined	18:26
	→ mteufel joined	18:27
	→ sorenb joined	18:27
	→ _ikke__ joined	18:28
	← _ikke_ left	18:28
	_ikke__ → _ikke_	18:28
	ChanServ set mode: +v	18:29
	→ mino_ joined	18:29
	→ Virox_ joined	18:29
	→ Spinkzeit joined	18:29
	→ RickyB98\|BNC joined	18:29
	→ benaiah` joined	18:29
	→ marvi_ joined	18:29
	→ Esya joined	18:29
	→ Don joined	18:29
	→ Hello71_ joined	18:29
	→ dvdyzag_ joined	18:29
	Don → Guest56275	18:29
	→ digifiv5e joined	18:29
	→ DiabolikFreenode joined	18:29
	→ eagles05- joined	18:29
	digifiv5e → Guest55992	18:29
	→ gvdevil joined	18:30
	→ varesa_ joined	18:30
	→ Amandil\|2 joined	18:30
	← Amandil\|2 left	18:30
	→ davidstrauss_ joined	18:30
	→ EugeneKay joined	18:30
	→ guide joined	18:30
	← dgutierrez1287 left	18:30
	← buffffal00 left	18:30
	← dsop left	18:30
	← Thorax15 left	18:30
	← AaronMT left	18:30
	← bakhtiya left	18:30
	← jason237 left	18:30
	← felipedvorak left	18:30
	← Kicer86 left	18:30
	← ome left	18:30
	← ExeciN left	18:30
	← Douhan left	18:30
	← maxorator left	18:30
	← raven-au left	18:30
	← wagle left	18:30
	← jokester left	18:30
	← pks left	18:30
	← Orbitrix left	18:30
	← SpeakerToMeat left	18:30
	← BlessJah left	18:30
	← Diabolik left	18:30
	← sunny256_ left	18:30
	← jhermann left	18:30
	← Liam` left	18:30
	mino_ → mino	18:30
	→ someplac- joined	18:31
	EugeneKay → Eugene	18:31
	← xlegoman left	18:31
	→ i_ron joined	18:31
	→ Liam` joined	18:31
	→ jottr_ joined	18:31
	→ iooner_ joined	18:31
	→ kisonecat joined	18:31
	→ creep_ joined	18:31
	→ lord4163 joined	18:32
	→ Ziber joined	18:32
	→ iamjarvo joined	18:32
	← Ziber left	18:32
	← romangineer left	18:32
	→ bakhtiya joined	18:32
	← Guest55992 left	18:32
	→ Guest55992 joined	18:32
	→ Ziber joined	18:32
	← Ziber left	18:32
	→ Ziber joined	18:33
	← benaiah` left	18:33
	→ SegFaultAX joined	18:33
	← SegFaultAX left	18:33
	→ SegFaultAX joined	18:33
	← upene left	18:33
	→ webmeister joined	18:33
	→ sgen_ joined	18:33
	→ poi joined	18:33
	→ j416 joined	18:33
	→ Jeroen joined	18:34
	→ SJr joined	18:34
	→ pks joined	18:34
	→ Rubin joined	18:35
	← creep left	18:35
	→ raven-au joined	18:35
	← ascarter left	18:35
	→ romangineer joined	18:35
	→ justtobe joined	18:35
	→ gv joined	18:35
	→ Kicer86 joined	18:35
	→ ascarter joined	18:35
	← jottr_ left	18:35
	→ supsup joined	18:36
	← petersson left	18:36
supsup	is it bad practice for people to A) not check in a .gitignore file and B) check in code that is dynamically compiled every time you run?	18:36
	← justtobe left	18:37
moritz	yes and yes	18:37
supsup	yeah seems bogus to me	18:37
	→ ashwink005 joined	18:37
bremner	supsup: check in the output of the compiler?	18:37
	← Rubin left	18:37
moritz	some people dispute A), but everybody sane agrees that B) is bad	18:37
	→ jottr_ joined	18:38
	→ salamanderrake joined	18:38
supsup	is there anyway i can make my own local git ignore the files they checked in? I tried to retroactivly make my own gitignore but since the files are already checked in they still get tracked	18:38
	→ ExeciN joined	18:39
CJ_	Entirely too many people do "git add ." when committing.	18:39
ojacobson	"no."	18:39
	CJ_: that's daft; you should use `git add --all :/` instead :)	18:39
	supsup: git will never ignore tracked files.	18:39
supsup	and everytime I recompile the project all those files get added to my staging area	18:39
	i think i'm going to quit working on this then ;-0	18:40
	→ jsnowball joined	18:40
	← dlitz left	18:40
supsup	thanks for the responses i thought this was the case but I wanted to make sure I was just not ignorant of something new	18:40
	← romangineer left	18:41
	→ stantonk joined	18:42
	← gutocarvalho left	18:42
	eGGsha → eGGshke	18:42
	← eGGshke left	18:43
	← stantonk_ left	18:43
	→ ropav joined	18:43
	→ romangineer joined	18:43
	→ _Atom_ joined	18:43
	→ eGGsha joined	18:43
	← romangineer left	18:44
	→ dlitz joined	18:44
	← paddymahoney left	18:44
	wagle_ → wagle	18:45
	→ jteneyck joined	18:45
	← tpollard left	18:47
	→ sparetire_ joined	18:47
	→ mellernoia joined	18:49
	← EricPoe left	18:50
_ikke_	To people that don't want to track .gitignore: use .git/info/exclude	18:50
	← greggynapalm left	18:50
	← stantonk left	18:50
_ikke_	The purpose of .gitignore is to track ignore rules that are common to the project	18:50
supsup	will that also ignore files that are checked in?	18:51
	← dc5ala left	18:51
	→ stantonk joined	18:51
_ikke_	nope	18:51
	!ignore_untracked	18:51
gitinfo	[!ignore_tracked] Git only applies ignore patterns to untracked files. You can't use ignore patterns to ignore changes to files that are already tracked by git. To remove files only from git, but keeping them on disk, use git rm --cached <file>. Still, see https://gist.github.com/1423106 for ways people have worked around the problem.	18:51
	← Thorax15_ left	18:53
	→ Diziet joined	18:53
	← snthsnth left	18:54
	← dangerousdave left	18:56
	← Terabyte left	18:56
	→ Terabyte joined	18:57
	→ BBBThunda joined	18:58
	← nettoweb left	18:58
	← eperez left	18:58
	← marscher left	18:58
	→ eperez joined	18:59
	← ArSn left	18:59
	← ascarter left	19:01
	← duderonomy left	19:01
	→ kukks joined	19:01
	→ johnflux joined	19:03
	← johnflux left	19:03
	→ johnflux joined	19:03
	← eperez left	19:03
	→ DolphinDream joined	19:04
	→ eperez joined	19:04
	← faux___ left	19:04
	← jceb left	19:04
	→ Pookz joined	19:06
	→ nettoweb joined	19:06
	← MinetestForFun left	19:07
	→ blimpse joined	19:07
	→ noname joined	19:08
	← jontmorehouse left	19:09
	→ elsevero joined	19:10
	→ cllamas joined	19:13
	← johnflux left	19:13
	→ m0ltar joined	19:13
	→ MechtiIde joined	19:14
	→ Iniglo joined	19:15
	← SirRetnuh left	19:15
	jottr_ → jottr	19:15
	→ johnflux joined	19:16
	← Miesco left	19:16
	→ faux___ joined	19:16
	← faux___ left	19:16
	→ faux___ joined	19:16
	→ scientes joined	19:17
	← cllamas left	19:18
	→ upene joined	19:18
	← bitkiller left	19:19
	→ bitkiller joined	19:19
	BlessJah_ → BlessJah	19:19
	← abacuspowers left	19:20
	→ petersson joined	19:21
	→ dangerousdave joined	19:21
	→ franl joined	19:21
	← bronson left	19:22
	← franl left	19:24
	← upene left	19:24
	→ WaReZ joined	19:25
	← faux___ left	19:27
	← drewo left	19:27
	→ tsester joined	19:27
	→ xlegoman joined	19:28
	→ ki0 joined	19:28
	← ki0 left	19:28
	← tsester left	19:29
	→ Guest16301 joined	19:29
	← someplac- left	19:32
	← xlegoman left	19:32
	→ someplace joined	19:32
	→ faux___ joined	19:32
	← MechtiIde left	19:33
	→ ilmgb joined	19:33
	← faux___ left	19:34
	→ freestyl3r joined	19:35
	← nfk left	19:36
	← Iniglo left	19:36
	→ Rubin joined	19:37
	→ martiis joined	19:39
	→ nfk joined	19:40
	← sfeinste left	19:40
	→ sfeinste joined	19:40
	→ diminoten joined	19:41
	← dangerousdave left	19:41
	→ eletuchy joined	19:42
	→ bahar joined	19:42
	← bahar left	19:42
	→ bahar joined	19:42
	→ faux___ joined	19:42
	← iamjarvo left	19:43
	→ bronson joined	19:43
	← eggoez left	19:43
	← codetroll left	19:43
	→ grantwu joined	19:44
grantwu	If I SSH into localhost, will server-side hooks be run?	19:44
	← sgen_ left	19:44
rom1504	grantwu: hooks are not a ssh concept	19:45
grantwu	rom1504: Okay, so when are hooks run?	19:45
	Assume they are defined in the repo.	19:45
	→ eggoez joined	19:45
grantwu	er, sorry	19:45
	← sanketdg left	19:45
grantwu	I meant, if I define the remote to be ssh://localhost/<path_to_repo> and push to that remote	19:46
	→ buffal0 joined	19:46
grantwu	Will server-side hooks be run?	19:46
	← eletuchy left	19:46
	→ mkkl joined	19:47
	→ Azuvector joined	19:47
	gitinfo set mode: +v	19:47
	→ ascarter joined	19:47
	← revision left	19:47
	← mkkl left	19:47
	← bronson left	19:47
	→ kongthap joined	19:48
	← ascarter left	19:48
	→ Quevin joined	19:49
	→ albel727 joined	19:49
	→ lungaro joined	19:49
	→ jason237 joined	19:49
	→ ItSANgo joined	19:49
	→ johnflux_ joined	19:49
	← johnflux_ left	19:49
	→ johnflux_ joined	19:49
	→ MinetestForFun joined	19:49
	→ yyci joined	19:49
kongthap	i'm not clear to unstage the file sometimes git status suggest to use "git reset HEAD ..." sometime "git rm --cache ..." please advise me why ?	19:49
	→ AaronMT joined	19:49
	→ jhermann joined	19:49
	→ sgen joined	19:49
	→ sparr joined	19:49
	← yyci left	19:49
	← johnflux left	19:49
	→ MinetestForFun_ joined	19:50
	→ SpeakerToMeat joined	19:50
kadoban	kongthap: The 'git rm --cached' thing is suggested when it's a newly added file.	19:50
	→ iamjarvo joined	19:51
	→ Boobuigi joined	19:51
	← johnflux_ left	19:52
	→ johnflux_ joined	19:52
	→ maxorator joined	19:52
	→ felipedvorak joined	19:52
	→ jokester joined	19:52
	→ angular_mike_ joined	19:52
	→ Ssquidly joined	19:52
	→ calops joined	19:52
	→ ska-fan joined	19:52
	→ coredumb joined	19:52
	→ mithro joined	19:52
	→ daurnimator joined	19:52
	→ Kully3xf_ joined	19:52
	← daurnimator left	19:53
	← maxorator left	19:53
	← Ssquidly left	19:53
	← angular_mike_ left	19:53
kongthap	kadoban, i thought like that too, i clone a repo from github, i edit a tracked file and create a brand new file, then using "git add .", git status suggest to use "git reset HEAD ..." for both files	19:53
	← MinetestForFun left	19:53
	→ ascarter joined	19:54
	→ daurnimator joined	19:54
	← Kully3xf_ left	19:54
	→ Ssquidly joined	19:54
	← Kully3xf left	19:54
	→ maxorator joined	19:54
	← IrishPrime left	19:55
	→ devhost joined	19:55
	→ Bujou joined	19:55
	→ lebster joined	19:55
	→ OliverJAsh joined	19:56
	← TomyLobo left	19:56
	→ TomyLobo joined	19:56
	← martiis left	19:56
	← Bujou left	19:56
	→ kapowaz joined	19:57
	← CKyle left	19:57
	→ martiis joined	19:57
	→ Protux joined	19:57
	→ parshap joined	19:58
	→ chiromante joined	19:58
	← Dragooon left	19:58
	→ adambrenecki joined	19:58
	← eperez left	19:58
	→ dsteplight___ joined	19:58
	← ascarter left	19:58
	→ luya joined	19:58
	→ angular_mike_ joined	19:58
	→ eperez joined	19:59
	→ casual___ joined	19:59
	← luya left	19:59
	→ Bmcan joined	20:00
	→ yena joined	20:00
	→ EricPoe joined	20:00
	→ daxroc joined	20:01
	→ upene joined	20:01
	→ ome joined	20:01
	→ shennyg joined	20:01
	← Bmcan left	20:01
	← scientes left	20:01
	← EricPoe left	20:02
	→ supay joined	20:02
	→ Rfqz joined	20:02
	→ jonha joined	20:02
	← eGGsha left	20:03
	→ Miesco joined	20:03
	→ faheem_ joined	20:03
	← Rfqz left	20:03
	→ kwmiebach joined	20:03
	→ da5id joined	20:03
	gitinfo set mode: +v	20:03
	→ ELLIOTTCABLE joined	20:04
	← stantonk left	20:04
	← johnflux_ left	20:04
	→ MLM joined	20:04
	→ akitada joined	20:04
	→ eGGsha joined	20:05
	→ JackFruh joined	20:05
	→ liiu joined	20:05
	Guest55992 → guyz	20:05
	→ Kyl9 joined	20:05
	→ heroux joined	20:05
	← JackFruh left	20:06
	← liiu left	20:06
	→ SirRetnuh joined	20:06
	→ Zmuau joined	20:07
	← eperez left	20:07
	← macabre left	20:07
	→ qpdb joined	20:08
	← Zmuau left	20:08
	← iamjarvo left	20:08
	→ stantonk joined	20:08
kongthap	i'm curious, i just clone a repo from the internet, i then use "git rm -r --cache ." i don't know what git did ? the files in working directory still remain, the log still remain, but git status show me like nothing ever added to the repo, please explain, thanks :)	20:08
	→ Eeour joined	20:08
	← Eeour left	20:09
	→ radialneon joined	20:09
	→ SoFLy joined	20:10
	← supsup left	20:11
	→ therealssj joined	20:11
	→ ggherdov joined	20:11
	→ hjo joined	20:12
	→ fatalhalt joined	20:12
	← hjo left	20:12
	← ome left	20:12
	→ Dougie187 joined	20:13
	→ eperez joined	20:14
	← darkschneider left	20:14
	→ darkschneider joined	20:14
	← eperez left	20:14
	→ yqw joined	20:15
	← yqw left	20:15
	← youser left	20:16
	← beaconwriter left	20:16
	→ ansikt joined	20:17
ansikt	Hey!	20:17
	I want to know when other members of my team push to a remote. How would you automate this?	20:18
	→ Dey joined	20:18
ansikt	Ideally, I'd even like to know when they create pull requests. This isn't a core Git question, but let me know if you'd have ideas.	20:18
grantwu	ansikt: Look into git hooks	20:19
	→ bb010g joined	20:19
	gitinfo set mode: +v	20:19
	← maletor left	20:19
grantwu	ansikt: Are you using GitLab/GitHub/something similar?	20:19
	→ basiclaser joined	20:19
	← Dey left	20:19
ansikt	Conflunce / Stash, but yeah. I don't think I actually control the remote	20:19
	← tverr left	20:20
	← kukks left	20:20
grantwu	I would look into Stash documentation, then.	20:20
	→ triton joined	20:22
rom1504	grantwu: yes, but "served-side" is localhost	20:23
	→ Pfx joined	20:23
	← Pfx left	20:23
grantwu	rom1504: I don't care what runs the hook, I just want it to be run	20:23
rom1504	well it will	20:24
	did you even try ?	20:24
	→ iamjarvo joined	20:24
grantwu	rom1504: No.	20:24
	← Boobuigi left	20:24
grantwu	I didn't want to learn how to write a server-side hook if I wasn't sure it would work.	20:24
	→ scientes joined	20:24
	← scientes left	20:24
	→ scientes joined	20:24
	→ settermjd joined	20:25
	→ Boobuigi joined	20:25
	→ ouofo joined	20:25
	← ouofo left	20:25
	← ItSANgo left	20:26
	→ jontmorehouse joined	20:26
	← ilmgb left	20:26
	← creep_ left	20:27
	→ uqbym joined	20:27
	← rwb left	20:27
	← uqbym left	20:28
	→ ascarter joined	20:28
	← ascarter left	20:29
	→ Kully3xf joined	20:29
icedp	is HEAD~ the same as HEAD~1?	20:29
	→ Uei joined	20:29
	← Uei left	20:30
	← linkedinyou left	20:30
	→ terminal_echo joined	20:31
	← gamename left	20:31
	← Dorf left	20:31
	→ drewo joined	20:32
	→ Guest90370 joined	20:32
	← theCole left	20:33
	← kwmiebach left	20:33
kadoban	icedp: I don't see that in man gitrevisions. Does it work?	20:33
gitinfo	icedp: the gitrevisions manpage is available at http://jk.gs/gitrevisions.html	20:33
	← Guest90370 left	20:34
	← stantonk left	20:34
	← PCatinean left	20:35
	→ iyi joined	20:35
	→ PCatinean joined	20:35
	→ nahtnam joined	20:35
	Hello71_ → Hello71	20:36
Seveas	icedp: it is. To confirm, compare the output of git rev-parse HEAD~ and git rev-parse HEAD~1	20:36
	← iyi left	20:36
	← a-l-e left	20:37
	→ axsuul joined	20:37
	→ Mooad joined	20:38
	← grantwu left	20:38
icedp	(yes it works) thanks a lot	20:38
	→ micechal joined	20:38
	← Mooad left	20:38
	← chiromante left	20:38
	→ theCole joined	20:39
	→ oqe joined	20:40
	← oqe left	20:40
	← AaronMT left	20:41
	→ mp4 joined	20:42
	→ trnaj joined	20:42
	← mp4 left	20:42
	→ Corey84 joined	20:42
	← petersson left	20:42
	← MattMaker left	20:43
	→ eletuchy joined	20:43
	← upene left	20:43
	→ NimeshNeema joined	20:43
	← trnaj left	20:43
	→ mp4 joined	20:43
	← mp4 left	20:43
	← Corey84 left	20:44
	← _Atom_ left	20:44
	→ Sieigeie joined	20:44
	→ sxoao joined	20:44
	→ Corey84 joined	20:45
	→ darkbasic_ joined	20:45
	← ntwari left	20:45
	→ EricPoe joined	20:46
	← sxoao left	20:46
	← darkbasic left	20:46
	← Kyl9 left	20:47
	← theCole left	20:47
	← Kully3xf left	20:47
	→ lpex joined	20:47
	← eletuchy left	20:47
	→ MattMaker joined	20:48
	← settermjd left	20:48
	← lpex left	20:48
	→ MattMake_ joined	20:48
	← MattMake_ left	20:49
	→ MattMake_ joined	20:49
	← Sieigeie left	20:49
	→ Vary joined	20:50
	→ xlegoman joined	20:50
	→ arez joined	20:50
	← Vary left	20:51
	→ ItSANgo joined	20:51
	→ ilmgb joined	20:51
	→ Uwq joined	20:52
	→ stantonk joined	20:52
	← MattMaker left	20:52
	→ paddymahoney joined	20:52
	← Uwq left	20:52
	← ilmgb left	20:53
	→ EisNerd joined	20:54
	→ nadim joined	20:54
	→ johnflux_ joined	20:54
	← johnflux_ left	20:54
	→ johnflux_ joined	20:54
	→ ascarter joined	20:55
	→ maletor joined	20:56
	← JohnBat26 left	20:56
	← maestrojed left	20:57
	← tristanp left	20:57
	→ mebert joined	20:57
	→ tristanp joined	20:57
	← sinkensabe left	20:57
	← diegoviola left	20:58
	← cavallari left	20:58
	← faux___ left	20:58
	→ dgutierrez1287 joined	20:59
	← nfk left	21:00
	→ kwmiebach joined	21:01
	← sfeinste left	21:01
	← rnsanchez left	21:02
	← tristanp left	21:02
	→ cllamas joined	21:02
	→ dionysus69 joined	21:04
	← dgutierrez1287 left	21:04
	← stantonk left	21:04
	→ lzup joined	21:05
	← jottr left	21:05
	→ sinkensabe joined	21:05
	→ jottr joined	21:05
	← lzup left	21:05
	→ aspiers joined	21:05
	→ theCole joined	21:05
	→ theredaaron joined	21:06
	← ascarter left	21:07
	→ edg joined	21:07
	← cllamas left	21:07
	→ dsdeiz joined	21:08
	← sinkensabe left	21:08
	← edg left	21:08
	→ Ziii joined	21:10
	← Terabyte left	21:10
	→ stantonk joined	21:10
	→ aidalgol joined	21:10
	→ Terabyte joined	21:11
	→ [H]unt3r joined	21:11
	← Ziii left	21:12
	→ ruukasu joined	21:12
	→ faux___ joined	21:12
	→ duderonomy joined	21:13
	← scientes left	21:13
	← johnflux_ left	21:13
	→ johnflux_ joined	21:13
	→ Bbwd joined	21:14
	← Bbwd left	21:15
	← d10n-work left	21:15
	→ overCrone joined	21:16
	→ ascarter joined	21:16
	← Zupoman left	21:16
	← Miesco left	21:17
	← faux___ left	21:17
	← ascarter left	21:17
	← barduck left	21:18
	→ ascarter joined	21:18
	→ X67r joined	21:18
	← iamjarvo left	21:18
	→ djaow joined	21:18
	→ akurilin joined	21:19
	→ scientes joined	21:19
	← scientes left	21:19
	→ scientes joined	21:19
akurilin	I've read the git annex manual a few times and I'm still puzzled	21:19
	pretty different workflow than what I'm used to	21:19
	→ hexagoxe- joined	21:19
	← djaow left	21:19
	← radialneon left	21:20
	→ uokkh joined	21:21
	← radialneon_ left	21:21
	→ robbyoconnor joined	21:22
	→ gfixler joined	21:22
	← uokkh left	21:22
	← hexagoxel left	21:22
	← buffal0 left	21:22
	← nadim left	21:23
	→ Eiuy joined	21:23
	→ eletuchy joined	21:24
	→ ClearC2_ joined	21:24
	→ maestrojed joined	21:24
	→ jzk joined	21:24
	→ gamename joined	21:24
	← Eiuy left	21:25
	← ClearC2 left	21:25
	← kadoban left	21:25
	← martiis left	21:25
	← robbyoconnor left	21:26
	→ Mswi joined	21:27
	← Mswi left	21:28
vishal	git apply needs a --interactive mode that presents the same interface as git add -i :)	21:28
	← pantsman- left	21:28
	vishal contemplates writing a patch in his copious free time :)	21:28
	← SimonNa left	21:29
	← jottr left	21:29
	← jerius_ left	21:30
	→ iamjarvo joined	21:30
	← chitopunk left	21:31
	← theCole left	21:31
	← iamjarvo left	21:31
Azuvector	Not git per se, but tortoisegit... I keep getting certificate errors(SSL certificate problem: unable to get local issuer certificate) when I try to clone a public repository on say, github, or code.google.com or whatever. ex: https://code.google.com/p/tortoisegit/ From my minor understanding of certificates, it should be reading the certificate authority on my machine and accepting it if it's a	21:31
	valid certificate? Or am I misunderstanding something there?	21:31
	→ iamjarvo joined	21:31
	→ jottr joined	21:32
	→ kubast2 joined	21:32
	→ theCole joined	21:32
	→ Ptyo joined	21:32
	← iamjarvo left	21:32
	← overCrone left	21:32
	→ mingwandroid joined	21:33
kubast2	Hey I've just made vm with ubuntu ,but I've encountered a problem that I had previouslly. "*** Please tell me whoh you are."	21:33
	→ xk_id joined	21:33
	← King_Hual left	21:34
kubast2	I've launched the git config --global user.email "myemail@email.com"	21:34
	and git config --global user.name "mygithubname"	21:34
	← Ptyo left	21:34
	← NeverDie left	21:35
	→ kadoban joined	21:35
catern	dear #git	21:36
	i'm not exactly sure what i'm asking for here	21:36
	is it possible to get a diff th -oh, wait, I figured it out	21:36
kubast2	And beside that I still get "fatal: unable to auto-detect email address (got 'building@ubuntu.(none)')	21:36
	"	21:36
catern	what I want is "git diff rev1 rev2 \| grep symbol"	21:36
	← arez left	21:36
	← stantonk left	21:37
sorenb	catern, git log -G or -S is probably what you're looking for	21:38
	← jteneyck left	21:38
	→ iamjarvo joined	21:38
	→ stantonk joined	21:39
	← Spriz left	21:39
	← iamjarvo left	21:39
kubast2	I even used "git config --global user.email "you@example.com"" literally	21:39
	← ascarter left	21:40
	← mbrzuzy left	21:40
	← kongthap left	21:41
	→ NeverDie joined	21:41
	→ upene joined	21:41
	→ Sasazuka__ joined	21:42
	← Sasazuka left	21:43
	← kadoban left	21:43
	← Gama11 left	21:43
	→ jgardella joined	21:44
	← m0ltar left	21:44
	← kubast2 left	21:45
	← eletuchy left	21:45
	→ Iuao joined	21:46
	→ ascarter joined	21:46
	← Iuao left	21:46
	← pm90_ left	21:47
	→ Alge joined	21:48
	← ascarter left	21:48
	→ iamjarvo joined	21:48
	← zumba_addict left	21:49
	← iamjarvo left	21:49
	→ otter768 joined	21:49
	← Alge left	21:49
	→ zumba_addict joined	21:49
	← blimpse left	21:50
	→ eeuj joined	21:50
	← scientes left	21:50
	→ fracting joined	21:50
	→ seal joined	21:50
	← eeuj left	21:51
	→ LaptopBrain joined	21:51
	← dreiss left	21:52
	← johnflux_ left	21:52
	→ CKyle joined	21:53
	← zumba_addict left	21:53
	← otter768 left	21:53
	→ iamjarvo joined	21:56
	← iamjarvo left	21:56
	→ dgutierrez1287 joined	21:56
	← eGGsha left	21:56
	→ simesy joined	21:56
	← CKyle left	21:57
	→ eletuchy joined	21:57
	← PCatinean left	21:57
	← dgutierrez1287 left	21:58
	→ dgutierrez1287 joined	21:59
	← dionysus69 left	21:59
	→ lucha joined	21:59
	→ halp11 joined	21:59
	← espindola left	21:59
	← ClearC2_ left	21:59
	→ espindola joined	21:59
	→ kronos joined	21:59
	← kronos left	22:00
catern	sorenb: oh, yeah, that too	22:00
	← simesy left	22:02
	← drewo left	22:02
	← dgutierrez1287 left	22:03
	→ ascarter joined	22:05
	← ascarter left	22:05
	← jontmorehouse left	22:06
	← sheilong left	22:06
	← [H]unt3r left	22:07
	← Liberation left	22:07
	→ [H]unt3r joined	22:07
	← gambl0re left	22:08
	← SoFLy left	22:08
	← jgardella left	22:08
	→ SoFLy joined	22:08
	→ jgardella joined	22:08
	← dsop_ left	22:09
	← seal left	22:09
	← EricPoe left	22:10
	← devoldmx left	22:10
halp11	Can anyone help me understand the issue with this workflow: I clone a remote repo, checkout existing tracked branch, make changes, rebase on master, checkout master, merge local branch (fast-forward). At no point does anyone modify the remote (I'm the only user). At this point I wanted to delete the local branch, but it said it wasnt merged to refs/remotes/origin/localbranch.	22:10
	I tried git push, it gets rejected because localbranch is non-fast-forward. I looked up the error, and github says this happens when remote is updated. But it's not the case, there is zero activity on remote master and localbranch in the past week, except the changes I just made. What is the reason? How can I simplify this workflow?	22:10
	→ devoldmx joined	22:10
	→ nnyk joined	22:11
halp11	In my mind I was looking for "work locally on any branch, have remote be a mirror/backup of the local state"	22:12
	→ CheckDavid joined	22:12
	→ tristanp joined	22:12
	← Boobuigi left	22:12
	→ cagedwisdom joined	22:13
	← upene left	22:14
	← tristanp left	22:15
	→ petersson joined	22:15
	→ tristanp joined	22:16
	→ sabgenton joined	22:17
	← crose left	22:18
	→ tomog999_ joined	22:19
	→ fayimora joined	22:19
	← tristanp left	22:20
	→ Squarism joined	22:20
	→ robbyoconnor joined	22:20
	← victortyau left	22:21
	→ pm90_ joined	22:21
	← dropdriv1 left	22:21
	→ tpollard joined	22:21
	→ dropdrive joined	22:22
	← halp11 left	22:22
	← tomog999 left	22:22
	← sabgenton left	22:24
	← lucha left	22:24
	← madewokherd left	22:24
	→ tristanp joined	22:24
	← freestyl3r left	22:25
	← nnyk left	22:25
	→ tvw joined	22:25
	→ gutocarvalho joined	22:26
	← tristanp left	22:27
	→ parliament joined	22:29
	← parliament left	22:29
	→ parliament joined	22:29
	← Zamyatin left	22:29
	← theCole left	22:30
	← [H]unt3r left	22:30
	← hahuang65 left	22:31
	← SirRetnuh left	22:31
	→ theCole joined	22:34
	Sasazuka__ → Sasazuka	22:34
	→ SirRetnuh joined	22:35
	→ kadoban joined	22:36
	→ zumba_addict joined	22:36
	← TomyLobo left	22:38
	← zumba_addict left	22:38
	← SoFLy left	22:39
	→ zumba_addict joined	22:39
	← cbonobo left	22:39
	→ PirateSwagg joined	22:40
	← PirateSwagg left	22:41
	← tvw left	22:41
	→ tvw joined	22:42
	← quazimodo left	22:43
	← dsdeiz left	22:44
	← zumba_addict left	22:44
	→ toothrot joined	22:44
	→ zumba_addict joined	22:45
	← gargola left	22:48
	→ kukks joined	22:49
	← kukks left	22:49
	→ kukks joined	22:49
	← robbyoconnor left	22:50
	→ cllamas joined	22:51
	→ drewo joined	22:51
	← devoldmx left	22:52
	← Nova_Man left	22:53
	→ devoldmx joined	22:53
	← ixian8 left	22:53
	→ Nova_Man joined	22:53
	→ ixian joined	22:53
	← eka left	22:53
	→ madewokherd joined	22:54
	← sgen left	22:54
	← cllamas left	22:56
	← theCole left	22:56
	← jottr left	22:57
	← xlegoman left	22:57
	← wicope left	22:57
	→ xlegoman joined	22:57
	→ ahr3n_ joined	22:58
	← ropav left	22:59
	→ ropav joined	22:59
	→ silviof joined	22:59
	← FreezingDroid left	22:59
	← Vadimus left	23:01
	← eletuchy left	23:01
	← knownasilya left	23:01
	→ jontmorehouse joined	23:02
	← xlegoman left	23:03
	← NimeshNeema left	23:03
	← ansikt left	23:03
	← SirRetnuh left	23:04
	→ cdown joined	23:05
	← fatalhalt left	23:05
	→ hexagoxel joined	23:05
	← mingwandroid left	23:05
	→ dgutierrez1287 joined	23:07
	← osxi left	23:07
	→ eletuchy joined	23:08
	→ tennis_ joined	23:09
	← hexagoxe- left	23:09
	→ macabre joined	23:11
	← gamename left	23:12
	→ fenugrec joined	23:13
	← WaReZ left	23:13
	← X67r left	23:13
	→ clarkpan joined	23:14
	← nahtnam left	23:16
	← ropav left	23:16
	→ xlegoman joined	23:16
	← irc-5225225 left	23:17
	→ dreiss joined	23:17
	← pm90_ left	23:17
	→ pm90_ joined	23:19
	→ osxi joined	23:20
	→ franl joined	23:21
	→ jfelchner joined	23:22
	→ modocache joined	23:23
	→ weiyang joined	23:24
	← weiyang left	23:24
	→ weiyang joined	23:25
	→ hahuang65 joined	23:27
	→ pm90__ joined	23:27
	→ SirRetnuh joined	23:27
	← ashwink005 left	23:28
	← livingstn left	23:28
	← macabre left	23:28
	→ CLaxware joined	23:28
	→ ropav joined	23:28
	→ hahuang61 joined	23:28
	← Terabyte left	23:29
	← ropav left	23:30
	← modocache left	23:30
	→ prereflect joined	23:30
	→ irc-5225225 joined	23:30
	← pm90_ left	23:30
	→ dsdeiz joined	23:30
	→ Terabyte joined	23:31
	← ekain left	23:31
	← prereflect left	23:31
	← zumba_addict left	23:31
	→ theCole joined	23:31
	→ ropav joined	23:32
	→ macabre joined	23:34
	← nettoweb left	23:34
	← aidalgol left	23:35
	→ micechal_ joined	23:36
	→ mquin_ joined	23:36
	← elsevero left	23:36
	← PaulCapestany left	23:36
	← eggoez left	23:36
	← mizu_no_oto left	23:37
	→ elsevero joined	23:37
	→ tachoknight joined	23:37
	→ LadyAlissa joined	23:37
	← pm90__ left	23:37
	← Maple__ left	23:37
	← micechal left	23:38
	→ PaulCapestany joined	23:38
	← ropav left	23:38
ICantCook	I run a git server behind an nginx server. Yesterday, I setup an additional nginx server with DNS round-robin. Today, I shutdown the first nginx server, and everything is fine accessing my git server (web interface, linux client, etc). One of our developers is running git.exe on windows and is now getting timeouts trying to pull/clone. He has no issues with the web interface though.	23:39
	→ tureba joined	23:39
ICantCook	Does git.exe on windows do something silly like resolve/cache remotes independant of the OS?	23:39
	→ greymalkin joined	23:39
	← SirRetnuh left	23:39
	→ lahwran joined	23:39
	→ Vorisi joined	23:39
	→ mizu_no_oto joined	23:39
	→ SirRetnuh joined	23:40
	→ jteneyck joined	23:40
	→ eggoez joined	23:40
	← devoldmx left	23:40
	← maletor left	23:40
	← phantombeta left	23:41
	→ maletor joined	23:41
	← mikecmpbll left	23:42
	→ ribasushi joined	23:43
	→ phantombeta joined	23:43
	← ChangChong left	23:44
	← phantombeta left	23:44
	→ quazimodo joined	23:44
	→ ropav joined	23:45
	→ bgerber joined	23:45
	← Corey84 left	23:46
	→ corey84__ joined	23:47
	→ phantombeta joined	23:47
	← danzilio left	23:47
	corey84__ → Corey84	23:47
	← xlegoman left	23:48
	→ xlegoman joined	23:48
	← Terabyte left	23:49
	← ropav left	23:50
	← jteneyck left	23:50
	→ otter768 joined	23:50
	← cdown left	23:50
	← mizu_no_oto left	23:51
	← dlitz left	23:52
	← xlegoman left	23:53
	← otter768 left	23:54
	← jgardella left	23:54
	→ dlitz joined	23:54
	→ tristanp joined	23:55
	→ frogonwheels joined	23:57
	→ simesy joined	23:57
Azuvector	Fuck. Found the issue finally on a hunch after much googling failure. For reference: http://stackoverflow.com/questions/23807313/adding-self-signed-ssl-certificate-without-disabling-authority-signed-ones	23:59
	← Bootinbull left	23:59

Logs Search ←Prev date Next date→

Channels Documentation