IRCloggy #git 2017-06-30

Provider of IRC logs since 2005.

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

	2017-06-30
	← Cxcf` left	00:00
	← Es0teric left	00:01
	→ Es0teric joined	00:01
	→ IniGit joined	00:04
	→ cagedwisdom joined	00:04
	← s2013 left	00:05
	← Trendrrr left	00:05
	→ Trendrrr joined	00:06
	← bergice_ left	00:07
	← orbyt_ left	00:07
	← IniGit1 left	00:07
	← jaziz left	00:08
	→ fstd_ joined	00:08
	← jottr left	00:09
	→ dsdeiz joined	00:09
	← ohHenry left	00:09
	← durham left	00:10
	→ _main_ joined	00:10
	← fstd left	00:12
	fstd_ → fstd	00:12
	← __main__ left	00:13
	_main_ → __main__	00:13
	← tablemaker left	00:15
	← Trendrrr left	00:16
	→ venmx joined	00:16
	← Darcidride left	00:16
	→ rubyonrailed joined	00:17
	← akushner left	00:17
	→ Trendrrr joined	00:17
	→ TbobbyZ joined	00:18
	← dreiss left	00:19
	→ tablemaker joined	00:19
	← __main__ left	00:19
	← chardan left	00:19
	→ __main__ joined	00:20
	← Gurkenglas left	00:20
	← theiostream left	00:20
	← Cabanossi left	00:20
	→ Puggy joined	00:22
	→ Cabanossi joined	00:23
	→ Cxcf joined	00:23
	← Cxcf left	00:23
	→ Cxcf joined	00:23
	→ jaziz joined	00:24
	← Es0teric left	00:26
	→ thiago joined	00:26
	→ Es0teric joined	00:27
	← Trendrrr left	00:27
	← Es0teric left	00:28
	← nevodka left	00:28
	→ Trendrrr joined	00:29
	← Somelauw left	00:29
	→ plasticle joined	00:30
	← kvaz left	00:30
	← olalonde left	00:30
	← venmx left	00:32
	← Gustavo6046 left	00:32
	← m4sk1n left	00:33
	← tablemaker left	00:33
	← Trendrrr left	00:34
	→ NeXTSUN joined	00:34
	→ fibbot joined	00:34
	→ Whiskey joined	00:35
	→ Trendrrr joined	00:36
	← mentazoom left	00:36
	→ theiostream joined	00:39
	← Tobbi left	00:39
	← nixjdm left	00:40
	→ Gustavo6046 joined	00:45
	← EvilPenguin left	00:47
	← theiostream left	00:48
	← tanuki left	00:48
	← fibbot left	00:49
	→ fibbot joined	00:49
	← Trendrrr left	00:49
	← lagothri1 left	00:50
	→ dreiss joined	00:50
	← di0_ left	00:51
	→ Trendrrr joined	00:51
	→ lagothrix joined	00:52
	→ nixjdm joined	00:52
	→ Darren_ joined	00:52
	→ einnjo joined	00:55
	→ mvensky joined	00:55
	→ tanuki joined	00:56
	← bitmod left	00:57
	← perrier-jouet left	01:00
	← einnjo left	01:00
	→ ResidentBiscuit joined	01:01
	→ cdg joined	01:01
	← Trendrrr left	01:01
	→ jordant0724 joined	01:02
	→ Trendrrr joined	01:02
	→ fishcooker joined	01:03
	→ Es0teric joined	01:03
	→ wxg joined	01:04
	← cdg_ left	01:04
	← cdg left	01:05
	→ durham joined	01:06
	→ nd joined	01:06
	→ brent__ joined	01:06
	← gunnaro left	01:06
	← jnewt_ left	01:06
	→ todd_dsm joined	01:07
	← brent__ left	01:07
	← nd- left	01:08
	← ojdo left	01:09
	→ orbyt_ joined	01:10
	← TbobbyZ left	01:11
	→ TbobbyZ joined	01:11
	→ bwn joined	01:12
	← Trendrrr left	01:13
	→ theiostream joined	01:13
	← TbobbyZ left	01:13
	→ TbobbyZ joined	01:14
	→ Trendrrr joined	01:14
	← jamesmayes left	01:15
	← nixjdm left	01:18
	→ valhala_22 joined	01:18
	→ kg6hum joined	01:19
	→ jameser joined	01:19
	→ ojdo joined	01:19
	→ cebula joined	01:20
	← donmichelangelo left	01:20
	← j08nY left	01:21
	← ecuanaso left	01:22
	← Trendrrr left	01:22
	← chase left	01:23
	→ finalbeta joined	01:24
	→ Trendrrr joined	01:24
	→ ecuanaso joined	01:24
	→ roelmonnens joined	01:25
	← Cxcf left	01:25
	← fishcooker left	01:27
	← k_sze[work] left	01:27
	→ invisbl joined	01:27
	→ bitmod joined	01:28
	→ fishcooker joined	01:28
	← fibbot left	01:29
	← roelmonnens left	01:29
	← scottjl left	01:31
	← invisbl left	01:32
	← Trendrrr left	01:32
	← Noldorin left	01:33
	← joshszep left	01:34
	→ akushner joined	01:35
	← ToBeCloud left	01:35
	← theiostream left	01:35
	→ jottr joined	01:35
	→ Trendrrr joined	01:35
	→ theiostream joined	01:35
	→ Anja joined	01:38
	← valhala_22 left	01:38
	← jordant0724 left	01:38
	→ akushner_ joined	01:38
	← TechieMae left	01:38
	← akushner left	01:39
	→ valhala_22 joined	01:40
	← Es0teric left	01:41
	← tgragnato left	01:42
	→ d^sh joined	01:43
	→ drodger joined	01:43
	← ilbot3 left	01:44
	→ cqi joined	01:45
	← jottr left	01:45
	← zzz left	01:45
	← d^sh_ left	01:46
	→ ilbot3 joined	01:49
	← tymczenko left	01:50
	← inovas left	01:50
	← dsdeiz left	01:50
	→ dsdeiz joined	01:51
	→ joshszep joined	01:52
	→ jimklo_ joined	01:52
	← imawriterugh left	01:53
	→ inovas joined	01:55
	← jimklo left	01:55
	← pierre365 left	01:55
	→ XuCC joined	01:55
	← XuCC left	01:56
	← jimklo_ left	01:56
	← salamanderrake left	01:57
	← sunri5e left	01:57
	← Bishop_Bautista left	01:57
	← valhala_22 left	01:58
	→ salamanderrake joined	01:58
	← svm_invictvs left	01:58
	→ sunri5e joined	01:59
	← pks left	02:00
	← Darren_ left	02:01
	← durham left	02:01
	→ valhala_22 joined	02:01
	→ oiweobcv joined	02:04
	→ pks joined	02:04
	← Trendrrr left	02:05
	← valhala_22 left	02:06
	← griffindy left	02:06
	→ Trendrrr joined	02:07
	← ouuowefb left	02:07
	→ valhala_22 joined	02:07
	← IniGit left	02:07
	→ Vortex35 joined	02:08
	→ oaao joined	02:08
	← lafleurdubien left	02:08
	← rda-mac left	02:09
	→ justan0theruser joined	02:09
	← Gustavo6046 left	02:10
	→ xall joined	02:10
	← justan0theruser left	02:11
	← planigan left	02:11
	→ justan0theruser joined	02:11
	← justanotheruser left	02:11
	← ecuanaso left	02:11
	← Vortex34 left	02:12
	→ fibbot joined	02:13
	→ fibotter joined	02:13
	← valhala_22 left	02:13
	← Trendrrr left	02:15
	← fibotter left	02:16
	← fibbot left	02:16
	← TbobbyZ left	02:16
	→ fibbot joined	02:16
	→ TbobbyZ joined	02:16
	→ Trendrrr joined	02:18
	→ fstd_ joined	02:19
	← Fleche left	02:20
	← fstd left	02:20
	fstd_ → fstd	02:20
	→ Es0teric joined	02:21
	→ valhala_22 joined	02:21
	← TbobbyZ left	02:21
	← hahuang65 left	02:21
	← Es0teric left	02:22
	→ Rodya_ joined	02:23
	← VaultTec left	02:23
	→ wilbert joined	02:25
	→ fahadash joined	02:28
	← wxg left	02:28
	← Trendrrr left	02:28
	→ Trendrrr joined	02:30
	← fibbot left	02:30
	← valhala_22 left	02:31
	← cyphase left	02:32
	← HeWhois left	02:32
	→ wxg joined	02:32
	→ Bishop_Bautista joined	02:33
	← Trendrrr left	02:34
	→ Trendrrr joined	02:37
	→ lagothri1 joined	02:39
	← ResidentBiscuit left	02:39
	→ macrover joined	02:40
	← Puggy left	02:40
	→ valhala_22 joined	02:40
	→ jottr joined	02:41
	← valhala_22 left	02:41
	← lagothrix left	02:42
	← sondr3 left	02:43
	← chachasmooth left	02:45
	→ chachasmooth joined	02:46
	→ sim590 joined	02:47
	← jottr left	02:47
	→ TbobbyZ joined	02:47
	← Trendrrr left	02:47
	→ kaldoran joined	02:48
	→ Trendrrr joined	02:49
	← NeXTSUN left	02:51
	→ rohitpaulk joined	02:53
	→ ecuanaso joined	02:56
	→ cyphase joined	02:57
	← rohitpaulk left	02:58
	→ jimi_ joined	03:03
	→ govg joined	03:04
	→ menip joined	03:04
	→ brent__ joined	03:04
	← ecuanaso left	03:05
	← Cabanossi left	03:05
	← jimi_ left	03:07
	← theiostream left	03:07
	→ Cabanossi joined	03:07
	← Trendrrr left	03:08
	← cebula left	03:09
	← cyphase left	03:10
	← jameser left	03:10
	→ jameser joined	03:11
	→ Trendrrr joined	03:11
	← vamiry left	03:12
	→ roelmonnens joined	03:13
	← Aeterne left	03:17
	← steeze left	03:17
	→ donmichelangelo joined	03:17
	← roelmonnens left	03:17
	→ ecuanaso joined	03:21
	← Trendrrr left	03:22
	→ vamiry joined	03:22
	→ Trendrrr joined	03:23
	← Bishop_Bautista left	03:24
	← ecuanaso left	03:30
	→ Kulrak joined	03:31
	← Kulrak left	03:31
	→ Kulrak joined	03:31
	← Kulrak left	03:31
	← peepsalot left	03:32
	→ Kulrak joined	03:33
	← Kulrak left	03:33
	→ Kulrak joined	03:33
	← Trendrrr left	03:34
	→ Trendrrr joined	03:35
	→ sz0 joined	03:42
	→ jottr joined	03:42
	→ Darren_ joined	03:42
	← Trendrrr left	03:43
	→ peepsalot joined	03:45
	→ Trendrrr joined	03:45
	→ cyphase joined	03:46
	→ MeltedLux joined	03:47
	→ Dreamer3 joined	03:47
	← jottr left	03:48
	← Trendrrr left	03:51
	→ steeze joined	03:51
	→ Trendrrr joined	03:52
	→ planigan joined	03:55
	→ ephemer0l joined	03:56
	← Trendrrr left	03:58
	← Rodya_ left	03:59
	→ Trendrrr joined	04:00
	→ Rodya_ joined	04:01
	← brent__ left	04:02
	← Rodya_ left	04:05
	← oskarkv left	04:05
	← Trendrrr left	04:06
	→ Trendrrr joined	04:07
	← energizer left	04:08
	→ ozcanesen joined	04:08
	← cqi left	04:09
	← thebope_ left	04:10
	← planigan left	04:10
	→ thebope joined	04:11
	→ akushner joined	04:13
	→ robotroll joined	04:15
	← Trendrrr left	04:15
	→ githubmgw joined	04:15
	← thebope left	04:16
	← akushner_ left	04:16
	→ Trendrrr joined	04:16
	→ Rodya_ joined	04:19
	← Cabanossi left	04:20
	→ Goplat joined	04:20
	→ Cabanossi joined	04:22
	← Dreamer3 left	04:25
	← h12o left	04:25
	← Trendrrr left	04:27
	← xall left	04:28
	→ menip_ joined	04:30
	→ Trendrrr joined	04:30
	← menip left	04:31
	← Trendrrr left	04:35
	← fahadash left	04:37
	→ Trendrrr joined	04:38
	→ ewitz joined	04:39
	→ xall joined	04:41
	→ jottr joined	04:43
	← notadeveloper left	04:43
	← steeze left	04:43
	← Trendrrr left	04:44
	→ maroloccio joined	04:44
	→ Trendrrr joined	04:45
	← jottr left	04:48
	→ sarbs joined	04:49
	← orbyt_ left	04:50
	← Trendrrr left	04:55
	→ red-tomato joined	04:55
	← fakenerd_ left	04:55
	→ Trendrrr joined	04:56
	← red-tomato left	05:00
	← Trendrrr left	05:01
	→ roelmonnens joined	05:02
	→ Trendrrr joined	05:04
	← roelmonnens left	05:06
	→ krabat joined	05:07
	→ czart_ joined	05:08
	→ Rotaerk_ joined	05:08
	→ armyriad joined	05:08
	→ hanna` joined	05:09
	→ jfr joined	05:09
	→ zapb_ joined	05:09
	→ themill joined	05:10
	← Rotaerk left	05:12
	← czart left	05:12
	→ Hobbyboy joined	05:12
	kadoban → mud	05:14
	→ barteks2x joined	05:14
	← Trendrrr left	05:15
	← Darren_ left	05:16
	→ Trendrrr joined	05:17
	← dreiss left	05:19
	← Hobbyboy left	05:20
	← barteks2x left	05:21
	← Trendrrr left	05:23
	→ dersand joined	05:23
	← oiweobcv left	05:24
	→ Trendrrr joined	05:24
	→ Hobbyboy joined	05:25
	→ barteks2x joined	05:27
	→ fatihgenc joined	05:29
	→ venmx joined	05:29
	← mgedmin left	05:31
	→ ptoth joined	05:32
	→ justanotheruser joined	05:32
	→ mgedmin joined	05:32
	← justan0theruser left	05:33
	← venmx left	05:34
	← Trendrrr left	05:34
	→ Trendrrr joined	05:35
	→ adityau joined	05:37
	← adityau left	05:38
	→ jnavila joined	05:38
	→ dec0n joined	05:41
	→ maxime_ joined	05:42
	→ jottr joined	05:44
	→ tunekey joined	05:44
	← Trendrrr left	05:45
	← jnavila left	05:45
	→ RichiH joined	05:45
	→ Trendrrr joined	05:47
	← jottr left	05:48
	→ lordjancso joined	05:51
	← Rodya_ left	05:52
	→ ThomasLocke joined	05:53
	← ThomasLocke left	05:53
	→ ThomasLocke joined	05:53
	→ alcohol joined	05:53
	← mud left	05:57
	→ jesst joined	05:57
	← menip_ left	05:58
	→ svm_invictvs joined	05:59
	→ fakenerd joined	05:59
	← Trendrrr left	06:00
	→ rscata joined	06:01
	→ Trendrrr joined	06:01
	→ cqi joined	06:02
	→ dreiss joined	06:02
	← maxime_ left	06:02
	← leeN left	06:03
	← Goplat left	06:04
	→ jceb joined	06:04
	← xall left	06:05
	← inovas left	06:05
	← dave0x6d left	06:08
	← snowkidind left	06:09
	→ ShapeShifter499 joined	06:10
	→ inovas joined	06:10
	← robattila256 left	06:10
	← johnny56 left	06:14
	← Trendrrr left	06:15
	→ johnny56_ joined	06:15
	→ Trendrrr joined	06:17
	→ roelmonnens joined	06:17
	→ cymen joined	06:20
	→ DelphicOkami joined	06:21
	→ loglaunch joined	06:22
	→ __name__ joined	06:22
	← jceb left	06:24
	→ longmeng joined	06:25
	→ dege joined	06:25
	→ Rodya__ joined	06:25
	← navidr left	06:26
	→ JeroenT joined	06:26
	← sunri5e left	06:27
	← longmeng left	06:27
	→ sunri5e joined	06:27
	← ShapeShifter499 left	06:28
	→ jknetl joined	06:29
	← todd_dsm left	06:29
	← davimore left	06:30
	→ freimatz joined	06:30
	← boombatower left	06:30
	← Rodya__ left	06:30
	← Trendrrr left	06:32
	→ schleppel joined	06:33
	→ Trendrrr joined	06:33
	→ chele joined	06:33
	← JeroenT left	06:34
	→ JeroenT joined	06:34
	→ venmx joined	06:35
	← JeroenT left	06:35
	→ JeroenT joined	06:35
	← JeroenT left	06:36
	→ davimore joined	06:36
	→ JeroenT joined	06:36
	→ Anja_ joined	06:37
	← svm_invictvs left	06:39
	→ opalepatrick joined	06:39
	→ nilukush joined	06:40
	← Anja left	06:40
	→ plexigras joined	06:41
	← Trendrrr left	06:41
	→ MineCoins joined	06:42
	→ Trendrrr joined	06:43
	← JeroenT left	06:44
	→ JeroenT joined	06:44
	→ jottr joined	06:44
	← Anja_ left	06:46
	→ doev joined	06:46
	← Trendrrr left	06:49
	→ jay-m joined	06:49
	→ h12o joined	06:49
	→ roelmonn_ joined	06:49
	← jottr left	06:50
	→ Trendrrr joined	06:50
	→ ShapeShifter499 joined	06:50
	→ King_Hual joined	06:51
	→ xall joined	06:51
	← roelmonnens left	06:52
	← jesst left	06:55
	← Trendrrr left	06:57
	→ freddieptf joined	06:57
	← fakenerd left	06:58
	← githubmgw left	06:58
	← venmx left	06:59
	← dermoth left	07:00
	→ Trendrrr joined	07:00
	→ dermoth joined	07:00
	→ venmx joined	07:00
	← thiago left	07:01
	← wilbert left	07:02
	→ ma5ter joined	07:03
	→ pwnz0r joined	07:03
	→ hs366 joined	07:03
	← sarri left	07:04
	→ Anja_ joined	07:04
	→ seschwar joined	07:05
HcsOmot	.karma Vampire0	07:06
gitinfo	the Genuine Real Life Karma™ REST API results are back! v‍ampire0: 43 (4 in past 30 days) (4 given out)	07:06
	← venmx left	07:07
	← JeroenT left	07:08
	→ JeroenT joined	07:08
HcsOmot	huh. just scrolled up to see what's been happening since yesterday. Just learned about karma. So, here goes:	07:09
	thank you Vampire0	07:09
	thank you oxymoron93	07:10
	looks like he's not in yet	07:10
	→ JeroenT_ joined	07:10
	→ Bishop_Bautista joined	07:13
	← dviola left	07:14
	← JeroenT left	07:14
	→ sarri joined	07:15
	← sarri left	07:15
	→ sarri joined	07:15
	→ yaewa joined	07:15
	→ fakenerd joined	07:16
	← moei left	07:17
	← Trendrrr left	07:17
	→ Trendrrr joined	07:19
	← Cabanossi left	07:20
	→ Cabanossi joined	07:22
	→ wandering_vagran joined	07:24
	← Trendrrr left	07:24
	← ptoth left	07:25
	← JeroenT_ left	07:25
	← tanuki left	07:25
	← pwnz0r left	07:26
	→ JeroenT joined	07:26
	→ tanuki joined	07:26
	→ Trendrrr joined	07:26
	→ deepakbndeepu joined	07:26
	→ ZyX-I joined	07:26
	→ Rodya_ joined	07:27
	← yaewa left	07:27
	→ moei joined	07:28
	← fishcooker left	07:29
	← Rodya_ left	07:33
	→ narendraj9 joined	07:33
	→ slappymcfry joined	07:34
	← Trendrrr left	07:36
	Vonor\|Work → Vonor	07:36
	→ Trendrrr joined	07:37
	→ m4sk1n joined	07:38
	← njbair left	07:40
	→ Murii joined	07:40
	→ eshlox joined	07:41
	→ njbair joined	07:41
	→ rossome joined	07:42
	→ fbwnd joined	07:43
	← dreiss left	07:44
	→ kurkale61 joined	07:44
	→ darkJedi joined	07:45
	→ kurkale6ka joined	07:45
	→ dreiss joined	07:45
	→ jottr joined	07:45
	← nilukush left	07:46
	← kurkale61 left	07:48
	→ floppydh joined	07:48
	← fbwnd left	07:49
	← Trendrrr left	07:49
	→ fishcooker joined	07:50
	→ fbwnd joined	07:50
	← jottr left	07:51
	→ Trendrrr joined	07:51
	→ kurkale61 joined	07:51
	← madewokherd left	07:53
	→ mentazoom joined	07:53
	→ flaviodesousa joined	07:54
	← kurkale6ka left	07:54
	← cqi left	07:55
	→ rts-sander_2 joined	07:57
	← Trendrrr left	07:57
	← wandering_vagran left	07:58
	← rts-sander_2 left	07:58
	← rts-sander left	07:58
	→ rts-sander joined	07:59
	→ Trendrrr joined	07:59
	→ elsevero joined	07:59
	→ cstratak joined	07:59
	← hurricanehrndz_ left	08:00
	← ozcanesen left	08:00
	→ wandering_vagran joined	08:00
	→ Sasazuka joined	08:00
	← King_Hual left	08:00
	→ Brski joined	08:02
	→ nilukush joined	08:02
	→ hurricanehrndz joined	08:03
	→ rominronin joined	08:03
	← netj left	08:03
	← Trendrrr left	08:05
	→ netj joined	08:05
	→ Trendrrr joined	08:06
	→ mikecmpbll joined	08:07
	→ marcogmonteiro joined	08:07
	← Arcaelyx left	08:07
	← sarri left	08:07
	→ theoceaniscool joined	08:08
	→ grantrules joined	08:09
	← TbobbyZ left	08:09
	← _ADN_ left	08:10
	← akushner left	08:10
	→ TbobbyZ joined	08:10
	→ pbandark joined	08:11
	← dsdeiz left	08:11
	→ nopf joined	08:12
	← Trendrrr left	08:12
	→ dsdeiz joined	08:13
	→ sarri joined	08:14
	← sarri left	08:14
	→ sarri joined	08:14
	→ Trendrrr joined	08:14
	→ Hasperov joined	08:14
	→ ogny joined	08:14
	← TbobbyZ left	08:15
	← raynold left	08:16
	← mentazoom left	08:16
	← Trendrrr left	08:20
	→ molgrum joined	08:20
	→ amrits joined	08:20
	→ Trendrrr joined	08:21
	← Orion3k left	08:22
	← JeroenT left	08:22
	← ertes left	08:22
	← Hasperov left	08:23
	← tanuki left	08:26
	→ dsdeiz_ joined	08:27
	→ tanuki joined	08:27
	← Anja_ left	08:27
	← Trendrrr left	08:27
	← jay-m left	08:28
	← dsdeiz left	08:28
	→ Trendrrr joined	08:29
	→ Hasperov joined	08:29
	→ jay-m joined	08:29
	→ Rodya_ joined	08:29
	→ _ADN_ joined	08:29
	→ cousteau joined	08:31
cousteau	o/	08:32
	← dsdeiz_ left	08:32
	→ ptoth joined	08:32
cousteau	how does git know that an arbitrary directory belongs to a git project? For example if I run `git status` in myrepo/src/	08:32
	← Bishop_Bautista left	08:33
	→ justan0theruser joined	08:33
alcohol	cousteau: ?	08:33
	→ dsdeiz joined	08:33
	← Rodya_ left	08:33
	← h12o left	08:34
alcohol	cousteau: git searches the directory tree upwards for the presence of a .git directory	08:34
	so if you are in repo/src/, it will find repo/.git and read status from there	08:34
	← macrover left	08:34
	← blackwind_123 left	08:35
	→ Orion3k joined	08:36
	← justanotheruser left	08:36
	→ TheFuzzball joined	08:36
	→ oxymoron93 joined	08:36
osse	cousteau: to programatically determine it, use git rev-parse --is-inside-worktree	08:37
	→ JeroenT joined	08:38
	→ Anja_ joined	08:39
cousteau	alcohol, I see	08:39
	← safe left	08:40
	← Trendrrr left	08:40
	← Anja_ left	08:40
	→ Anja_ joined	08:40
	→ ferr joined	08:41
	→ Trendrrr joined	08:41
	→ ToBeCloud joined	08:42
	gitinfo set mode: +v	08:42
	→ Snugglebash joined	08:43
cousteau	so it just uses an iterative O(n) algorithm, and if it reaches / and doesn't find a .git then it fails	08:44
	I thought that all directories had a symlink to .git/ or a file with info or something like that	08:44
	(which I easily proved wrong)	08:44
	→ jottr joined	08:46
	← theoceaniscool left	08:47
	← justan0theruser left	08:47
	← Trendrrr left	08:47
	→ justanotheruser joined	08:47
	← Anja_ left	08:48
	→ Hyp3ri0n joined	08:48
	← Hyp3ri0n left	08:48
	→ Trendrrr joined	08:49
	← Snugglebash left	08:51
	→ Chuguniy joined	08:51
	→ cdown joined	08:51
	→ nevodka joined	08:51
	← YuGiOhJCJ left	08:51
	→ Hyp3ri0n joined	08:51
	← jottr left	08:51
	← marcogmonteiro left	08:52
	← wandering_vagran left	08:53
	Hyp3ri0n → Cl0udN9ne	08:53
	→ gxt joined	08:54
	→ xall_ joined	08:54
	← Trendrrr left	08:55
	→ notebox joined	08:55
	→ Trendrrr joined	08:56
	← xall left	08:57
	→ marcogmonteiro joined	08:57
	→ chll_ joined	08:57
	→ phinxy joined	08:58
	→ wandering_vagran joined	08:59
	← jakogut left	08:59
	← Hasperov left	08:59
	→ Hello71 joined	08:59
	→ ertes-w joined	08:59
	→ styx_ joined	09:00
	← roelmonn_ left	09:00
	→ Drzacek joined	09:00
Drzacek	Hello there	09:00
	→ Anja_ joined	09:00
	→ roelmonnens joined	09:00
	← Anja_ left	09:01
	→ rtjure joined	09:01
Drzacek	I would like to compare all changes between two commits (current & previous). Whats the right way to do that? Only idea I have is to clone project to second dir, checkout to HEAD^ and then use kdiff on each file - but I believe this is wrong way to do it :D	09:01
	→ valhala_22 joined	09:02
	← Sasazuka left	09:02
	← PioneerAxon left	09:02
	→ PioneerAxon joined	09:02
	→ brent__ joined	09:03
cousteau	Drzacek, probably git diff <commit1> <commit2>	09:04
	← fbwnd left	09:04
oxymoron93	"current commit" being working directory?	09:04
Drzacek	yeah	09:05
	cousteau, that shows me what files changed	09:05
	→ Maskettaman joined	09:05
Drzacek	oops sorry	09:05
	→ Symfony3 joined	09:05
	→ Gurkenglas joined	09:05
	← konsolebox left	09:06
cousteau	you thinking on git status? or maybe you had binary files (I just tried that command and saw just a list of files, but because I added binary files)	09:06
Drzacek	tried git diff HEAD HEAD^, seems like it shows what I wanted	09:06
cousteau	I think git diff HEAD^ should be enough	09:07
oxymoron93	good, google was your friend :)	09:07
Drzacek	cousteau, coincidentally the first file it showed was the "make" file, so it listed files it added/removed	09:07
cousteau	HEAD^ is "the commit right before HEAD" or HEAD~1, right?	09:07
oxymoron93	yes	09:07
Drzacek	okay, thanks	09:08
	← brent__ left	09:08
	← Trendrrr left	09:08
cousteau	yeah... well, `git diff HEAD HEAD^` is the same as `git diff HEAD^` if you don't have committed changes	09:08
	*uncommitted	09:08
Drzacek	second question - how do I restore the "last commit" state in working dir? I was using "git checkout -- ." or "git stash", but none of those touch untracked files, so there is always something I have to delete by hand	09:09
	→ Trendrrr joined	09:09
Drzacek	cousteau, and when I have uncommitted changes, then I should use git diff HEAD HEAD^	09:10
	?	09:10
cousteau	I think that's a "reset --hard" but I'm not sure so I'll wait for someone with more experience to answer	09:10
	Drzacek, yes	09:10
	→ ssarah joined	09:10
	→ sbasso joined	09:10
ThiefMaster	can i somehow tell git to fetch tags only from a certain remote?	09:12
Drzacek	http://paste.debian.net/974030/ tried them all, looks like none of them	09:12
ThiefMaster	`git fetch --all` gives me some garbage tags from antoher developer whose remote i have added, and i tend to accidentally push it during `git push --tags`	09:13
	so i'd like to fetch only tags from 'origin'	09:13
	→ h12o joined	09:16
	← phinxy left	09:17
	← wandering_vagran left	09:17
osse	ThiefMaster: git fetch --tags origin	09:24
	← ShapeShifter499 left	09:24
ThiefMaster	osse: looking for something to put in .git/config	09:24
	→ mikiones joined	09:24
osse	ThiefMaster: git config remote.other.tagopt false	09:24
	or somesuch	09:24
ThiefMaster	ty	09:25
	← mikiones left	09:25
	→ mikiones joined	09:26
	← MineCoins left	09:26
ThiefMaster	osse: is there any wildcard i can use for "other" or do i need to add this to all my other remotes?	09:26
	→ tvw joined	09:27
	→ MineCoins joined	09:27
osse	ThiefMaster: i don't know	09:27
	← Trendrrr left	09:27
	← deepakbndeepu left	09:29
	→ Trendrrr joined	09:29
	→ Rodya_ joined	09:30
	← ZyX-I left	09:30
	→ PhPStorm4 joined	09:32
	← nilukush left	09:33
	← molgrum left	09:33
	→ molgrum joined	09:34
	← rubyonrailed left	09:34
	← Rodya_ left	09:34
	← ThomasLocke left	09:34
	← Symfony3 left	09:34
	← SerusWork left	09:34
	← Trendrrr left	09:34
	→ jakogut joined	09:36
	→ Trendrrr joined	09:36
Drzacek	great, just found out that "git diff HEAD HEAD^" is not the same as "git diff HEAD^ HEAD"	09:36
	→ perrier-jouet joined	09:36
ThiefMaster	obviously ;)	09:36
	but it should be the exact reverse	09:36
Vampire0	Drzacek, of course not, different direction	09:36
Drzacek	I assumed it would look on timestamps and show me changes as what is newer	09:37
Vampire0	Drzacek, the last one actually is identical to `git diff HEAD^!` or even `git diff @^!`	09:37
	Drzacek, nope, why should it. You say compare what changed from this rev to this rev and Git just does what it is told :-)	09:38
	→ SerusWork joined	09:38
Drzacek	so how should I proceed? If I want to see changes from previous to current commit?	09:38
	← SerusWork left	09:38
Drzacek	git diff old new?	09:38
	→ ZyX-I joined	09:38
Vampire0	Drzacek, yes, always old new, like your second or my two versions. All are identical	09:38
Drzacek	damn software, doesn't comply with drzacek expectations	09:39
	:D	09:39
	ok, thanks, now I know	09:39
	← Vonor left	09:40
Vampire0	Drzacek, you can make a bash script or Git alias that determines the author or commiter dates, compares them and orders them accordingly before giving to diff	09:41
	← jay-m left	09:41
	→ wandering_vagran joined	09:42
	← MeltedLux left	09:42
Drzacek	alias gidif="git diff HEAD^ HEAD"	09:43
	← finalbeta left	09:44
	→ finalbeta joined	09:45
	→ jottr joined	09:47
	← darkJedi left	09:48
	← TheFuzzball left	09:48
	→ TheFuzzball joined	09:50
	← Cabanossi left	09:51
	← MineCoins left	09:51
	← duckydan left	09:51
	← askb left	09:51
	→ darkJedi joined	09:52
	→ duckydan joined	09:52
	→ MineCoins joined	09:52
	→ Cabanossi joined	09:52
	← jottr left	09:52
	← Random832 left	09:54
	← hs366 left	09:57
	→ jay-m joined	09:58
	← Trendrrr left	09:58
	← mburke05 left	09:59
	→ Trendrrr joined	10:00
	← wxg left	10:01
Vampire0	Drzacek, if you don't mind getting the commit message author etc. too, you can also simply use `git show	10:02
	→ wxg joined	10:02
Drzacek	Vampire0, hm the output looks totally different	10:03
	← dsdeiz left	10:04
	→ manuelschneid3r joined	10:04
osse	Drzacek: git diff <from> <to>	10:04
	that order makes sense to me	10:05
	← jameser left	10:05
	← Chuguniy left	10:05
jast	I mean, you could just say "git show <commit>"	10:05
	in this case, "git show"	10:06
osse	but the output looks totally different	10:06
jast	but someone already said that... whoops	10:06
	→ SerusWork joined	10:06
jast	it's actually better than just a diff IMO	10:06
	← SerusWork left	10:06
osse	d'accord	10:06
	git diff @^!	10:06
	→ SerusWork joined	10:06
jast	plus the output can still be applied as a diff :)	10:06
	← cstratak left	10:07
	← Maskettaman left	10:07
osse	the default output of log/show makes me think they never planned for format-patch to be a separate command	10:08
	← Kaisyu left	10:08
osse	s/never planned/initially didn't plan/	10:08
	→ MeltedLux joined	10:09
	← darkJedi left	10:11
	← ma5ter left	10:11
	→ Random832 joined	10:12
	← Hello71 left	10:12
	← Trendrrr left	10:14
	← SerusWork left	10:15
	→ Trendrrr joined	10:16
	→ SerusWork joined	10:16
Vampire0	Drzacek, in which way other than I said?	10:16
	[12:02:08] <Vampire0> Drzacek, if you don't mind getting the commit message author etc. too, you can also simply use `git show`	10:16
	Drzacek, there is not only the part after the comma	10:17
	Drzacek, the diff should look the same	10:17
	← MeltedLux left	10:17
	← Gurkenglas left	10:18
	→ Hello71 joined	10:19
	← marcogmonteiro left	10:22
	→ usm4n joined	10:23
	→ zulutango joined	10:23
	→ rnsanchez joined	10:25
	← xall_ left	10:26
	← Trendrrr left	10:26
osse	PLOT TWIST:	10:27
	HEAD is a merge	10:27
	→ Trendrrr joined	10:28
	→ peacememories joined	10:30
	→ xyphoid joined	10:30
	→ Rodya_ joined	10:30
	← h12o left	10:31
Vampire0	ah, that would actually be different then, right	10:31
	→ marcogmonteiro joined	10:32
	→ MeltedLux joined	10:33
	← kurkale61 left	10:33
	← Rodya_ left	10:35
	→ kurkale61 joined	10:35
	← xyphoid left	10:37
	→ slidercrank joined	10:37
	← jay-m left	10:38
	← peacememories left	10:38
	→ jay-m joined	10:38
	← notebox left	10:39
	→ kurkale6ka joined	10:39
	← Trendrrr left	10:39
	→ notebox joined	10:41
	→ Trendrrr joined	10:42
	← wxg left	10:42
	← kurkale61 left	10:43
	← chachasmooth left	10:43
	→ mentazoom joined	10:43
	→ xyphoid joined	10:43
	→ chachasmooth joined	10:43
	← notebox left	10:45
	→ Maskettaman joined	10:45
	→ notebox joined	10:47
	→ YuGiOhJCJ joined	10:47
	← beerdrop left	10:47
	→ jottr joined	10:48
	→ beerdrop joined	10:48
	← xyphoid left	10:49
	← fakenerd left	10:51
	← ToBeCloud left	10:51
	← jottr left	10:52
	← Trendrrr left	10:54
	→ Trendrrr joined	10:56
	← cagedwisdom left	10:57
	← Trendrrr left	11:02
	← narendraj9 left	11:02
	← rscata left	11:03
	→ cstratak joined	11:03
	→ Trendrrr joined	11:04
	← jaziz left	11:04
	→ basiclaser joined	11:05
	→ okamis joined	11:06
	→ karols146 joined	11:07
	→ h12o joined	11:08
	→ IniGit joined	11:10
	← slappymcfry left	11:10
	→ xyphoid joined	11:10
	→ darkJedi joined	11:11
	→ Darcidride joined	11:11
	← Trendrrr left	11:12
	← zulutango left	11:12
	← Maskettaman left	11:13
	→ Maskettaman_yo joined	11:13
okamis	how do i merge $branch to $master but I want $branch commits to not be squashed and the commit messages intact?	11:14
osse	okamis: git checkout master; git merge branch	11:15
	← xyphoid left	11:15
osse	what you're describing is what merge does by default	11:15
	→ Trendrrr joined	11:15
	→ Cavallari joined	11:17
	→ j08nY joined	11:17
okamis	osse, hmm, but I end up with 1 commit message on my pc	11:18
osse	okamis: show me	11:18
	!transcript	11:18
gitinfo	Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see	11:18
	→ tymczenko joined	11:18
	← Cavallari left	11:20
	← slidercrank left	11:20
oxymoron93	well I guess he ends with merge commit message which is ok, but previous commits can be viewed with git log, don't they?	11:20
osse	yes	11:20
	okamis: try !lol	11:20
gitinfo	okamis: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	11:20
okamis	no they cant, its just 1 commit where they are all in	11:20
	thank osse	11:20
osse	if you can show me the output of that I can help	11:21
	→ Khisanth joined	11:21
	→ shinnya joined	11:22
	← Trendrrr left	11:22
	→ WayToDoor joined	11:22
okamis	yeah making it	11:23
	→ Trendrrr joined	11:23
okamis	https://gist.github.com/anonymous/0f68563d27f4e7bfa0c59ebe1495f190	11:25
	So I was wrong with that they are squashed	11:25
osse	Yes, they are there. The only reason git log wouldn't show them is if --first-parent is used	11:25
okamis	But, (a different problem, sort of related) when I do git log it doesnt match up with the git log decorate	11:26
osse	maybe they just appear a bit further down because of the timestamps	11:26
	→ todd_dsm joined	11:26
osse	run git log as usual, then search for them by a word	11:26
	← IniGit left	11:27
okamis	https://gist.github.com/anonymous/5311aa2198b35bc4993cba372d9be7e9	11:27
osse	/47075b6 and Enter	11:27
	→ xyphoid joined	11:27
	→ Chuguniy joined	11:27
osse	but..	11:28
	okamis: the commit starting at line 16 is from that branch!	11:28
okamis	the line 10	11:28
	Or is it because it's a merge it has 2 parents?	11:28
osse	merges have two (or more) parents	11:29
okamis	the line 10 commit, i was expecting it to come after all the commits from $branch	11:29
osse	it probably appears there because of the date	11:29
	→ dave0x6d joined	11:29
osse	try git log --topo-order	11:30
	← Trendrrr left	11:30
okamis	It worked	11:30
osse	\o/	11:30
	→ Rodya_ joined	11:31
okamis	Is there a way to cp the commits from branch over to master (so it looks like they were developed on master\|so it doesnt have 2 parents)	11:32
	→ Trendrrr joined	11:32
	← darkJedi left	11:32
	→ wxg joined	11:33
osse	okamis: Yes. Rebaee the components branch on master, then do the merge	11:33
	← fishcooker left	11:33
	← Maskettaman_yo left	11:35
osse	okamis: https://github.com/Osse/git-stuff/blob/master/merge-vs-rebase.txt	11:36
	← Rodya_ left	11:36
	→ tcorneli joined	11:36
okamis	I suspect the line 10 commit would be actually the top commit when branching components I made another commit on master so the order would not be the same. The result Im looknig for is replaying the branch commits on to master	11:37
osse	rebase does that	11:37
okamis	thank you	11:37
osse	it re-bases, as in changes the base for the branch	11:38
	see my awesome ascii art	11:38
	← Trendrrr left	11:38
	← davimore left	11:39
	→ Trendrrr joined	11:39
okamis	read it, it was before my statement though	11:40
	→ ToBeCloud joined	11:40
	gitinfo set mode: +v	11:40
	→ peacememories joined	11:43
	→ kurkale61 joined	11:43
	→ Panacea joined	11:44
	→ scottjl joined	11:45
	→ davimore joined	11:45
	← Trendrrr left	11:46
	← kurkale6ka left	11:46
zero85	hi, i merged a feature branch multiple times to development branch, deleted the feature branch and made some commits to development, now i need to revert all changes only from the feature branch? is this possible? or do i need to find all commits made in the feature branch and revert them one by one?	11:47
	→ Trendrrr joined	11:47
	← TheFuzzball left	11:48
	→ jottr joined	11:49
	← Cabanossi left	11:51
	→ Cabanossi joined	11:52
	← jottr left	11:53
	→ CrazyLazyDazy joined	11:54
	← Panacea left	11:54
	← jknetl left	11:54
CrazyLazyDazy	I reverted a pushed commit and changed branch, and now I want that commit back to the current branch. How can I do this?	11:54
	→ askb joined	11:55
	← kurkale61 left	11:55
	→ Cavallari joined	11:55
	→ jknetl joined	11:55
	→ str joined	11:56
	← Trendrrr left	11:56
osse	CrazyLazyDazy: revert the revert, or cherry-pick the original	11:56
	← askb left	11:56
	→ Silmarilion joined	11:58
	→ Trendrrr joined	11:58
	→ Maskettaman joined	11:59
	← jay-m left	11:59
	← lordjancso left	11:59
	→ Gurkenglas joined	12:00
	→ czart__ joined	12:00
	← ZyX-I left	12:01
	→ jottr joined	12:02
	→ cstratak_ joined	12:02
	← cstratak left	12:03
	→ venmx joined	12:03
	← czart_ left	12:04
	← Trendrrr left	12:04
zero85	(sry for repeating but had disconnect=( -> hi, i merged a feature branch multiple times to development branch, deleted the feature branch and made some commits to development, now i need to revert all changes only from the feature branch? is this possible? or do i need to find all commits made in the feature branch and revert them one by one?	12:04
	→ star_prone joined	12:05
	→ Trendrrr joined	12:06
	→ khatri joined	12:06
	← peacememories left	12:08
	← venmx left	12:08
	← jottr left	12:09
	→ peacememories joined	12:09
	→ rda-mac joined	12:09
	← Brian\|2 left	12:12
	→ Brian\|2 joined	12:12
	← khatri left	12:12
	→ khatri joined	12:12
	→ theiostream joined	12:13
CrazyLazyDazy	osse, revert the original commit or revert the reverted commit?	12:13
	→ IniGit joined	12:13
	→ bigjazzsound joined	12:13
	← xyphoid left	12:15
CrazyLazyDazy	osse, I reverted the revert and it worked. thanks!	12:15
	→ Cavallari1 joined	12:18
	← freddieptf left	12:18
	← h12o left	12:19
	→ freddieptf joined	12:19
	→ lordjancso joined	12:19
	→ buffal0 joined	12:19
	→ xyphoid joined	12:19
	→ livingstn joined	12:20
	← Trendrrr left	12:20
	→ dsdeiz joined	12:20
	← dsdeiz left	12:20
	→ dsdeiz joined	12:20
	→ Trendrrr joined	12:21
	← Cavallari left	12:21
	→ Cavallari joined	12:22
	← Cavallari1 left	12:22
bluesm	Is rebase going through all previous commits. I have the situation when cherrypicking works fine, but rebase fails.	12:23
	← notebox left	12:23
	→ masuberu joined	12:23
	← livingstn left	12:23
	← xyphoid left	12:25
	→ brent__ joined	12:26
	← JeroenT left	12:26
	← dsdeiz left	12:26
	→ aard_ joined	12:26
osse	bluesm: if you rebase foo onto bar then it uses all commits in the range bar..foo	12:26
	→ JeroenT joined	12:26
	← Trendrrr left	12:27
	→ livingstn joined	12:28
	← wxg left	12:29
osse	zero85: you can revert the merge commits	12:29
	→ kurkale61 joined	12:29
	→ Trendrrr joined	12:29
osse	zero85: in any case, you can combine them in other huge "revert ALL THE THINGS!" commit afterwards.	12:29
	either by squashing them or by using revert --no-commit and then commit at the end	12:30
	→ ahr3n joined	12:30
	← oxymoron93 left	12:31
osse	s/in other/in one/	12:31
	← alcohol left	12:31
zero85	and how do i easily find all the commits if i merged the branch multiple times and deleted the feature branch after?	12:31
osse	it would be easier to revert the merges, then	12:31
	← livingstn left	12:31
	← JeroenT left	12:31
zero85	how?	12:32
osse	you revert a merge commit the same way you revert a regular commit	12:32
	except you need to use -m 1	12:32
	as for finding them, the easiest is to use your eyes + git log --oneline --graph development	12:32
	→ xyphoid joined	12:33
	→ notebox joined	12:35
	→ TheFuzzball joined	12:35
	← Trendrrr left	12:37
	← karols146 left	12:37
	→ cebula joined	12:38
	→ Fleche joined	12:38
	→ Trendrrr joined	12:38
	← theiostream left	12:39
	← Maskettaman left	12:41
	← xyphoid left	12:42
	→ theiostream joined	12:42
	→ Maskettaman joined	12:42
	← ferr left	12:42
	→ wxg joined	12:42
	← Hello71 left	12:43
	→ narendraj9 joined	12:45
	← theiostream left	12:47
	→ navidr joined	12:48
	← Trendrrr left	12:48
	→ Trendrrr joined	12:50
	→ steeze joined	12:50
	← steeze left	12:50
	← Cabanossi left	12:50
	← peacememories left	12:50
	→ Hello71 joined	12:51
	← axisys left	12:51
	→ xyphoid joined	12:52
	→ Cabanossi joined	12:52
	→ jay-m joined	12:52
	→ fakenerd joined	12:53
	→ fishcooker joined	12:53
	← wxg left	12:54
	← Trendrrr left	12:55
	← rasto left	12:56
	← xyphoid left	12:56
	← brent__ left	12:56
	→ Trendrrr joined	12:57
	→ fission6 joined	12:57
	→ brent__ joined	12:58
	→ peacememories joined	13:01
	← tymczenko left	13:01
nikolai_	How do I find out the "default" format string, for e.g., say "git log --pretty=fuller"? I would like to modify that slightly	13:02
	← ahr3n left	13:02
	← Trendrrr left	13:03
	→ valhala_223 joined	13:03
	← brent__ left	13:03
	→ h12o joined	13:03
	→ wxg joined	13:04
	→ axisys joined	13:04
	→ Trendrrr joined	13:04
	→ ekinmur joined	13:04
	→ jottr joined	13:05
osse	nikolai_: from the source there doesn't seem to be any. the logic on how it's printed is different	13:05
	← valhala_22 left	13:05
nikolai_	osse: ok, thanks (I just want to replace the autor-date with the commit date)	13:06
	← Hello71 left	13:07
	→ JeroenT joined	13:08
	→ sword joined	13:08
	→ livingstn joined	13:08
	← Maskettaman left	13:08
	← cstratak_ left	13:09
	← elsevero left	13:09
	→ Maskettaman joined	13:09
	← jottr left	13:10
	← Trendrrr left	13:10
	Cl0udN9ne → Woniken	13:11
	→ rasto joined	13:11
	← doev left	13:12
	→ gugah joined	13:12
	Woniken → OtakuSenpai	13:12
	→ Trendrrr joined	13:12
	→ githubmgw joined	13:12
	OtakuSenpai → Nawab	13:12
	→ karols146 joined	13:12
	→ freesand joined	13:13
	← Maskettaman left	13:14
	→ ExoUNX joined	13:14
	→ leeN joined	13:14
	→ cstratak joined	13:15
	→ theoceaniscool joined	13:15
	→ r3m1 joined	13:16
r3m1	hello	13:16
gitinfo	r3m1: 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.	13:16
	← IniGit left	13:16
	→ Hello71 joined	13:16
	← buffal0 left	13:17
okamis	Messed up a git rebase -i <commit> where I squashed to many commits. Now git is asking me for the new Git message. Anyway to undo this :'(	13:17
	→ Tobbi joined	13:17
	← freesand left	13:17
	← Trendrrr left	13:18
	→ Dougie187 joined	13:18
	← livingstn left	13:19
r3m1	ok git gurus, here is my question: I have been mistakenly coding on the main branch of my project while I should be coding on a side branch. I have neither committed nor pushed my changes on the main. I would like to checkout my branch and apply the changes I have been doing there. Can git help me with that, or do I have to do it manually ?	13:19
	→ Trendrrr joined	13:19
	← HcsOmot left	13:19
r3m1	main and branch were just 1 commit away from each other before I started coding, by the way	13:20
	→ xyphoid joined	13:21
	← MineCoins left	13:21
Hello71	!fixup	13:21
gitinfo	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:21
Hello71	r3m1: git checkout other; git commit	13:21
	← wxg left	13:22
	→ monjwf_ joined	13:23
	→ theiostream joined	13:24
r3m1	Hello71: it says error: Your local changes to the following files would be overwritten by checkout: [...] Please commit or stash	13:24
Hello71	so	13:24
	maybe	13:24
	did you read it	13:24
r3m1	if I stash will I have the modified version of the files when I checkout the branch ?	13:25
	← raulp left	13:25
	← xyphoid left	13:26
	→ jnewt_ joined	13:26
Hello71	http://google.com/search?q=git+stash	13:26
	← Hello71 left	13:26
r3m1	I think it's time for me to RTFM ;D	13:26
	← monjwf left	13:26
	← valhala_223 left	13:27
	→ Hello71 joined	13:28
	← fission6 left	13:28
	← Trendrrr left	13:28
	← notebox left	13:29
	→ Trendrrr joined	13:30
	← theoceaniscool left	13:30
	→ fbwnd joined	13:31
	→ fission6 joined	13:31
	← enckse left	13:32
	→ xyphoid joined	13:33
	→ tymczenko joined	13:33
r3m1	thanks Hello71 ! :)	13:34
	← fbwnd left	13:36
	→ enckse joined	13:38
	→ TheWild joined	13:39
TheWild	hello	13:39
	what if a domain I cloned the project from expires, then someone else registers it. Now I'm trying to push the repository. Could that someone discover my password/hash?	13:40
	← Trendrrr left	13:40
selckin	over http yes	13:40
	ssh no	13:40
	→ morfin joined	13:40
morfin	hello	13:40
	→ ZexaronS joined	13:40
morfin	every time i stash that's commit right?	13:41
	→ Baz joined	13:41
TheWild	by "that someone" I meant the person who registered the domain after the expiration.	13:41
	→ Trendrrr joined	13:41
	→ boombatower joined	13:42
	← theiostream left	13:45
	← Bock left	13:46
	← okamis left	13:47
	→ phos1 joined	13:47
	→ notebox joined	13:47
	← Murii left	13:47
	← xyphoid left	13:48
	→ MineCoins joined	13:48
	← Trendrrr left	13:49
	→ kurkale6ka joined	13:49
	← Cabanossi left	13:50
phos1	Is it possible to use GIT over an SMB share? I have a small web team and don’t want to manage local development accounts and would rather have everyone use 1 local server. But I want to have GIT able to work in our programs. Any suggestions?	13:50
	→ Noldorin joined	13:51
	→ Trendrrr joined	13:51
	→ xyphoid joined	13:51
Seveas	phos1: it's possible, but very ill advised	13:52
	→ Cabanossi joined	13:52
	→ oskarkv joined	13:52
Seveas	especiall the 'sharing a single repo' bit	13:52
	← kurkale61 left	13:52
	→ kurkale61 joined	13:53
	→ badministrator joined	13:53
phos1	Seveas: I only have one user on a project / in a repo at a time, so that part won’t be to bad, I can’t figure out another way to manage development servers as i don’t have time to manage several different computer setups (Even with Docker etc)	13:53
	← TheWild left	13:53
Seveas	morfin: a stash is in fact 2 commits :)	13:53
	← YuGiOhJCJ left	13:53
	← kurkale6ka left	13:55
	← Trendrrr left	13:56
	→ thebope joined	13:56
	← Cavallari left	13:57
	← xyphoid left	13:57
	← flaviodesousa left	13:58
	← mostlybadfly left	13:58
	→ Trendrrr joined	13:58
	→ pzp joined	13:59
	→ GT4066 joined	14:00
	← cstratak left	14:00
	← fatihgenc left	14:01
	← chachasmooth left	14:01
	→ cstratak joined	14:01
	→ griffindy joined	14:01
	← Rotaerk_ left	14:02
	→ CBF16888 joined	14:03
	→ Cavallari joined	14:03
	← TheFuzzball left	14:03
	← iffraff1 left	14:03
	→ iffraff joined	14:04
	← rominronin left	14:04
	← Drzacek left	14:05
	← Trendrrr left	14:05
	→ jottr joined	14:06
	→ buffal0 joined	14:06
	← PioneerAxon left	14:06
	→ Trendrrr joined	14:07
	← MineCoins left	14:07
	← jay-m left	14:07
	← badministrator left	14:08
	→ shentino joined	14:08
	→ jay-m joined	14:09
shentino	How do I do a rebase and sort my commits by chronological order?	14:09
	I was naughty and rearranged my commits	14:09
	→ LeBlaaanc joined	14:10
	← dec0n left	14:10
	→ l33ch joined	14:10
	← l33ch left	14:10
	← jottr left	14:10
	→ PioneerAxon joined	14:11
	← JeroenT left	14:11
	→ xyphoid joined	14:13
	← buffal0 left	14:13
	→ badministrator joined	14:13
	← badministrator left	14:13
	← nikolai_ left	14:14
rudi_s	Who cares?	14:14
	(I don't think there's an automatic way to do that.)	14:14
	→ Cavallari1 joined	14:14
	← Trendrrr left	14:14
	← Xarodon left	14:15
	← kurkale61 left	14:16
	→ Trendrrr joined	14:16
	← ekinmur left	14:17
	← Cavallari left	14:17
	Cavallari1 → Cavallari	14:17
	→ l33ch joined	14:17
	← xyphoid left	14:17
	→ Rodya_ joined	14:18
	→ nkuttler joined	14:18
	→ menip_ joined	14:19
	← tvw left	14:19
	→ beaky joined	14:19
	← jay-m left	14:19
	← seschwar left	14:20
	← Cabanossi left	14:20
	← notebox left	14:21
	→ jottr joined	14:21
	← Baz left	14:22
	→ livingstn joined	14:22
	→ Cabanossi joined	14:22
	→ rostero joined	14:22
	→ s0bait joined	14:22
	← s0bait left	14:22
	→ s0bait joined	14:22
s0bait	Hello	14:22
	→ ekinmur joined	14:22
	→ Xarodon joined	14:22
	← basiclaser left	14:24
	← Trendrrr left	14:24
rostero	i did `git checkout -b feature1 upstream/feature1;` and then `git push -u origin feature1`. now i did `git checkout -b feature1a upstream/feature1` to start over, but when i do `git push -u origin feature1a` i get an error because it says i'm pushing a branch tip behind its remote	14:24
s0bait	I accidently merged a branch that is way ahead of my current one. I fixed it by resetting to the commit that i did. However it has created a BUNCH of files which I cannot get rid of with checkout/reset	14:25
rostero	it's almost like it's trying to push to the same place as feature1	14:25
	→ ResidentBiscuit joined	14:25
	→ TheFuzzball joined	14:25
	→ xyphoid joined	14:25
	→ JeroenT joined	14:25
	→ Trendrrr joined	14:26
	← JeroenT left	14:27
	→ jay-m joined	14:27
	→ kimundi joined	14:27
	→ JeroenT joined	14:28
	← JeroenT left	14:28
	← schleppel left	14:28
	← xyphoid left	14:30
kimundi	Hi! I have a large branch with a lot of commits that do changes to files in two different sub directories. I'd like to split up the commits into two different brnaches, one for all changes in one directory, and one for changes in the other	14:31
	← cdown left	14:31
	→ schleppel joined	14:31
kimundi	I could just throw away the history and create two new branches for both directores, but I'd like to avoid that	14:32
	→ cdown joined	14:32
kimundi	So right now I'm thinking about how to best do this - say by somehow drop all changes to the "wrong" directory tree during a rebase	14:33
	← livingstn left	14:33
	→ kurkale61 joined	14:33
	→ xyphoid joined	14:33
	→ kurkale6ka joined	14:35
	→ livingstn joined	14:35
	→ rubyonrailed joined	14:35
ResidentBiscuit	Branch, stash what you don't want, commit. Create second branch, stash pop, commit the rest	14:35
	← Trendrrr left	14:36
	← tymczenko left	14:36
kimundi	Sure, but that way I would have the commits for both directories in the history of both branches.	14:36
	→ m0j0 joined	14:37
	← freddieptf left	14:37
kimundi	Which would be fine if they would get merged as-is anyway, but I'm not doing that exactly	14:37
	→ Trendrrr joined	14:37
ResidentBiscuit	After the first commiting, branch off of the original point	14:37
	← TheFuzzball left	14:38
	← kurkale61 left	14:38
	→ thiago joined	14:38
	← Attrimap left	14:39
kimundi	ResidentBiscuit: I'm not following exactly - I'm not attempting to commit new changes here, rather split up an existing history of commits	14:39
	→ TheFuzzball joined	14:39
ResidentBiscuit	Oh, I misunderstood. I thought you had a bunch of pending changes	14:39
kimundi	Nah, thankfully I know how to address that issue already :)	14:40
	← mentazoom left	14:40
ResidentBiscuit	There might be a more elegant way, but my first attempt would be to go back to the point before all the changes, branch off, cherry pick what you need. Repeat for the other set of commits	14:40
	← rasto left	14:41
kimundi	ResidentBiscuit: Yeah, but its a few hundred commits, so I'm basically for some way to automate that#	14:41
	I guess I could jjust start writing a python script that does some non-trivial things...	14:42
ResidentBiscuit	Yeah that's what I meant by a more elegant way. This isn't something I've done before, so I'm at my end of help :/	14:42
kimundi	alright, thanks though :)	14:42
	← daynaskully left	14:43
	← xyphoid left	14:43
	← jay-m left	14:43
	← usm4n left	14:43
ResidentBiscuit	https://stackoverflow.com/a/32082356 Maybe this?	14:43
kimundi	ResidentBiscuit: It goes in the right direction at least	14:47
ResidentBiscuit	Worth a shot. The wonder of git is it's really hard to real damage	14:47
	← sz0 left	14:49
	← Trendrrr left	14:49
	← davimore left	14:49
	← cdown left	14:49
	← roelmonnens left	14:50
	← peacememories left	14:50
	→ Trendrrr joined	14:50
	→ cdown joined	14:51
	→ WhereIsMySpoon joined	14:51
	← ogny left	14:51
WhereIsMySpoon	Is there some way so that when I do “git checkout -b somebranch” it actually does “git checkout master && git pull && git checkout -b somebranch” ?	14:51
	Only for when I use checkout with -b	14:52
	← kurkale6ka left	14:52
	→ rasto joined	14:52
	→ nast joined	14:52
	← narendraj9 left	14:54
	← nast left	14:54
	→ nast joined	14:55
	← salamanderrake left	14:55
ResidentBiscuit	You can make an alias that does that	14:56
	→ davimore joined	14:56
	← diogenese left	14:56
ResidentBiscuit	I don't think you can just override the behavior of flags though	14:57
	→ jwest joined	14:58
	← Silmarilion left	14:58
	→ df0 joined	14:58
	→ jay-m joined	14:59
	→ xyphoid joined	14:59
	→ fbwnd joined	14:59
	→ notebox joined	14:59
WhereIsMySpoon	Got it	14:59
	← Trendrrr left	14:59
WhereIsMySpoon	newb = !git checkout master && git pull && git checkout -b	15:00
	for an alias :)	15:00
	→ Trendrrr joined	15:01
Dougie187	Just hope they don't make local commits to master. :P	15:01
ResidentBiscuit	^	15:01
	→ peacememories joined	15:01
Dougie187	But another way you can do it is something like this	15:01
	newb = !git fetch origin && git checkout -b $1 origin/master	15:02
	Something like that.	15:02
kimundi	ResidentBiscuit: Okay, I found a strategy that works by generating a list of commits that touched one directory, and then cherry-picking each one	15:02
	ResidentBiscuit: The issue is sometimes a commit touched both...	15:02
	→ warthog9 joined	15:02
ResidentBiscuit	I believe that SO answer I linked had a solution that would grab commits that were only on one branch that touched a particular directory	15:03
Dougie187	WhereIsMySpoon: Just in case you didn't notice, my last few messages were for you.	15:04
ResidentBiscuit	I didn't try it, but the answer made it sound like that's what was going on	15:04
	→ theiostream joined	15:04
	← star_prone left	15:04
	→ daynaskully joined	15:04
	← thiago left	15:04
WhereIsMySpoon	Dougie187: Im assuming git checkout -b $1 origin/master will checkout the new branch with the name from the latest fetched changes from master?	15:05
	← jknetl left	15:05
	→ star_prone joined	15:05
	→ zivester joined	15:05
kimundi	ResidentBiscuit: Nah, it specifically siad that it only works if that is the case, not that it ensures it	15:05
	→ kurkale6ka joined	15:05
	← jay-m left	15:05
	← xyphoid left	15:05
Dougie187	WhereIsMySpoon: yes. $1 is the name (I can't remember if that's the right syntax in git aliases, but you could write a script for it too). And origin/master is the remote tracking branch that you'll branch from. It's equivalent to `git pull` but won't cause any nasty merge issues in the event that people commit to master locall.	15:06
	locally*	15:06
	← nast left	15:06
	← star_prone left	15:06
	← Cabanossi left	15:06
	→ jay-m joined	15:06
	→ star_prone joined	15:06
Dougie187	kimundi: If you have a commit that touches both dirs, you can reset and backout the other dir's changes before committing it again as a patch for just that directory.	15:06
	← star_prone left	15:06
ResidentBiscuit	Well, who knows. If you can get the list of commits that's mostly right, just manually remove the wrong ones and feed that into cherry pick	15:06
	→ nast joined	15:07
	→ star_prone joined	15:07
kimundi	Dougie187: Right, I'm looking for a way to do that automatically	15:07
	← peacememories left	15:07
	→ Cabanossi joined	15:07
kimundi	Dougie187: Basically thinking about how I would have to plug together stuff for a command line or bash/python script	15:07
Dougie187	kimundi: The automatic way that I can think of is to filter-branch	15:07
kimundi	ooh, whats that?	15:07
Dougie187	man git filter-branch	15:07
gitinfo	the git-filter-branch manpage is available at https://gitirc.eu/git-filter-branch.html	15:07
	← Trendrrr left	15:07
Dougie187	Though, it does an entire branch	15:08
	So, it might not be exactly what you're looking for.	15:08
	It's effectively the same as subtree splitting a directory out, and then subtree merging it back in.	15:08
	(for your purposes at least)	15:08
	← Cavallari left	15:09
	→ xyphoid joined	15:09
	→ roelmonnens joined	15:09
kimundi	Dougie187: My problem is to filter out all commits that touched a specific directory in a branch, so it sounds exactly like what I want :)	15:09
Dougie187	Ok cool. Then either one works.	15:10
	subtree split, or filter-branch	15:10
	If that's literally all you're trying to do, I'd look at subtree split first.	15:10
WhereIsMySpoon	Dougie187: alright, thanks for the help!	15:10
	have a good weekend, y’all	15:10
	← WhereIsMySpoon left	15:11
	← star_prone left	15:11
	→ Trendrrr joined	15:11
	→ steeze joined	15:11
	← menip_ left	15:11
kimundi	Dougie187: Hm, I can't direclty figure out where to find the docs of how to use that	15:11
	→ valhala_223 joined	15:12
Dougie187	kimundi: Should be something like `git subtree split -P <dir> <branch>`	15:12
	Then it'll give you a hash at the end. That hash is a new commit that is the head of a branch where all of the commits only touch <dir>	15:13
	(and I think <dir> is also elevated to the root of the repo)	15:13
	← CrazyLazyDazy left	15:13
	→ anjen joined	15:13
	→ valhala__ joined	15:13
	← roelmonnens left	15:13
Dougie187	kimundi: <dir> is the directory you want to extract, and <branch> is the branch that contains the history you want.	15:13
kimundi	Thanks, I'll look into it	15:14
	← xyphoid left	15:14
	→ irco joined	15:14
	→ WhereIsMySpoon joined	15:15
	→ buffal0 joined	15:15
WhereIsMySpoon	Sorry >.< when I try to run git fetch && git checkout -b test-1234 origin/master it works just fine in a console, but if I put !git fetch && git checkout -b $1 origin/master as an alias, I get:	15:15
	fatal: Cannot update paths and switch to branch 'test-1234' at the same time. Did you intend to checkout 'test-1234' which can not be resolved as commit?	15:16
	running as ‘git newb test-1234’	15:16
kimundi	Dougie187: Ah reading the man page a bit more, it might not exactly be what I want - I don't want to create a standalone history tree for the directory, just split commits touching it into their own branch	15:16
	← jay-m left	15:16
	← cousteau left	15:16
	← valhala_223 left	15:16
Dougie187	kimundi: I think if you have commits that touch multiple directorys, you can't do that automatically then.	15:17
kimundi	Alright, back to my crappy script it is then	15:17
	Dougie187: What would you say is the best manual process for "this is a commit hash, I want to cherry pick it, look at what files it touches, rewrite it as needed"?	15:18
	← kurkale6ka left	15:18
	→ xyphoid joined	15:19
Dougie187	I would look at it before you cherry-pick, and then decide if you want `cherry-pick --no-commit` or just normal cherry-pick. personally at least.	15:19
	Something like `git log -n 1 <hash> --name-only` (for the looking at a hash part)	15:19
	← Trendrrr left	15:19
Dougie187	Then cherry-pick is either one of: 1) `cherry-pick <hash>` or 2) `cherry-pick <hash> --no-commit`	15:20
	Rewrite is either, leave it as is, for (1) or `git commit <dir>; git reset --hard HEAD` for the directory you're trying to bring over.	15:20
	→ Kristjan55555 joined	15:20
Dougie187	Where the command is for (2) from the cherry-pick "branch"	15:20
	← jottr left	15:20
kimundi	Dougie187: Yeah, right now I'm trying to either get git log or git show to only show the file paths	15:20
	← ToBeCloud left	15:21
Kristjan55555	http://imgur.com/a/6v4VA	15:22
	→ Trendrrr joined	15:22
	← Kristjan55555 left	15:22
	← lordjancso left	15:22
	→ Gustavo6046 joined	15:23
	← TheFuzzball left	15:23
	← djb-irc left	15:23
	← xyphoid left	15:23
kimundi	Alright, managed that part :P	15:24
	→ jottr joined	15:24
	→ durham joined	15:24
	← ertes-w left	15:24
	→ synthroid joined	15:24
WhereIsMySpoon	Ah, got it to work!	15:24
	I needed a bash function instead of a straight alias	15:24
	newb = "!f(){ git fetch && git checkout -b \"$1\" origin/master; };f"	15:25
	not sure why this makes any difference	15:25
	but whatever	15:25
Dougie187	Glad it worked though. :P	15:25
	← jmesmon left	15:26
	→ jmesmon joined	15:26
	→ TheFuzzball joined	15:26
	← Trendrrr left	15:27
	→ jay-m joined	15:28
	→ Trendrrr joined	15:29
	→ madewokherd joined	15:29
	← ZexaronS left	15:29
	→ user2468 joined	15:30
	← valhala__ left	15:30
	← h12o left	15:31
	→ valhala_22 joined	15:31
	→ Maskettaman joined	15:31
	← df0 left	15:31
	← theiostream left	15:32
	← WhereIsMySpoon left	15:33
	→ df0 joined	15:33
	→ theiostream joined	15:33
	← WayToDoor left	15:34
	→ kpease joined	15:34
	← valhala_22 left	15:35
	→ cdg_ joined	15:35
	→ valhala_22 joined	15:35
	← Trendrrr left	15:35
	← Brski left	15:35
	← LeBlaaanc left	15:36
	→ Trendrrr joined	15:37
	→ markus-k joined	15:37
	← anjen left	15:38
	← Maskettaman left	15:39
	← TheFuzzball left	15:40
	→ Maskettaman joined	15:40
	→ xyphoid joined	15:41
	← Trendrrr left	15:43
	← kyan left	15:43
	→ chase joined	15:43
	→ aredpanda`w joined	15:43
	→ kurkale6ka joined	15:43
	← wandering_vagran left	15:43
	← cdown left	15:44
	→ Trendrrr joined	15:44
	→ bsanford joined	15:44
	← cebula left	15:45
	← valhala_22 left	15:45
	← tunekey left	15:45
	→ valhala_22 joined	15:45
	← xyphoid left	15:46
	→ LeBlaaanc joined	15:46
	← durham left	15:47
	← theiostream left	15:47
	→ BadCodSmell joined	15:47
	→ brent__ joined	15:47
	← Chuguniy left	15:47
aredpanda`w	Hello guys, need some tips on .gitignore usage as I've been struggling with keeping my directory structure while ignoring some dirs' content. My project has an 'app/logs' folder with multiple subdirs that I need to keep versioned, so I placed a .keep file inside the directories I need versioned and wrote the following rules on my .gitignore file 'app/logs/*/' preceding '!app/logs/**/.keep'. However, git keeps ignoring the dirs themselves. Can	15:47
	anyone shed some light on what I'm doing wrong?	15:47
	← brent__ left	15:48
	→ robattila256 joined	15:48
	→ h12o joined	15:48
	→ brent__ joined	15:48
BadCodSmell	I am trying to sitch one tree in git onto another. I am using rebase --onto the_commit_i_want_the_tree_to_sit_on a_branch	15:49
	→ arifuzzaman joined	15:49
	→ thiago joined	15:49
BadCodSmell	It seems more like it wants me to specify a leaf but really I need to specify the root of the tree.	15:49
	← thiago left	15:49
	→ thiago joined	15:49
preaction	aredpanda`w: why not just git add -f	15:49
BadCodSmell	When I do --root with a branch it does strange things as well.	15:50
	← arifuzzaman left	15:50
	→ arifuzzaman joined	15:50
	→ GNewton joined	15:50
BadCodSmell	For example if I do master where things have branced off that into many sub trees	15:50
	← arifuzzaman left	15:50
	→ raulp joined	15:51
	→ snowkidind joined	15:51
BadCodSmell	then only master linearlarly rebased onto the commit i want but the other brances are left out	15:51
	→ durham joined	15:51
	← valhala_22 left	15:52
BadCodSmell	Is there a way I can have --onto and --root shift the entire tree over?	15:52
aredpanda`w	preaction, if I do that, git will just add the files inside the directories aswell	15:53
	← h12o left	15:53
preaction	then reset the files after it's added	15:53
	← tanuki left	15:54
aredpanda`w	preaction, git is now ignoring the folder completely	15:54
preaction	what do you mean by that? isn't that the goal? or did you accidentally reset the .keep file too?	15:55
	← Trendrrr left	15:55
	→ tanuki joined	15:55
	→ ertes joined	15:56
	→ Trendrrr joined	15:57
	→ xyphoid joined	15:57
aredpanda`w	preaction, here's my current .gitignore: https://hastebin.com/desirevufi.scala I then proceeded to 'git add -f app/logs/server && git add -f app/logs/scans && git reset app/logs/{server,scan}/*.{log,scan}'	15:58
preaction	you just want to add the .keep file	15:58
	← Gustavo6046 left	15:58
	→ macrover joined	15:58
	← chele left	15:59
	← davimore left	15:59
	→ orbyt_ joined	16:00
	← s0bait left	16:00
	← jay-m left	16:00
	→ Phylock joined	16:01
	← orbyt_ left	16:01
	← notebox left	16:01
	→ jimklo joined	16:01
aredpanda`w	preaction, thanks! i feel stupid now but smarter, so I got that going on for me, I guess.	16:01
	← Tobbi left	16:02
	← xyphoid left	16:02
	→ WayToDoor joined	16:03
	→ jceb joined	16:03
	← Trendrrr left	16:04
preaction	sorry. i wasn't very clear either. the full implications of "git does not track directories" are weird	16:04
	→ venmx joined	16:04
	← Cabanossi left	16:05
preaction	"you asked me to add a directory. i don't track directories, so you must have asked me to add all the things inside the directory!"	16:05
	→ tymczenko joined	16:05
	← tymczenko left	16:06
	→ davimore joined	16:06
	→ tymczenko joined	16:06
	← tymczenko left	16:06
	→ Maskettaman_yo joined	16:07
	← Maskettaman left	16:07
	→ Trendrrr joined	16:07
	→ Cabanossi joined	16:07
	→ jay-m joined	16:08
	→ h12o joined	16:08
	← venmx left	16:08
	← durham left	16:09
	→ durham joined	16:09
	→ orbyt_ joined	16:10
	→ bitslip joined	16:10
	→ nilukush joined	16:11
	→ planigan joined	16:12
kimundi	Hm, I'm using "git diff --name-only HASH^ HASH" to get the list of changed files, but for some reason the output contains shell escape sequences	16:12
	← fbwnd left	16:13
kimundi	trying to figure out how surpress these...	16:13
	← skinnymg1 left	16:13
	← h12o left	16:13
	→ notebox joined	16:13
	→ s0bait joined	16:14
	→ durham_ joined	16:14
	← durham left	16:14
	s0bait → Guest74019	16:14
	→ cdown joined	16:14
	← GNewton left	16:15
	→ dman777_alter joined	16:15
kimundi	ah, the solutions was --no-pager	16:16
	→ svm_invictvs joined	16:16
kimundi	(see https://stackoverflow.com/questions/20121664/git-show-log-without-shell-escape-sequences-for-use-with-python-sh)	16:16
	→ jimmyrcom_ joined	16:16
	← j08nY left	16:16
	← sbasso left	16:16
dman777_alter	hello. I am on branch foo and I want to merge develop into my feature branch foo. From branch foo, I do git merge -X theirs develop which works. But then when I git rebase develop to make sure it is caught up I get merge conflicts. Why is this when the merge should have all the new code on branch foo?	16:17
	← Trendrrr left	16:17
	→ j08nY joined	16:17
	← rubyonrailed left	16:17
	→ xyphoid joined	16:18
	→ Trendrrr joined	16:18
	← brent__ left	16:18
	→ IniGit joined	16:19
	→ svara joined	16:19
	← tcorneli left	16:20
	→ h12o joined	16:20
	← miklcct left	16:21
	→ miklcct joined	16:22
	← fission6 left	16:22
	← cstratak left	16:22
	← thebope left	16:22
	→ thebope joined	16:22
	→ dsdeiz joined	16:23
	← dsdeiz left	16:23
	→ dsdeiz joined	16:23
	← Maskettaman_yo left	16:24
	← aard_ left	16:24
	← xyphoid left	16:25
	← h12o left	16:25
	← livingstn left	16:25
	← r3m1 left	16:25
	→ theiostream joined	16:26
	← dsdeiz left	16:27
	→ cstratak joined	16:28
	← l33ch left	16:28
	→ diogenese joined	16:28
	← Trendrrr left	16:28
	→ Maskettaman joined	16:30
	→ Trendrrr joined	16:30
	← svm_invictvs left	16:30
	← crossroadsman left	16:30
	← khatri left	16:31
	← theiostream left	16:31
	← chase left	16:31
	→ brent__ joined	16:33
	→ narendraj9 joined	16:34
	← jceb left	16:39
	→ TechieMae joined	16:39
BadCodSmell	How can I rebase an entire tree?	16:39
	Similarly to as you would graft or replace	16:39
	← cdown left	16:39
	hanna` → hanna	16:40
	→ cdown joined	16:40
	← nast left	16:41
BadCodSmell	Essentially I want it to include all branches from the one being rebased.	16:41
	→ h12o joined	16:41
	← Nawab left	16:41
	→ xfbs joined	16:41
	← kurkale6ka left	16:41
	← brent__ left	16:42
	← jottr left	16:43
	→ livingstn joined	16:43
	← _ADN_ left	16:43
	← Trendrrr left	16:43
	← jay-m left	16:43
	← mikiones left	16:43
	→ tunekey joined	16:43
	→ Chuguniy joined	16:44
	→ Forlorn_ joined	16:44
	← narendraj9 left	16:44
	→ jay-m joined	16:44
	← kimundi left	16:44
	→ narendraj9 joined	16:45
	→ rahtgaz joined	16:45
	→ Trendrrr joined	16:45
	← jimmyrcom_ left	16:45
	← h12o left	16:46
	← Forlorn_ left	16:47
	→ ZexaronS joined	16:48
	← phos1 left	16:48
	→ valhala_22 joined	16:49
	← cstratak left	16:49
	← freimatz left	16:50
	→ HoierM joined	16:50
	← CBF16888 left	16:51
	→ h12o joined	16:52
	← karols146 left	16:53
	→ karols146 joined	16:54
	→ King_Hual joined	16:54
	← King_Hual left	16:54
	→ King_Hual joined	16:54
	→ pwnz0r joined	16:54
	→ svm_invictvs joined	16:55
ponyofdeath	hi, trying to create a new git repo to use over ssh on my server. i do git init --bare on my server then doing git clone ssh://user@server:blah but when i try to push after clone i get error: src refspec master does not match any. any ideas what I am doing wrong	16:55
	← cyberz left	16:55
	← thebope left	16:55
	→ thebope joined	16:56
	← h12o left	16:56
	← narendraj9 left	16:57
	→ fission6 joined	16:58
	← Trendrrr left	16:58
	← synthroid left	16:59
	→ Trendrrr joined	17:00
	← Chuguniy left	17:00
	→ cdg joined	17:01
	← aredpanda`w left	17:02
	→ h12o joined	17:02
	← cdg left	17:02
	→ cdg joined	17:02
	← cdg_ left	17:02
	→ cdg_ joined	17:03
	→ Gustavo6046 joined	17:03
	← jay-m left	17:04
	→ jesst joined	17:04
	← Maskettaman left	17:04
	→ math-alpha joined	17:05
	← buffal0 left	17:05
	← cdown left	17:06
	← Trendrrr left	17:06
	← marcogmonteiro left	17:06
	← cdg left	17:07
	← h12o left	17:07
	→ TbobbyZ joined	17:07
	← nilukush left	17:07
	→ jay-m joined	17:07
	→ Trendrrr joined	17:08
	← davimore left	17:08
	→ SteenJobs_ joined	17:09
	← SteenJobs left	17:09
	SteenJobs_ → SteenJobs	17:09
	← masuberu left	17:10
	→ lafleurdubien joined	17:10
	→ joki joined	17:11
	→ pwnz0r_ joined	17:11
	← Trendrrr left	17:14
	→ Trendrrr joined	17:15
	← pwnz0r left	17:15
	→ davimore joined	17:15
	→ Doginal joined	17:15
	→ kimundi joined	17:16
	← Gurkenglas left	17:16
	→ xyphoid joined	17:16
	→ m0viefreak joined	17:17
	→ Es0teric joined	17:17
	→ mentazoom joined	17:18
	← fission6 left	17:19
	→ cyberz joined	17:20
	← xyphoid left	17:21
	← Trendrrr left	17:21
	→ jottr joined	17:21
	→ h12o joined	17:22
	← SteenJobs left	17:22
	→ Bock joined	17:23
	→ Trendrrr joined	17:23
	→ SteenJobs joined	17:23
	→ rubyonrailed joined	17:25
	← h12o left	17:27
	→ Symfony3 joined	17:27
	→ fission6 joined	17:28
	→ venmx joined	17:28
	→ nixjdm joined	17:28
	← foul_owl left	17:28
	← PhPStorm4 left	17:28
	→ buffal0 joined	17:29
	← mikecmpbll left	17:30
	← notebox left	17:30
	→ Maskettaman joined	17:30
	← eshlox left	17:31
	← dreiss left	17:31
	→ foul_owl joined	17:32
	← Trendrrr left	17:33
	← plexigras left	17:33
	← floppydh left	17:34
	← cyberz left	17:34
	→ Trendrrr joined	17:34
	← venmx left	17:35
	← cdg_ left	17:36
	← perrier-jouet left	17:38
	→ cdg joined	17:39
	→ Pseudocrat joined	17:39
	← Pseudocrat left	17:39
	→ Pseudocrat joined	17:39
	→ perrier-jouet joined	17:40
	← livingstn left	17:40
	← Trendrrr left	17:40
	→ xyphoid joined	17:41
	← Maskettaman left	17:41
	← valhala_22 left	17:41
	← chll_ left	17:42
	→ Trendrrr joined	17:42
	→ h12o joined	17:42
	→ cyberz joined	17:43
	← perrier-jouet left	17:45
	→ gopar joined	17:45
	→ valhala_22 joined	17:45
	→ perrier-jouet joined	17:46
	← jay-m left	17:47
	→ phinxy joined	17:47
	← h12o left	17:47
	← peepsalot left	17:48
	← Trendrrr left	17:48
	→ star_prone joined	17:48
	← xyphoid left	17:48
	→ dreiss joined	17:49
	→ Trendrrr joined	17:50
	← multi_io left	17:50
	← Cabanossi left	17:51
	→ theiostream joined	17:51
	→ khatri joined	17:52
	→ Cabanossi joined	17:52
	→ multi_io joined	17:52
vlt	ponyofdeath: What command did you use to push?	17:52
	← valhala_22 left	17:53
	→ jay-m joined	17:53
	← njbair left	17:53
	→ njbair joined	17:54
	← Trendrrr left	17:54
	← thebope left	17:55
	← star_prone left	17:55
	→ thebope joined	17:55
	→ Trendrrr joined	17:57
	← cyberz left	17:57
	← gxt left	17:58
	← VladGh left	18:00
	← jay-m left	18:00
	← dreiss left	18:03
	→ h12o joined	18:03
	← Rodya_ left	18:04
	← shinnya left	18:04
	ChanServ set mode: +o	18:05
	← Trendrrr left	18:06
	Eugene changed the topic to: Welcome to #git, the place for git help and ornamental explosions \| Public logs at https://gitirc.eu/log \| First visit? Read: https://gitirc.eu \| Current stable version: 2.13.1 \| Getting "cannot send to channel"? /msg gitinfo .voice \| Introducing git-lit: a handheld firestarter!	18:06
	Eugene set mode: -o	18:06
Eugene	Suggestions welcomed for the Independence Day holiday	18:07
	← Guest74019 left	18:07
	← h12o left	18:07
	→ cyberz joined	18:08
	→ Trendrrr joined	18:09
	← King_Hual left	18:10
	→ star_prone joined	18:12
	→ valhala_22 joined	18:12
	→ King_Hual joined	18:12
	→ bed7 joined	18:12
	← Dougie187 left	18:13
	→ narendraj9 joined	18:13
	→ xyphoid joined	18:15
	← Es0teric left	18:16
	→ h12o joined	18:16
	← valhala_22 left	18:16
	gitinfo set mode: +v	18:16
milki_	git: freeing the world from centralized control?	18:16
	→ Arcaelyx joined	18:17
	→ livingstn joined	18:18
	← Trendrrr left	18:19
	← joki left	18:19
	→ ethali joined	18:20
	→ Trendrrr joined	18:20
	← h12o left	18:21
	← livingstn left	18:22
	→ mel00010 joined	18:23
	← xyphoid left	18:23
	→ livingstn joined	18:24
	← leeN left	18:25
	→ misosoup joined	18:25
	← cyberz left	18:26
	← ZexaronS left	18:27
	← Trendrrr left	18:27
	→ cyberz joined	18:27
	← perrier-jouet left	18:28
	→ Maskettaman joined	18:28
	→ Trendrrr joined	18:30
	← Bock left	18:30
	← nixjdm left	18:30
	→ Maskettaman_yo joined	18:31
	← cyberz left	18:32
	← Maskettaman left	18:33
	← IniGit left	18:36
	→ maxime_ joined	18:37
	→ powrsurg joined	18:37
	→ xyphoid joined	18:38
	→ h12o joined	18:38
	→ _ADN_ joined	18:38
	← TbobbyZ left	18:39
	→ cyberz joined	18:39
	→ moth joined	18:39
	← Trendrrr left	18:40
	← inovas left	18:40
	← buffal0 left	18:41
powrsurg	I am on Windows on a mapped network drive. I have made changes to three files, but git status and tortousgit only says one was changed. In trying to fix things I deleted the .git/index file and now I have a list of 24,088 files marked as deleted when I try to commit	18:41
	what should I do	18:41
	→ Trendrrr joined	18:42
	→ nixjdm joined	18:43
	← h12o left	18:43
powrsurg	also tried git reset	18:43
	← idlemind left	18:43
	← davimore left	18:43
	→ Cavallari joined	18:44
	→ energizer joined	18:45
	→ inovas joined	18:45
	← ethali left	18:46
	← cyberz left	18:46
	→ idlemind joined	18:47
	→ leeN joined	18:47
	← griffindy left	18:48
	← orbyt_ left	18:48
	→ mikecmpbll joined	18:50
	← Trendrrr left	18:51
	← Cabanossi left	18:51
	→ cyberz joined	18:51
	→ Trendrrr joined	18:52
	→ Cabanossi joined	18:53
	→ elsevero joined	18:55
	← powrsurg left	18:55
_ikke_	It's not recommended to use git on network shares..	18:55
	← ptoth left	18:56
	← Hello71 left	18:56
	→ perrier-jouet joined	18:57
	Maskettaman_yo → Maskettaman	18:58
	→ h12o joined	18:58
	← fission6 left	18:59
	→ dreiss joined	18:59
	→ sz0 joined	19:01
	← amrits left	19:01
	→ sq-one joined	19:01
	→ jnavila joined	19:02
	← h12o left	19:03
	← dreiss left	19:03
	← Trendrrr left	19:03
	← dermoth left	19:04
	→ Rodya_ joined	19:04
	→ Trendrrr joined	19:05
	→ davimore joined	19:05
	→ ________ joined	19:05
	← xyphoid left	19:05
	← energizer left	19:06
	→ energizer joined	19:06
	→ Hello71 joined	19:06
	← idlemind left	19:07
	→ cagedwisdom joined	19:08
	→ rili joined	19:08
	→ idlemind joined	19:08
	← Trendrrr left	19:09
	← rili left	19:10
	← Rodya_ left	19:10
	→ thebope_ joined	19:10
	→ peepsalot joined	19:10
	← thebope left	19:10
	→ Trendrrr joined	19:12
	→ pbandark1 joined	19:12
	→ nast joined	19:12
	← pbandark left	19:13
	pbandark1 → pbandark	19:13
	← thebope_ left	19:14
	→ thebope joined	19:14
	← math-alpha left	19:15
	← perrier-jouet left	19:15
	→ valhala_22 joined	19:15
	→ d10n-work joined	19:16
	← cdg left	19:17
	← rubyonrailed left	19:20
	← WayToDoor left	19:20
	← valhala_22 left	19:20
	← SteenJobs left	19:20
	← pbandark left	19:20
	→ rishi joined	19:20
	← m0viefreak left	19:20
	← imrg left	19:20
	← CheckDavid left	19:20
	→ voker57 joined	19:21
	← jottr left	19:22
	→ Whisket joined	19:22
	→ bbhoss joined	19:22
	→ jottr_ joined	19:22
	→ h12o joined	19:22
	→ rubyonra_ joined	19:22
	← King_Hual left	19:22
	→ dreiss joined	19:22
	→ SteenJobs_ joined	19:22
	→ valhala_223 joined	19:22
	→ tinanoo joined	19:22
	→ pbandark1 joined	19:22
	→ m0viefreak joined	19:22
	→ tilpner_ joined	19:22
	→ Razesdark_ joined	19:22
	→ wenzowski_ joined	19:22
	→ huhlig_ joined	19:22
	← rishi left	19:22
	→ rishi joined	19:22
	SteenJobs_ → SteenJobs	19:22
	tilpner_ → tilpner	19:22
	pbandark1 → pbandark	19:22
	← voker57 left	19:22
	→ voker57 joined	19:22
	← bbhoss left	19:22
	→ bbhoss joined	19:22
	← Whisket left	19:22
	→ Whisket joined	19:22
	→ KnownSyntax joined	19:22
	→ MLM____ joined	19:22
	wenzowski_ → wenzowski	19:22
	huhlig_ → huhlig	19:22
	→ dilfridge joined	19:22
	→ Harl3k1ng joined	19:22
	← Trendrrr left	19:22
	→ volestorm joined	19:22
	→ rideh joined	19:22
	→ CheckDavid joined	19:22
	→ kevr joined	19:23
	→ tjbp joined	19:23
	← h12o left	19:23
	→ mulvane joined	19:23
	← mulvane left	19:23
	→ mulvane joined	19:23
	→ Trendrrr joined	19:25
	← sarbs left	19:25
	← ujjain left	19:25
	→ xyphoid joined	19:25
	← BlackPanx left	19:25
	← andai left	19:25
	← joshszep left	19:25
	← indd left	19:25
	→ joshszep joined	19:25
	← DelphicOkami left	19:25
	← joshszep left	19:26
	→ jerrcs joined	19:27
	→ sarbs joined	19:27
	→ andai joined	19:27
	→ BlackPanx joined	19:27
	← jesst left	19:27
	→ DelphicOkami joined	19:27
	→ freddieptf joined	19:28
	← Trendrrr left	19:29
	→ ujjain joined	19:29
	← ujjain left	19:29
	→ ujjain joined	19:29
	→ catern joined	19:29
	→ lukky513 joined	19:29
	→ mrkake joined	19:29
	← xyphoid left	19:29
	← nixjdm left	19:30
	← mikecmpbll left	19:30
	→ Es0teric joined	19:30
	← valhala_223 left	19:30
	→ dsdeiz joined	19:30
	← dsdeiz left	19:30
	→ dsdeiz joined	19:30
	→ mikecmpb_ joined	19:30
	→ Trendrrr joined	19:31
	→ roelmonnens joined	19:35
	← dsdeiz left	19:35
	→ Maple__ joined	19:35
	← Maple__ left	19:35
	→ Maple__ joined	19:35
	← Maple__ left	19:35
	→ Maple__ joined	19:35
	→ TheFuzzball joined	19:38
	→ ptoth joined	19:38
	← bed7 left	19:38
	← SkyPatrol left	19:38
	→ h12o joined	19:39
	← roelmonnens left	19:40
	→ nixjdm joined	19:41
	← Trendrrr left	19:43
	← h12o left	19:44
	→ konsolebox joined	19:44
	→ Trendrrr joined	19:45
	→ SkyPatrol joined	19:48
	← Cabanossi left	19:50
	← Trendrrr left	19:51
	→ fission6 joined	19:51
	← cyphase left	19:51
	→ cyphase joined	19:51
	→ Cabanossi joined	19:52
	→ Trendrrr joined	19:52
	→ WayToDoor joined	19:54
	→ raynold joined	19:54
	→ suy joined	19:56
	← pwnz0r_ left	19:56
	→ yaewa joined	19:56
	→ tgragnato joined	19:57
	← moei left	19:58
	← TheFuzzball left	19:58
	← pzp left	19:58
	← freddieptf left	19:59
	→ shinnya joined	19:59
	→ h12o joined	20:00
	← fission6 left	20:00
	→ xyphoid joined	20:00
	← Trendrrr left	20:01
	→ ZexaronS joined	20:01
	→ TheFuzzball joined	20:01
	→ brent___ joined	20:02
	→ s0bait joined	20:03
s0bait	Hello, how do I undo a git merge I did several commits ago?	20:03
	→ Trendrrr joined	20:03
osse	s0bait: git revert -m 1 {merge commit}	20:03
	← macrover left	20:04
s0bait	Apparently when I merged in destination branch into feature branch, upon making the PR (even though its set to destination branch) it shows all of the commits.	20:04
	as if they are new ones	20:04
_ikke_	(that only undoes the changes from the merge, the merge is still there)	20:04
	← kpease left	20:04
s0bait	_ikke_: What else do i need to do then?	20:04
	← h12o left	20:05
	← xyphoid left	20:05
_ikke_	rebase -i, drop the merge commit	20:05
s0bait	when I do that, even though I only do HEAD~6 (#5 is the merge) it shows like 40 commits..	20:06
	→ orbyt_ joined	20:06
osse	it will show all the commits from the other branch	20:06
	is HEAD~5 the merge?	20:06
s0bait	yeah	20:06
	→ Rodya_ joined	20:06
osse	git rebase --onto=HEAD~6 HEAD~5	20:06
s0bait	it shows two shas under merge	20:07
	← orbyt_ left	20:07
s0bait	commit 3b22fca5c7b79dd8d4de338ee9e04f10d328e211	20:07
	Merge: 3d5a113d66 ec0f0d4a48	20:07
	→ thebardian joined	20:07
osse	git rebase --onto=3b22fca5c7b7~ 3b22fca5c7b7	20:07
	→ xyphoid joined	20:08
	← brent___ left	20:08
	← rubyonra_ left	20:08
	← TheFuzzball left	20:08
	← livingstn left	20:08
	→ rubyonrailed joined	20:09
	← mel00010 left	20:09
s0bait	Still shows 40 or so commits	20:09
	← Trendrrr left	20:09
osse	where	20:09
s0bait	on my pr	20:10
osse	did you push	20:10
	→ sammyo joined	20:10
s0bait	yea forced	20:10
	it shows commits not part of this one	20:10
	do i have to remove all merges that I did then?	20:10
	→ h12o joined	20:10
s0bait	how am I supposed to bring all the changes from parent otherwise	20:10
osse	ddi you do more than one?	20:10
	→ TheFuzzball joined	20:10
	→ Trendrrr joined	20:11
	← Rodya_ left	20:11
	→ orbyt_ joined	20:11
	← thebardian left	20:12
	→ Peuc joined	20:12
s0bait	yeah many times	20:14
	to bring in update to parent class	20:14
	← sgen left	20:14
	→ KeyJoo joined	20:14
	← xyphoid left	20:14
	← rubyonrailed left	20:14
	→ fission6 joined	20:14
s0bait	to bring in updates parent class which iw as implementing in this feature	20:14
	→ Murii joined	20:15
	← h12o left	20:15
	← xfbs left	20:15
	← Murii left	20:16
	← Es0teric left	20:17
	→ brent___ joined	20:19
	→ h12o joined	20:20
	→ crossroadsman joined	20:20
	→ valhala_22 joined	20:21
	← jottr_ left	20:22
	→ mel00010 joined	20:23
	→ jottr_ joined	20:23
	← h12o left	20:25
	← Trendrrr left	20:25
	→ Rodya_ joined	20:25
	→ Trendrrr joined	20:27
	← madewokherd left	20:28
	← nixjdm left	20:29
	← Hello71 left	20:31
	← Trendrrr left	20:32
	→ IniGit joined	20:33
	→ arifuzzaman joined	20:33
	→ Hello71 joined	20:34
	→ Trendrrr joined	20:34
	← arifuzzaman left	20:34
	→ arifuzzaman joined	20:34
	→ roelmonnens joined	20:35
	→ hero_ joined	20:35
	← df0 left	20:36
	→ jaziz joined	20:37
	→ pwnz0r joined	20:38
	← _hero_ left	20:38
	← Doginal left	20:39
	← roelmonnens left	20:40
	→ Xaon joined	20:40
	→ h12o joined	20:40
	← Xaon left	20:41
	→ nixjdm joined	20:43
	→ Ymqa joined	20:43
	← Rodya_ left	20:44
	→ ZyX-I joined	20:45
	← h12o left	20:45
	← gopar left	20:46
	← HoierM left	20:46
	→ gopar joined	20:46
	← brent___ left	20:47
	→ Rodya_ joined	20:47
	← pwnz0r left	20:47
	→ wilbert joined	20:48
	← narendraj9 left	20:48
	← njbair left	20:49
	← Cabanossi left	20:49
	← TechieMae left	20:50
	← Peuc left	20:50
	→ njbair joined	20:50
	→ xyphoid joined	20:51
	← nd left	20:51
	→ Cabanossi joined	20:52
	← Ymqa left	20:53
	← ExoUNX left	20:54
	→ cliluw joined	20:54
	→ brent__ joined	20:54
	→ TbobbyZ joined	20:54
	← s0bait left	20:54
	← cliluw left	20:54
	→ cliluw joined	20:55
	← SkyPatrol left	20:56
	← Cavallari left	20:56
	← karols146 left	20:57
	← xyphoid left	20:57
	← m4sk1n left	20:57
	← theiostream left	20:57
	← Trendrrr left	20:57
	← gopar left	20:58
	← wilbert left	20:58
	← nowhere_man left	20:59
	→ gopar joined	20:59
	→ Trendrrr joined	20:59
	→ Peuc joined	21:00
	← dman777_alter left	21:00
	→ SkyPatrol joined	21:00
	← LeBlaaanc left	21:01
	→ h12o joined	21:01
	→ shgysk8zer0 joined	21:01
	← mel00010 left	21:02
	→ thebope_ joined	21:02
	← thebope left	21:02
	← phinxy left	21:02
	← schleppel left	21:04
	← thebope_ left	21:04
	→ thebope joined	21:04
	← gopar left	21:06
	← h12o left	21:06
	→ buffal0 joined	21:06
	← star_prone left	21:06
	→ gopar joined	21:07
	← Fleche left	21:07
	← thebope left	21:08
	← Maskettaman left	21:08
	→ s0bait joined	21:08
	← s0bait left	21:08
	→ s0bait joined	21:08
	→ thebope joined	21:08
	→ livingstn joined	21:09
	← thebope left	21:10
	→ rubyonrailed joined	21:11
	→ thebope joined	21:11
	← thebope left	21:12
	← buffal0 left	21:12
	← s0bait left	21:12
	← Rodya_ left	21:13
	→ anuxivm joined	21:14
	→ mel00010 joined	21:15
	← NightMonkey left	21:15
	← gopar left	21:16
	← TheFuzzball left	21:16
	→ gopar joined	21:16
	← SkyPatrol left	21:16
	→ SteenJobs_ joined	21:17
	→ dviola joined	21:17
	← jimklo left	21:18
	← SteenJobs left	21:18
	SteenJobs_ → SteenJobs	21:18
	→ jimklo joined	21:18
	→ Rodya_ joined	21:18
	→ Maskettaman joined	21:18
	← livingstn left	21:19
	→ MineCoins joined	21:19
	→ perrier-jouet joined	21:19
	→ TheFuzzball joined	21:19
	→ xyphoid joined	21:21
	→ phinxy joined	21:21
	→ h12o joined	21:21
	← rubyonrailed left	21:21
	← Cabanossi left	21:21
	→ rubyonrailed joined	21:22
	→ Cabanossi joined	21:22
	→ nowhere_man joined	21:22
	→ debb75 joined	21:23
	← jimklo left	21:23
	← SteenJobs left	21:23
	→ buffal0 joined	21:23
	← gugah left	21:23
	← brent__ left	21:25
	→ SkyPatrol joined	21:25
	→ SteenJobs joined	21:26
	→ NightMonkey joined	21:26
	← rubyonrailed left	21:26
	← thiago left	21:26
	← h12o left	21:27
	→ jimklo joined	21:27
	→ john_hexis_ joined	21:27
	← xyphoid left	21:27
	← john_hexis left	21:29
	→ King_Hual joined	21:29
	← King_Hual left	21:29
	→ King_Hual joined	21:29
	← SteenJobs left	21:29
	← TheFuzzball left	21:29
	← ssarah left	21:30
	← nixjdm left	21:30
	← bluesm left	21:31
	← Trendrrr left	21:32
	→ Trendrrr joined	21:34
	← _ADN_ left	21:34
	← yaewa left	21:35
	→ moei joined	21:36
	→ cdown joined	21:36
	← Phylock left	21:36
	→ TheFuzzball joined	21:36
	← manuelschneid3r left	21:37
	→ chase joined	21:37
	→ livingstn joined	21:37
	← chase left	21:37
	→ _ADN_ joined	21:37
	← nast left	21:37
	→ chase joined	21:38
	← SkyPatrol left	21:39
	← zivester left	21:39
	→ bed7 joined	21:41
	→ h12o joined	21:42
	→ roxlu_ joined	21:42
	→ nixjdm joined	21:42
	← roxlu_ left	21:43
	→ SkyPatrol joined	21:43
	→ roxlu_ joined	21:43
	← gopar left	21:44
	← KeyJoo left	21:44
	← moei left	21:44
	→ gopar joined	21:45
	← livingstn left	21:45
	← ekinmur left	21:46
	← h12o left	21:47
	← buffal0 left	21:47
	→ buffal0 joined	21:48
	← Maskettaman left	21:51
	← dege left	21:51
	← orbyt_ left	21:51
	← Trendrrr left	21:52
	→ HoierM joined	21:53
	→ jth41 joined	21:53
	← jnavila left	21:54
	→ Trendrrr joined	21:54
	← buffal0 left	21:55
	→ dmj` joined	21:56
	← dersand left	21:56
	→ orbyt_ joined	21:57
	→ HoierM_ joined	21:57
	← nixjdm left	21:58
	← arifuzzaman left	21:58
	→ Fleche joined	21:58
	← Pseudocrat left	21:59
	← HoierM left	21:59
	← MineCoins left	22:00
	← SkyPatrol left	22:01
	→ h12o joined	22:02
	→ Maskettaman joined	22:02
	← Maskettaman left	22:02
	← IniGit left	22:03
	← Trendrrr left	22:03
	→ Maskettaman joined	22:03
	← debb75 left	22:03
	→ IniGit joined	22:03
	→ xyphoid joined	22:03
	→ DaGoaty joined	22:04
	→ SkyPatrol joined	22:04
	→ debb75 joined	22:04
	→ Trendrrr joined	22:04
	→ cahoots joined	22:06
	← crossroadsman left	22:06
	→ venmx joined	22:07
	← h12o left	22:07
	→ githubmgw1 joined	22:07
	← githubmgw left	22:07
	→ valentinperez joined	22:07
	← chase left	22:09
	→ rubyonrailed joined	22:11
	→ Tobbi joined	22:11
	← SkyPatrol left	22:11
	← ResidentBiscuit left	22:12
	← valhala_22 left	22:14
	→ askb joined	22:14
	← debb75 left	22:14
	← TbobbyZ left	22:14
	→ TbobbyZ joined	22:15
	← maroloccio left	22:15
	john_hexis_ → john_hexis	22:15
	→ debb75 joined	22:15
	← xyphoid left	22:16
	← khatri left	22:16
	→ JohnBlaze joined	22:17
	→ valhala_22 joined	22:18
	← TbobbyZ left	22:19
	→ SkyPatrol joined	22:19
	→ NvpkD1y7Ez joined	22:19
	→ m4sk1n joined	22:20
	→ TechieMae joined	22:21
	← Trendrrr left	22:21
	← Gustavo6046 left	22:22
	→ maroloccio joined	22:23
	→ Trendrrr joined	22:23
	→ h12o joined	22:23
	→ rubyonra_ joined	22:23
	→ roelmonnens joined	22:23
	→ xyphoid joined	22:24
	← maxime_ left	22:24
	→ jnavila joined	22:25
	← fission6 left	22:25
	→ Darion joined	22:26
	← rubyonrailed left	22:26
	← roelmonnens left	22:28
	← h12o left	22:28
	→ cahoots_ joined	22:29
	← Trendrrr left	22:31
	← cahoots left	22:32
	→ dsdeiz joined	22:32
	→ Trendrrr joined	22:32
	← xyphoid left	22:33
	← opalepatrick left	22:35
	← jth41 left	22:35
	← john_hexis left	22:35
	→ john_hexis joined	22:35
	← jottr_ left	22:37
	← raulp left	22:37
	← valentinperez left	22:37
	← dsdeiz left	22:37
	→ star_prone joined	22:38
	→ raulp joined	22:39
	→ Gustavo6046 joined	22:39
	← TheFuzzball left	22:41
	→ JanC_ joined	22:41
	→ xyphoid joined	22:41
	← morfin left	22:42
	← star_prone left	22:42
	← cdown left	22:43
	← JanC left	22:43
	→ chase joined	22:43
	→ h12o joined	22:43
	JanC_ → JanC	22:43
	← Darion left	22:44
	← Trendrrr left	22:45
	← jnavila left	22:46
	→ VladGh joined	22:47
	→ Trendrrr joined	22:47
	← mentazoom left	22:48
	← King_Hual left	22:48
	← h12o left	22:48
	← xyphoid left	22:50
	→ ekinmur joined	22:50
	← rubyonra_ left	22:51
	← Cabanossi left	22:51
	→ malmalmal joined	22:51
	← malmalmal left	22:51
	← sq-one left	22:51
	→ rubyonrailed joined	22:52
	← rubyonrailed left	22:52
	← dviola left	22:52
	→ Cabanossi joined	22:52
	→ malmalmal joined	22:53
	← malmalmal left	22:53
	→ dviola joined	22:53
	← fishcooker left	22:55
	→ malmalmal joined	22:55
	→ skered joined	22:56
	← roxlu_ left	22:56
	← venmx left	22:58
malmalmal	Hello, I have a local repo with a remote repo, and a collaborator also has his local pointing to that remote. I want to stop tracking a folder named 'content/', so I assume I have to add 'content/' to .gitignore, then use 'git rm -r --cached content/' then add, commit and push.	22:58
	My question is, on my collaborator's next pull, will the content folder disappear from its local repo ?	22:58
	the remote also gets deployed to live, will the content folder dissapear from remote or live?	22:59
	I just want to stop tracking it, and leave it as it is in each location	22:59
	thanks	22:59
	← Rodya_ left	23:01
	← Darcidride left	23:02
	← Trendrrr left	23:02
	→ madewokherd joined	23:02
	→ Puffball joined	23:03
	→ h12o joined	23:03
	← finalbeta left	23:04
	→ Trendrrr joined	23:04
	← gopar left	23:04
	→ gopar joined	23:05
	→ buffal0 joined	23:05
	← cagedwisdom left	23:05
malmalmal	.random	23:06
gitinfo	bbbbbbaaaaaaaaaddddd [9]	23:06
malmalmal	(-_-)	23:06
	← ekinmur left	23:06
	→ CussBot joined	23:06
	← buffal0 left	23:07
	← h12o left	23:08
	→ olalonde joined	23:09
	→ thiago joined	23:09
	← misosoup left	23:10
	→ jottr_ joined	23:11
	← tunekey left	23:12
	→ moei joined	23:12
	→ Rodya_ joined	23:13
	← Trendrrr left	23:13
	← chase left	23:14
	→ xyphoid joined	23:15
	→ mostlybadfly joined	23:15
	← jottr_ left	23:16
	→ Trendrrr joined	23:16
	← phinxy left	23:17
	← Rodya_ left	23:18
	← perrier-jouet left	23:18
	→ YuGiOhJCJ joined	23:18
	→ cagedwisdom joined	23:19
	→ perrier-jouet joined	23:20
	← Cabanossi left	23:20
	← xyphoid left	23:21
	→ Rodya_ joined	23:21
	→ Cabanossi joined	23:22
	← [cust] left	23:22
	← Trendrrr left	23:22
	← jberkus left	23:22
	→ uranellus joined	23:23
	← uranellus left	23:23
	→ uranellus joined	23:23
	← str left	23:24
	→ h12o joined	23:24
	→ Trendrrr joined	23:24
	→ chase joined	23:26
	← Puffball left	23:27
	→ Bock joined	23:27
	← navidr left	23:28
	← debb75 left	23:28
	← gopar left	23:28
	← h12o left	23:29
	→ jimi_ joined	23:29
	→ Puffball joined	23:29
	← ravndal left	23:30
	← rahtgaz left	23:32
	← Trendrrr left	23:33
	→ Trendrrr joined	23:35
	→ durham joined	23:35
	← cahoots_ left	23:38
	→ xyphoid joined	23:39
	← durham_ left	23:39
	← durham left	23:40
	← Trendrrr left	23:40
	→ Trendrrr joined	23:42
Seveas	malmalmal: the folder will disappear when yout collaborator pulls	23:42
	← jimi_ left	23:43
	← Gustavo6046 left	23:43
Seveas	but he can get it back easily right after pulling: get checkout HEAD@{-1} -- content/ && git rm --cached content/	23:43
	← xyphoid left	23:44
	← malmalmal left	23:44
	→ h12o joined	23:44
	← d^sh left	23:44
	← njbair left	23:45
	→ d^sh joined	23:46
	← SkyPatrol left	23:46
	← raynold left	23:46
	← uranellus left	23:46
	→ njbair joined	23:47
	→ Gustavo6046 joined	23:47
	← h12o left	23:50
	→ s2013 joined	23:51
	← thiago left	23:51
	← Cabanossi left	23:51
	→ Cabanossi joined	23:52
	→ ravndal joined	23:54
	→ venmx joined	23:55
	→ nivag joined	23:55
	→ TbobbyZ joined	23:57
	← steeze left	23:57
	→ debb75 joined	23:59
	← orbyt_ left	23:59

Logs Search ←Prev date Next date→

Channels Documentation