IRCloggy #git 2017-06-16

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-16
	← hhee left	00:00
	→ Danzeel joined	00:00
	← venmx left	00:00
	→ karols146 joined	00:03
	← orbyt_ left	00:04
	→ jaziz joined	00:04
	→ onehrxn joined	00:04
	← MarioBranco left	00:06
	→ MarioBranco joined	00:06
	← chu left	00:06
	← Trendrrr left	00:08
	← ahf left	00:09
	← courrier left	00:09
	→ chu joined	00:09
	← spark` left	00:09
	← karols146 left	00:09
	→ Trendrrr joined	00:10
	→ MattMaker joined	00:10
	← brent__ left	00:11
	→ hotpanca_ joined	00:12
	→ brent__ joined	00:12
	← dreiss left	00:12
	← Hunter1 left	00:12
	→ Hunter1 joined	00:12
	→ roelmonnens joined	00:13
	← cdg_ left	00:13
	← onehrxn left	00:15
	← MattMaker left	00:15
	→ onehrxn joined	00:16
	← onehrxn left	00:16
	→ onehrxn joined	00:16
	← brent__ left	00:16
	← hotpanca_ left	00:16
	← thiago left	00:17
	← roelmonnens left	00:18
	← buffal0 left	00:19
	← Trendrrr left	00:20
	← shinnya left	00:21
	← Gsham left	00:21
	→ Trendrrr joined	00:22
	← inovas left	00:23
	← beerdrop left	00:23
	→ hotpancakes joined	00:24
	← hotpancakes left	00:25
	→ hotpancakes joined	00:25
	→ hhee joined	00:26
	→ buffal0 joined	00:27
	← mentazoom left	00:27
	← CheckDavid left	00:28
	→ duderonomy joined	00:28
	→ inovas joined	00:29
	→ ahf joined	00:30
	← fstd left	00:32
	→ fstd_ joined	00:32
	→ c0ded joined	00:32
	fstd_ → fstd	00:32
	← Trendrrr left	00:34
	← MarioBranco left	00:34
	← nowhereman_ left	00:35
	← bilb_ono left	00:35
	← Derperperd left	00:35
	→ Trendrrr joined	00:35
	→ beerdrop joined	00:36
	← c0ded left	00:37
	← MacWinner left	00:40
	← m4sk1n left	00:41
	→ MattMaker joined	00:41
	→ NeXTSUN joined	00:41
	← jaziz left	00:42
	→ Lunatrius` joined	00:42
	← Trendrrr left	00:43
	← polyrob left	00:44
	→ Trendrrr joined	00:45
	→ Darren_ joined	00:45
	← Lunatrius left	00:45
	Lunatrius` → Lunatrius	00:45
	→ orbyt_ joined	00:47
	→ spark` joined	00:49
	← Cabanossi left	00:49
	← ploop left	00:50
	→ Cabanossi joined	00:51
	→ bilb_ono joined	00:51
	→ Derperperd joined	00:51
	→ polyrob joined	00:51
	← Trendrrr left	00:52
	→ Trendrrr joined	00:54
	← ecuanaso left	00:55
	→ Gurkenglas joined	00:55
	← YuGiOhJCJ left	00:55
	← re1 left	00:57
	→ mischat joined	00:57
	← svm_invictvs left	00:57
	← Darren_ left	00:57
	← Hunter1 left	00:59
	→ Hunter1 joined	01:00
	← mischat left	01:02
	← hotpancakes left	01:03
	→ brent__ joined	01:03
	← Trendrrr left	01:04
	→ Trendrrr joined	01:06
	→ zing joined	01:07
	← brent__ left	01:08
	→ Lyqyd joined	01:08
	← sunri5e left	01:10
	→ c0ded joined	01:10
	← Trendrrr left	01:12
	→ sunri5e joined	01:13
	→ th3_d4rkl0rd joined	01:13
	→ Trendrrr joined	01:14
	← c0ded left	01:15
	← the_d4rkl0rd left	01:16
	→ hotpanca_ joined	01:17
	← hotpanca_ left	01:17
	→ hotpanca_ joined	01:17
	→ ZexaronS joined	01:18
	← zing left	01:18
	→ TbobbyZ joined	01:20
	← ozcanesen left	01:22
	← eshlox left	01:23
	← chachasmooth left	01:25
	→ finalbeta joined	01:26
	← k_sze[work] left	01:26
	→ Kaisyu joined	01:27
	← Trendrrr left	01:27
	← TbobbyZ left	01:27
	→ riceandbeans joined	01:27
	→ chachasmooth joined	01:28
	← kaldoran left	01:28
	← buffal0 left	01:28
	→ Trendrrr joined	01:28
	← sim590 left	01:29
	→ kaldoran joined	01:31
	← lafleurdubien left	01:31
	→ sim590 joined	01:31
	← donmichelangelo left	01:35
	→ buffal0 joined	01:35
	← joshszep left	01:35
	→ ir7466 joined	01:36
ir7466	If I do a git clone as a certain user on unix	01:36
	How can I do a git pull as a different user?	01:36
	I get the "git-upload-pack fatal: HTTP request failed " error currently	01:37
	→ roelmonnens joined	01:37
	→ h12o joined	01:38
	→ ecuanaso joined	01:38
	← hotpanca_ left	01:39
	→ Alagar joined	01:39
	→ cqi joined	01:40
	← Sasazuka left	01:41
	← roelmonnens left	01:41
	← om_henners left	01:42
	← h12o left	01:43
	→ buffffal00 joined	01:43
	→ om_henners joined	01:44
Hello71	!xy	01:45
gitinfo	Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...	01:45
Hello71	also, "unix" rofl	01:45
	→ cis_admin joined	01:45
	← cis_admin left	01:45
	→ hotpanca_ joined	01:45
	← buffal0 left	01:46
	← str left	01:46
	→ johnnyfive joined	01:48
	← Jellyg00se left	01:48
	← hotpanca_ left	01:50
	← Trendrrr left	01:51
	→ Trendrrr joined	01:52
	→ kajmany joined	01:54
	← th3_d4rkl0rd left	01:54
	→ th3_d4rkl0rd joined	01:54
	← th3_d4rkl0rd left	01:55
	→ c0ded joined	01:55
	→ th3_d4rkl0rd joined	01:55
	→ mischat joined	01:58
	→ Gustavo6046_ joined	01:59
	← c0ded left	02:00
	→ dreiss joined	02:00
	← d^sh left	02:00
	← ajpiano_ left	02:01
	→ hotpancakes joined	02:01
	→ d^sh joined	02:01
	→ hanna joined	02:01
	← Gustavo6046 left	02:02
	← dreiss left	02:02
	← mischat left	02:03
hanna	Is it possible to change the `git describe` format? I want to remove the stupid “-g” prefix it adds to the commit ID so I can actually copy paste it	02:03
	Gustavo6046_ → Gustavo6046	02:04
	← Cabanossi left	02:05
	→ cdg joined	02:05
	← hotpancakes left	02:05
	→ hotpanc__ joined	02:05
	← th3_d4rkl0rd left	02:06
	→ Cabanossi joined	02:06
	← chachasmooth left	02:06
	→ chachasmooth joined	02:07
	← onehrxn left	02:07
	← NeXTSUN left	02:07
	← cqi left	02:08
	→ NeXTSUN joined	02:09
	← NeXTSUN left	02:09
	→ watabou joined	02:09
	→ thiago joined	02:10
	→ Gsham joined	02:12
	← Gsham left	02:12
	← Trendrrr left	02:13
	→ not-an-aardvark joined	02:13
	→ Trendrrr joined	02:14
	→ Gsham joined	02:15
	← Gsham left	02:16
	← bilb_ono left	02:16
	← gopar left	02:18
	← buffffal00 left	02:19
	→ Darren_ joined	02:21
	→ dreiss joined	02:22
	← Trendrrr left	02:24
	→ jameser joined	02:24
	→ Trendrrr joined	02:26
	→ Goplat joined	02:26
	← HoierM left	02:27
	← Darren_ left	02:27
	→ Noldorin joined	02:28
	→ c0ded joined	02:30
	← bauruine left	02:30
	→ texinwien_ joined	02:31
	← hotpanc__ left	02:31
	← dreiss left	02:32
	← orbyt_ left	02:32
	→ lagothri1 joined	02:34
	← KeyJoo left	02:34
	← texinwien left	02:34
	← Cabanossi left	02:34
	→ Darren_ joined	02:34
	← c0ded left	02:35
	← Trendrrr left	02:35
	→ Cabanossi joined	02:36
	→ Trendrrr joined	02:36
	← lagothrix left	02:37
	← Gustavo6046 left	02:38
	→ bauruine joined	02:38
	→ Vortex34 joined	02:38
	→ hotpanca_ joined	02:40
	← Vortex35 left	02:41
	← Gurkenglas left	02:42
	← hotpanca_ left	02:42
	→ hotpanca_ joined	02:43
	← hotpanca_ left	02:43
	← ecuanaso left	02:43
	→ hotpancakes joined	02:43
	→ cqi joined	02:44
	→ orbyt_ joined	02:44
	→ ecuanaso joined	02:44
	→ dag joined	02:45
dag	what is the command to create a branch	02:45
	← Trendrrr left	02:46
	→ Trendrrr joined	02:47
	→ c0ded joined	02:50
	← peterbecich left	02:50
	→ knod joined	02:51
knod	How do I remove all history and references to a file I just added accidentally?	02:52
	← hotpancakes left	02:53
	← c0ded left	02:54
	← ecuanaso left	02:54
	→ hotpancakes joined	02:54
	→ roelmonnens joined	02:55
	→ Sc0rpius joined	02:56
	→ perrier-jouet joined	02:56
	→ mischat joined	02:59
	← roelmonnens left	02:59
preaction	dag: git branch; or git checkout -b to create a new branch and check it out at once	03:02
	knod: rebase -i will work, but also filter-branch	03:02
knod	preaction: That will erase its existence in all branches and history?	03:03
preaction	not in all branches, no. you'll have to go to each branch and do it over again	03:04
	← mischat left	03:04
	→ Sense8 joined	03:04
	← watabou left	03:04
knod	preaction: Why would I create a new branch then?	03:05
preaction	what?	03:05
	→ peterbecich joined	03:05
knod	preaction: Sorry, I thought both the messages were for me	03:05
	preaction: I'll look up those commands, thanks	03:05
	← hotpancakes left	03:06
	← TheFuzzball left	03:09
	← knod left	03:11
	→ LordRyan joined	03:13
	→ hotpancakes joined	03:16
	← MattMaker left	03:16
	→ watabou joined	03:19
LordRyan	Is there any reason that this command would give a bunch of errors?: git filter-branch --force --index-filter "git rm --cached --ignore-unmatch $remove_files"	03:19
	← bauruine left	03:20
	→ cdown joined	03:21
	← cuzzo left	03:22
	← Darren_ left	03:23
	→ bauruine joined	03:23
	→ TbobbyZ joined	03:25
LordRyan	I'm running it again to get the exact errors	03:25
	← dag left	03:26
	← cdown left	03:27
LordRyan	http://sprunge.us/hUbG is what it prints out	03:27
	→ cdown joined	03:27
	→ b3kNik joined	03:29
	→ b3kN joined	03:29
	← b3kN left	03:29
	→ b3kN joined	03:29
	← TbobbyZ left	03:29
	← b3kNik left	03:31
	→ heber joined	03:32
	→ donmichelangelo joined	03:32
	← Trendrrr left	03:32
	← cdown left	03:34
	→ Trendrrr joined	03:34
	→ cdown joined	03:34
	← Cabanossi left	03:34
	→ Cabanossi joined	03:36
	→ SkyPatrol_ joined	03:38
	← Derperperd left	03:39
	→ Derperperd joined	03:39
	← UTAN_dev left	03:39
	← SkyPatrol left	03:40
	← hotpancakes left	03:40
	→ hotpancakes joined	03:40
	← Trendrrr left	03:42
	→ meadmoon joined	03:42
	← m0viefreak left	03:43
	→ dreiss joined	03:43
	→ Trendrrr joined	03:44
	→ jesst joined	03:46
	← Cabanossi left	03:47
	→ Cabanossi joined	03:49
	← peterbecich left	03:50
	→ xall joined	03:50
	← meadmoon left	03:51
	← wxg left	03:54
	← Trendrrr left	03:57
	→ Trendrrr joined	03:59
	→ mischat joined	04:00
	→ ShapeShifter499 joined	04:03
	→ bilb_ono joined	04:03
	→ darkmist_ joined	04:04
	← mischat left	04:04
	→ svm_invictvs joined	04:05
	← svm_invictvs left	04:06
	← albel727 left	04:06
	← bgamari left	04:09
	← Trendrrr left	04:10
	→ somdobomk joined	04:11
	→ bgamari joined	04:11
	→ Trendrrr joined	04:13
	← somdobomk left	04:13
	→ c0ded joined	04:15
	→ wxg joined	04:18
	← c0ded left	04:20
	→ onehrxn joined	04:21
	← kyan left	04:22
	← darkmist_ left	04:24
	← Foxboron left	04:25
	← Trendrrr left	04:25
	← xall left	04:26
	→ Trendrrr joined	04:27
	→ Foxboron joined	04:27
	← Trendrrr left	04:33
	← bilb_ono left	04:35
	→ Trendrrr joined	04:35
	← hotpancakes left	04:35
	→ hotpancakes joined	04:36
	← jesst left	04:38
	→ c0ded joined	04:38
	nocaberi → Sauvin	04:41
	← Trendrrr left	04:42
	→ hariel joined	04:43
	← armyriad left	04:43
	← c0ded left	04:43
	→ Trendrrr joined	04:43
	← hhee left	04:44
	→ armyriad joined	04:44
	→ hhee joined	04:44
	← alhariel left	04:45
	→ henrique joined	04:45
	henrique → Guest47369	04:46
	→ chandu20 joined	04:47
	→ d5sx43 joined	04:48
	→ xall joined	04:48
	→ tarkus joined	04:49
	← hariel left	04:49
	← wxg left	04:51
_ikke_	LordRyan: Are these names related to what you are trying to remove?	04:53
	← hotpancakes left	04:53
	→ bilb_ono joined	04:53
LordRyan	_ikke_: yeah, i'm pretty sure. unfortunately i'm having much more difficulties than just git right now	04:53
	→ hotpancakes joined	04:53
LordRyan	network is super unstable. :(	04:53
	i think i finally have mosh set up so that might help :P	04:53
	and yes, those files should exist.	04:53
	← orbyt_ left	04:54
	← Trendrrr left	04:54
LordRyan	i'm gonna run another test now, without using a tmpfs	04:54
	→ MattMaker joined	04:55
	→ rohitpaulk joined	04:56
	→ Trendrrr joined	04:56
	→ a_thakur joined	04:57
	← hotpancakes left	04:57
	→ Kulrak joined	04:59
	← Kulrak left	04:59
	→ Kulrak joined	04:59
	→ freimatz3 joined	04:59
	→ mischat joined	05:01
	← Kulrak\|2 left	05:01
	← bitmod left	05:01
	→ bitmod joined	05:02
	→ dec0n joined	05:02
	← Cabanossi left	05:02
	← Trendrrr left	05:03
	← bauruine left	05:04
	→ Trendrrr joined	05:04
	→ Cabanossi joined	05:05
LordRyan	_ikke_: yeah, i'm definitely sure some of the files exist	05:05
	← mischat left	05:05
	→ UTAN_dev joined	05:06
	→ hotpancakes joined	05:06
	→ dersand joined	05:08
	→ qt-x joined	05:08
	← Trendrrr left	05:10
	→ bauruine joined	05:10
	← d5sx43 left	05:11
	→ Trendrrr joined	05:12
	→ brent__ joined	05:12
	← hotpancakes left	05:16
	→ hotpancakes joined	05:16
	← brent__ left	05:17
	→ valhala_22 joined	05:17
	→ ecuanaso joined	05:18
	← netj left	05:18
	→ netj joined	05:19
	← dsdeiz left	05:19
	← prg318 left	05:20
	→ prg318 joined	05:21
	← Trendrrr left	05:21
	← onehrxn left	05:22
	→ onehrxn joined	05:23
	← bauruine left	05:23
	→ fahadash joined	05:24
	→ Trendrrr joined	05:24
	← valhala_22 left	05:26
	→ TbobbyZ joined	05:27
	← Vortex34 left	05:27
	← ecuanaso left	05:27
	→ cap0ne joined	05:27
	→ bauruine joined	05:27
	← madewokherd left	05:28
	→ jesst joined	05:28
	← Campbeld left	05:30
	→ KeyJoo joined	05:31
	→ lyxus joined	05:31
	→ indistylo joined	05:31
	← Trendrrr left	05:31
	← TbobbyZ left	05:31
	→ dege joined	05:32
	→ c0ded joined	05:32
	→ Trendrrr joined	05:33
	→ imack joined	05:33
	→ King_Hual joined	05:33
	← Cabanossi left	05:34
	→ Cabanossi joined	05:35
	→ pwnz0r joined	05:35
	← c0ded left	05:37
	→ ecuanaso joined	05:38
	← tarkus left	05:38
	← netj left	05:38
	→ valhala_22 joined	05:38
	→ netj joined	05:38
	← Trendrrr left	05:39
	→ Trendrrr joined	05:41
	← rohitpaulk left	05:42
	← lindenle left	05:42
	← pwnz0r left	05:46
	← ecuanaso left	05:46
	→ Vortex34 joined	05:47
	→ Raging_Hog joined	05:47
	← kaldoran left	05:53
	← sim590 left	05:53
	→ Vortex35 joined	05:53
	→ Maskettaman joined	05:53
	← menip left	05:53
	← valhala_22 left	05:55
	← freimatz3 left	05:55
	← Vortex34 left	05:56
	→ rohitpaulk joined	05:56
	→ sim590 joined	05:57
	→ kaldoran joined	05:58
	→ spark`_ joined	05:58
	→ apple101 joined	05:58
	← cdg left	05:59
	→ Silmarilion joined	05:59
	← hotpancakes left	06:00
	→ hotpancakes joined	06:00
	← spark` left	06:01
	← a_thakur left	06:01
	← Trendrrr left	06:02
	→ thebardian joined	06:03
	→ jimmyrcom_ joined	06:03
	→ Trendrrr joined	06:05
	← hotpancakes left	06:05
	← rvgate left	06:07
	→ spark` joined	06:09
	→ acetakwas joined	06:09
	→ ecuanaso joined	06:09
	→ schleppel joined	06:09
	← Trendrrr left	06:11
	← spark`_ left	06:11
	← cap0ne left	06:11
	→ overlord_tm joined	06:12
	→ cap0ne joined	06:12
	→ Trendrrr joined	06:13
	← onehrxn left	06:13
	→ spark`_ joined	06:14
	← Sense8 left	06:14
	→ onehrxn joined	06:14
	← spark` left	06:15
	→ ogny joined	06:15
	← MattMaker left	06:17
	→ jknetl joined	06:18
	← spark`_ left	06:18
	→ spark` joined	06:19
	← ecuanaso left	06:19
	← garyserj left	06:20
	→ garyserj joined	06:21
	← Trendrrr left	06:21
	→ ecuanaso joined	06:22
	→ Trendrrr joined	06:23
	← jesst left	06:23
	← spark` left	06:24
	→ spark` joined	06:24
	→ roelmonnens joined	06:24
	→ hotpancakes joined	06:26
	→ svm_invictvs joined	06:26
	← ertes left	06:27
	→ Tobbi joined	06:29
	→ ferr1 joined	06:29
	← Trendrrr left	06:30
	← hotpancakes left	06:30
	← AndrewAlexMac left	06:31
	→ Trendrrr joined	06:32
	→ JeroenT joined	06:33
	silverdust → Guest74864	06:33
	→ c0ded joined	06:35
	← JeroenT left	06:37
	← ecuanaso left	06:38
	→ JeroenT joined	06:38
	← King_Hual left	06:38
	→ JeroenT_ joined	06:39
	← jimmyrcom_ left	06:40
	← Trendrrr left	06:40
	← c0ded left	06:40
	← ronny left	06:41
	← rohitpaulk left	06:41
	→ Trendrrr joined	06:41
	→ ecuanaso joined	06:42
	← JeroenT left	06:42
	← Tobbi left	06:43
	← grift left	06:43
	→ GT4066 joined	06:44
	→ tarkus joined	06:44
	→ grift joined	06:46
	→ hotpanca_ joined	06:50
	→ Guest35527 joined	06:50
	← Trendrrr left	06:50
	Guest35527 → gruetzkopf	06:51
	→ rohitpaulk joined	06:51
	→ kpax joined	06:51
	← hussam left	06:51
	→ Trendrrr joined	06:52
	← ecuanaso left	06:52
	← cap0ne left	06:52
	← svm_invictvs left	06:53
	→ svm_invictvs joined	06:53
	→ ecuanaso joined	06:53
	← heber left	06:55
	← svm_invictvs left	06:56
	→ svm_invictvs joined	06:57
	→ venmx joined	06:57
	← Guest74864 left	06:57
	← Trendrrr left	06:59
	→ silverdust joined	06:59
	← apple101 left	06:59
	← thebardian left	07:00
	→ Trendrrr joined	07:00
	← hotpanca_ left	07:00
	→ c0ded joined	07:00
	← Lyqyd left	07:01
	← thiago left	07:01
	← boombatower left	07:02
	← venmx left	07:02
	→ MineCoins joined	07:02
	← ecuanaso left	07:03
	→ Tobbi joined	07:04
	← JeroenT_ left	07:04
	→ JeroenT joined	07:04
	→ SkyPatrol joined	07:04
	← JeroenT left	07:05
	→ JeroenT joined	07:05
	← c0ded left	07:05
	← SkyPatrol_ left	07:06
	← svm_invictvs left	07:07
	→ ertes-w joined	07:07
	→ basiclaser joined	07:08
	← ShapeShifter499 left	07:08
	→ seschwar joined	07:10
	→ chele joined	07:10
	← Trendrrr left	07:10
	→ valhala_22 joined	07:10
	← ignarps left	07:10
basiclaser	how can i push my repo which contains file_A without overwriting the remote file_A ? I have previously pushed that file but now i would like to ignore it. I'm not sure how to ignore it without deleting it from the remote. would `git rm file_A` and adding it to `.gitignore` work?	07:11
	→ lordjancso joined	07:11
	→ TomyWork joined	07:11
	← acetakwas left	07:11
	→ ecuanaso joined	07:12
	← Tobbi left	07:12
	← overlord_tm left	07:12
	← sostenuto left	07:12
	← tarkus left	07:12
grawity	you cannot ignore it without deleting it from the remote	07:13
	→ Trendrrr joined	07:13
	→ watersoul_ joined	07:13
	← dreiss left	07:13
ti2	basiclaser: Do you want to keep 'file_A' in the repo as it is committed, but change it locally without getting a modified status?	07:13
	→ flaviodesousa joined	07:15
	→ tarkus joined	07:15
	→ sostenuto joined	07:16
basiclaser	i dont care what happens to local file_A ( its just for testing ), as long as remote file_A maintains its state. Remote file_A is tracking state for something important. I do need all the other repo files to update in sync though	07:16
	← watersoul left	07:17
	→ venmx joined	07:17
	← mozzarella left	07:18
	→ _ADN_ joined	07:18
	← finalbeta left	07:18
	→ finalbeta joined	07:19
	← Trendrrr left	07:20
	→ pundirsumit joined	07:20
	→ m4sk1n joined	07:20
	→ Trendrrr joined	07:21
	← ecuanaso left	07:21
	→ ShapeShifter499 joined	07:21
	→ Tobbi joined	07:22
	→ ecuanaso joined	07:24
	← pundirsumit left	07:24
basiclaser	sorry i hope that was clear :P probably my fault for not storing state in a DB	07:25
_ikke_	If you don't want that file to change, do not commit any changes to that file	07:26
	← rohitpaulk left	07:26
	← _ADN_ left	07:26
	→ _ADN_ joined	07:26
basiclaser	_ikke_: the local and remote files are very different due to testing , so if i push the repo the test state will overwrite the remote deployment state if i understand correctly	07:26
	→ SkyPatrol_ joined	07:27
_ikke_	yes, hence you normally should not track such files	07:27
	→ mozzarella joined	07:28
	→ ignarps joined	07:28
	← Trendrrr left	07:28
	← SkyPatrol left	07:28
	← warthog9 left	07:30
	→ Trendrrr joined	07:30
	→ overlord_tm joined	07:30
	← kadoban left	07:31
	→ warthog9 joined	07:32
	Kartagis coughs up .gitignore	07:32
_ikke_	.gitignore does not help here	07:33
	← ecuanaso left	07:34
	← Trendrrr left	07:38
	← Tobbi left	07:39
	→ Trendrrr joined	07:40
	← cdown left	07:41
	→ mischat joined	07:42
	← MineCoins left	07:42
	← mischat left	07:42
	→ mischat joined	07:43
	→ wandering_vagran joined	07:43
	→ JeroenT_ joined	07:43
	← Random832 left	07:44
	→ maarhart joined	07:44
	← mischat left	07:45
	→ mischat_ joined	07:45
	→ alcohol joined	07:45
	← JeroenT left	07:46
	← maarhart left	07:47
	← blackwind_123 left	07:48
	← Trendrrr left	07:50
	→ maarhart joined	07:51
ti2	basiclaser: It's a bit dangerous, but you might want to use 'git update-index --skip-worktree -- file_A'. That kind of hides all local changes from git; thus, you won't be able to commit the local changes until you revert the 'skip-worktree' flag via 'git update-index --no-skip-worktree -- file_A'.	07:52
	→ jaziz joined	07:52
	← venmx left	07:52
	→ blackwind_123 joined	07:52
	→ Trendrrr joined	07:52
basiclaser	hm hm i could also be lazy and copy remote state to local then push again :P	07:52
	→ the_d4rkl0rd joined	07:53
ti2	basiclaser: for sure.	07:54
	← weakdan left	07:57
	→ Random832 joined	07:57
	← maarhart left	07:58
	→ LTRand joined	07:58
	← Trendrrr left	07:58
	→ apple101 joined	07:58
	→ joshszep joined	07:59
	→ Trendrrr joined	08:00
	← LTRand left	08:03
	→ ecuanaso joined	08:03
	← joshszep left	08:04
	→ weakdan joined	08:04
	← jameser left	08:05
	← Trendrrr left	08:06
	→ robotroll joined	08:07
	→ kyan joined	08:07
	→ se1_ joined	08:07
	→ kurkale6ka joined	08:07
	→ Trendrrr joined	08:08
	← indistylo left	08:09
	→ YuGiOhJCJ joined	08:09
	→ jameser joined	08:10
	→ indistylo joined	08:11
	← ecuanaso left	08:12
	← bauruine left	08:12
	→ bongjovi joined	08:13
	→ kurkale61 joined	08:13
	← tourdownunder left	08:14
	→ marcogmonteiro joined	08:15
	← Trendrrr left	08:15
	→ dsdeiz joined	08:15
	← dsdeiz left	08:15
	→ dsdeiz joined	08:15
	→ gxt joined	08:15
	→ shodan` joined	08:15
	→ MineCoins joined	08:15
	← kurkale6ka left	08:16
	→ ronator joined	08:16
	→ Snugglebash joined	08:16
shodan`	Hey, I have a very large repository filled with xml files and I want to truncate it's history due to it's size. The only problem is that it's master is pulled to from develop and develop from sepperate branches. So I don't really know how to go about this properly	08:17
	→ Trendrrr joined	08:17
	→ cstratak joined	08:17
	→ bauruine joined	08:20
	← indistylo left	08:20
	← dsdeiz left	08:20
	→ acetakwas joined	08:20
	→ indistylo joined	08:20
	→ xor joined	08:22
	→ Tobbi joined	08:22
	← xor left	08:22
	→ _xor joined	08:22
	→ afuentes joined	08:23
	→ pbandark joined	08:24
	← pbandark left	08:24
	← MineCoins left	08:25
	→ IITaudio_ joined	08:26
	→ ecuanaso joined	08:26
	← selckin left	08:28
	→ selckin joined	08:29
	← the_d4rkl0rd left	08:29
	→ rvgate joined	08:30
	← indistylo left	08:30
	→ TbobbyZ joined	08:31
	→ indistylo joined	08:31
	← Trendrrr left	08:32
	← freimatz left	08:33
	→ Trendrrr joined	08:34
	→ zulutango joined	08:34
	gitinfo set mode: +v	08:35
IITaudio_	Hi, I've been asked how to add external binary-only dependencies to a git project (Windows). Can anybody confirm that the best way to achieve it is by having a submodule in which there's the "versioned" binary data? Also, if the dependency comes with an installer, would you add the installer itself or extract it and add the content/both?	08:35
	← _xor left	08:35
	← TbobbyZ left	08:36
_ikke_	!lfs !annex !media	08:36
gitinfo	git-annex, git-media, and Git LFS are some solutions to the !binary problem. They work by keeping the blobs outside of the repo, storing a reference to the blob in the repo instead. http://git-annex.branchable.com https://github.com/alebedev/git-media http://git.io/git-lfs	08:36
	← ecuanaso left	08:36
	→ pbandark joined	08:36
	← Goplat left	08:37
	← kpax left	08:40
	← Tobbi left	08:40
	→ rohitpaulk joined	08:41
	← indistylo left	08:41
	← Trendrrr left	08:43
	← Atm0spher1c left	08:44
	→ Trendrrr joined	08:45
	→ dsdeiz joined	08:46
	← dsdeiz left	08:46
	→ dsdeiz joined	08:46
	→ lindenle joined	08:46
	→ Tobbi joined	08:48
	→ AndrewAlexMac joined	08:48
	← ShapeShifter499 left	08:49
	← chandu20 left	08:49
	← dsdeiz left	08:51
	← aca20031 left	08:51
	→ hotpancakes joined	08:51
	← Maskettaman left	08:52
	→ indistylo joined	08:53
	→ fees joined	08:54
	→ [ADN] joined	08:56
	← hotpancakes left	08:56
	← rohitpaulk left	08:57
	→ ecuanaso joined	08:57
	→ rohitpaulk joined	08:59
	← _ADN_ left	08:59
	← ir7466 left	08:59
	→ dsdeiz joined	09:01
	← dsdeiz left	09:01
	→ dsdeiz joined	09:01
	← KeyJoo left	09:04
	→ CheckDavid joined	09:05
	→ kvaz joined	09:06
	← dsdeiz left	09:06
	→ Murii joined	09:06
	→ mdbk joined	09:07
	← ecuanaso left	09:07
	← onehrxn left	09:07
	← Trendrrr left	09:07
	→ Trendrrr joined	09:09
	← Tobbi left	09:10
	→ ecuanaso joined	09:12
	← chat____3 left	09:15
	← stoopkid left	09:15
	→ chat joined	09:16
	chat → Guest27538	09:16
	← Trendrrr left	09:18
	→ TheFuzzball joined	09:18
	← blackwind_123 left	09:19
	→ Trendrrr joined	09:19
	← [ADN] left	09:20
	→ CaptainHeavy joined	09:20
	← ecuanaso left	09:22
	← Trendrrr left	09:26
	→ albel727 joined	09:26
	← CaptainHeavy left	09:27
	→ Trendrrr joined	09:27
	→ shanee joined	09:28
	→ Chuguniy joined	09:28
	→ ecuanaso joined	09:28
shanee	Hello. I have a stage branch, I'd like to make it the same as master branch for a little bit, before restoring it back to how it is now. How can I do this without messing up merges in future?	09:28
osse	shanee: git branch stagebackup stage; git checkout stage; git reset --hard master; .... do stuff ...; git reset --hard stagebackup; git branch -d stagebackup	09:29
_ikke_	checkout + reset --hard can be combined with checkout -B	09:30
osse	true	09:30
	and if it's only for deployment I'd do git push -f remote stage:master	09:31
	→ Tobbi joined	09:31
	→ nowhereman_ joined	09:32
	→ theoceaniscool joined	09:33
shanee	Thank you osse. That's great.	09:33
	← kajmany left	09:33
	← Cabanossi left	09:33
	← bongjovi left	09:35
	→ Cabanossi joined	09:35
	← Trendrrr left	09:35
	→ Trendrrr joined	09:37
	← ecuanaso left	09:37
	→ c0ded joined	09:40
	→ nickel_dime_look joined	09:40
	→ ecuanaso joined	09:41
	← rohitpaulk left	09:42
	→ _ADN_ joined	09:44
	← PioneerAxon left	09:44
	→ PioneerAxon joined	09:44
	← c0ded left	09:44
	← kvaz left	09:45
selckin	i remember there being a command to like package(tar) all the files in a ref, but google is not helping for some reason	09:46
	git-archive!	09:46
	→ diphtherial joined	09:47
	← Trendrrr left	09:48
diphtherial	so, i wasn't paying attention and accidentally based a fix branch off of the wrong branch (i was intending to base it off of master)	09:48
_ikke_	selckin: rubber ducking ftw	09:48
diphtherial	i pushed the branch to the remote, but i'd like to now somehow just move the single commit on this fix branch to be based off of master -- is there a way to do that, even though i've already pushed the branch?	09:49
selckin	_ikke_: :)	09:49
diphtherial	i understand that rebasing is a bad idea if you've pushed anything to the remote, which i mention because it was the first solution i found after searching	09:49
	← ronator left	09:49
	→ Trendrrr joined	09:49
	→ ronator joined	09:50
	← Tobbi left	09:50
	← ecuanaso left	09:50
	← apple101 left	09:51
	← bitmod left	09:51
	← dcpc007 left	09:51
	← jameser left	09:52
	← jaziz left	09:52
	← xall left	09:52
	→ ecuanaso joined	09:53
diphtherial	if i delete the remote branch (via git push origin --delete <mybranch>), rebase my local one (git rebase --onto master <badbranch> <mybranch>), then re-push it, would that not explode?	09:53
	← JeroenT_ left	09:54
diphtherial	it appears that worked, for the record; luckily nobody had pulled yet	09:56
	→ JeroenT joined	09:56
	→ m0viefreak joined	09:57
	← filcab left	09:58
	→ c0ded joined	09:59
	← Trendrrr left	09:59
	→ Trendrrr joined	10:01
	→ ter0 joined	10:02
	→ Tobbi joined	10:02
	← ecuanaso left	10:02
	→ thebardian joined	10:02
	→ belzebite joined	10:03
	→ shiriru joined	10:03
	← c0ded left	10:04
	→ aruns joined	10:06
	← Kaisyu left	10:07
	← QwertyDragon left	10:07
	→ peterppp joined	10:07
	← ter0 left	10:07
	← indistylo left	10:07
	→ xall joined	10:08
	gitinfo set mode: +v	10:09
peterppp	say, there's a file in my index, I modify it, then I do `git add` and then modify it again, how can I restore the file as it was when I did `git add`?	10:09
	→ h12o joined	10:09
grawity	`git checkout` it	10:09
	← Trendrrr left	10:09
	← thebardian left	10:10
	→ thebardian joined	10:10
	← thebardian left	10:11
	→ Trendrrr joined	10:11
	→ thebardian joined	10:11
peterppp	grawity, ah, thanks, for some reason I assumed that would revert the file to the last commited version	10:12
grawity	it would if you used -f, I think	10:12
	← tarkus left	10:13
	→ ecuanaso joined	10:13
	← thebardian left	10:13
	← h12o left	10:14
	→ thebardian joined	10:14
	→ seppevs joined	10:15
	← thebardian left	10:17
	→ wrouesnel1 joined	10:17
	→ thebardian joined	10:17
	→ Darcidride joined	10:17
	→ onehrxn joined	10:18
	← Trendrrr left	10:20
	→ mentazoom joined	10:20
	→ Trendrrr joined	10:21
	← albel727 left	10:22
	← onehrxn left	10:22
	← thebardian left	10:23
	→ thebardian joined	10:23
	← thebardian left	10:23
	← ecuanaso left	10:24
	→ thebardian joined	10:24
	→ onehrxn joined	10:25
	→ bitmod joined	10:25
	← Tobbi left	10:26
	→ tarkus joined	10:26
	← onehrxn left	10:26
_ikke_	git checkout HEAD <file> would do it	10:26
	without specifying a commit, it uses the index	10:26
	-f is only meaningfull when changing branches (checkout out files always overwrites local changes anyway)	10:27
	→ Tobbi joined	10:27
	→ ecuanaso joined	10:28
	→ onehrxn joined	10:28
	← thebardian left	10:30
	→ thebardian joined	10:30
	← Trendrrr left	10:31
	→ freimatz joined	10:31
	→ courrier joined	10:31
	→ Trendrrr joined	10:32
	← IITaudio_ left	10:32
	← Cabanossi left	10:33
	→ TbobbyZ joined	10:33
	← JeroenT left	10:34
	→ a_thakur joined	10:34
	→ Cabanossi joined	10:34
	→ the_d4rkl0rd joined	10:35
	→ kurkale6ka joined	10:36
	← ecuanaso left	10:38
	→ albel727 joined	10:38
	← onehrxn left	10:39
	← TbobbyZ left	10:39
	← gruetzkopf left	10:39
	← kurkale61 left	10:39
	← Trendrrr left	10:40
	→ Trendrrr joined	10:41
	→ ecuanaso joined	10:42
	→ dsdeiz joined	10:42
	← dsdeiz left	10:42
	→ dsdeiz joined	10:42
	→ SkyPatrol joined	10:44
	→ kurkale61 joined	10:45
	← SkyPatrol_ left	10:46
	→ hussam joined	10:46
	← kurkale6ka left	10:47
	← Trendrrr left	10:47
	→ lb1c joined	10:48
	→ c0ded joined	10:49
	→ Trendrrr joined	10:49
	→ onehrxn joined	10:50
	← seppevs left	10:51
	← onehrxn left	10:51
	→ cdown joined	10:53
	← c0ded left	10:54
	← shanee left	10:55
	← xall left	10:56
	← Tobbi left	10:57
	← cqi left	10:58
	← lyxus left	11:00
	← Trendrrr left	11:00
	→ JeroenT joined	11:01
	← ecuanaso left	11:02
	→ Trendrrr joined	11:02
	← dsdeiz left	11:02
	→ onehrxn joined	11:02
	→ n420 joined	11:02
	→ ecuanaso joined	11:04
	← onehrxn left	11:05
	→ manuelschneid3r joined	11:06
	→ re1 joined	11:06
	← ti2 left	11:07
	← cagedwisdom left	11:08
	← Trendrrr left	11:08
	→ star_prone joined	11:08
	→ Trendrrr joined	11:09
	← a_thakur left	11:09
	→ tonyj_ joined	11:10
	← tarkus left	11:11
	← courrier left	11:12
	→ peacememories joined	11:12
	← tonyj left	11:13
	← ecuanaso left	11:14
	→ onehrxn joined	11:15
	→ stoopkid joined	11:18
	→ rohitpaulk joined	11:19
	← raynold left	11:20
	→ db8093246 joined	11:20
	← Trendrrr left	11:20
	← thinkpad left	11:21
	← thebardian left	11:21
	→ thebardian joined	11:21
	→ slidercrank joined	11:21
	← thebardian left	11:22
	→ Trendrrr joined	11:22
	→ ecuanaso joined	11:23
	← onehrxn left	11:23
	→ thebardian joined	11:24
	← YuGiOhJCJ left	11:25
	→ paws_ joined	11:28
	→ ssarah joined	11:28
grawity	hmm	11:29
	← Trendrrr left	11:29
grawity	well I find `git co -f` as a useful shortcut to `git reset --hard HEAD`	11:29
	→ onehrxn joined	11:29
	← onehrxn left	11:30
_ikke_	right, that's using git checkout in branch mode, not file mode	11:30
	→ HoierM joined	11:30
	→ Trendrrr joined	11:31
_ikke_	"git checkout ." does the same in file mode	11:31
grawity	no it doesn't, it gives you the version from the index	11:31
	oh hold on	11:31
	I was pretty sure `git co -f` also reset the index	11:32
	← peacememories left	11:32
	← ecuanaso left	11:32
	→ onehrxn joined	11:32
	← thebardian left	11:33
	← JeroenT left	11:33
	→ thebardian joined	11:33
	← onehrxn left	11:33
_ikke_	right, because git checkout without parameter defaults to HEAD	11:34
	← Guest47369 left	11:35
	→ ecuanaso joined	11:37
	← thebardian left	11:37
	→ thebardian joined	11:38
	← askb left	11:39
	← thebardian left	11:39
	→ thebardian joined	11:40
	→ kurkale6ka joined	11:41
	← Trendrrr left	11:42
	← thebardian left	11:43
	→ Trendrrr joined	11:43
	→ thebardian joined	11:43
	→ onehrxn joined	11:44
	← kurkale61 left	11:44
	← Puffball left	11:44
	← ecuanaso left	11:45
	← thebardian left	11:46
	→ thebardian joined	11:46
	→ ecuanaso joined	11:47
	← Cabanossi left	11:47
	← thebardian left	11:48
	→ thebardian joined	11:48
	→ joshszep joined	11:48
	← mdbk left	11:49
	→ Cavallari joined	11:49
	→ Cabanossi joined	11:50
	→ Gurkenglas joined	11:51
	→ Puffball joined	11:51
	← thebardian left	11:51
	→ cdown_ joined	11:52
	← onehrxn left	11:52
	→ thebardian joined	11:52
	← not-an-aardvark left	11:53
	→ roelmonn_ joined	11:53
	← bouncy left	11:53
	← Trendrrr left	11:54
	→ JeroenT joined	11:54
	← cdown left	11:54
	cdown_ → cdown	11:54
	← thebardian left	11:55
	→ Trendrrr joined	11:55
	→ thebardian joined	11:55
	← thebardian left	11:57
	← roelmonnens left	11:57
	→ thebardian joined	11:57
	← thebardian left	11:58
	→ thebardian joined	11:59
	→ c0ded joined	12:00
	← thebardian left	12:00
	← Trendrrr left	12:00
	→ Trendrrr joined	12:02
	← JeroenT left	12:03
	← Husky_Apocalypse left	12:04
	→ JeroenT joined	12:04
	← c0ded left	12:05
	← bitmod left	12:05
	← exotime left	12:05
	← TheFuzzball left	12:06
	→ exotime joined	12:06
	← om_henners left	12:07
	← theoceaniscool left	12:07
	→ onehrxn joined	12:07
	← bast left	12:07
	← onehrxn left	12:07
	← Trendrrr left	12:08
	← Raging_Hog left	12:08
	→ bitmod joined	12:09
	→ om_henners joined	12:09
	→ synthroid joined	12:10
	← jeffreylevesque left	12:10
	→ Trendrrr joined	12:10
	→ bast joined	12:10
	← bast left	12:10
	→ bast joined	12:10
	→ onehrxn joined	12:10
	← onehrxn left	12:10
	→ kurkale61 joined	12:13
	← kurkale6ka left	12:16
silverdust	Was cloning a repo that's quite large and internet went off at 99%. Now it's just hung on there	12:17
	← diphtherial left	12:17
	→ onehrxn joined	12:17
silverdust	For smaller repos I'd ^C and start over but I don't want to start over here. What can I do?	12:17
	Aren't the downloads so far saving to somewhere where it can just pick up from	12:17
	← onehrxn left	12:18
silverdust	Current state: Receiving objects: 99% (327923/330084), 458.84 MiB \| 145.00 KiB/s	12:18
	→ KeyJoo joined	12:18
silverdust	And frozen	12:18
	→ onehrxn joined	12:20
	← the_d4rkl0rd left	12:20
	← Trendrrr left	12:20
	→ the_d4rkl0rd joined	12:20
	← onehrxn left	12:21
Vampire0	silverdust, I don't know whether the files are in the final location already, but if they are, you might be able to use `--reference` successfully	12:21
	→ j08nY joined	12:21
	→ Trendrrr joined	12:21
	→ onehrxn joined	12:22
silverdust	So git clone remote-url --reference ? I'll try that. Hope it works	12:22
	← onehrxn left	12:23
	← Chuguniy left	12:23
	← the_d4rkl0rd left	12:23
silverdust	There don't seem to be a --reference flag	12:23
	← n420 left	12:23
	→ the_d4rkl0rd joined	12:24
	← the_d4rkl0rd left	12:24
	→ the_d4rkl0rd joined	12:25
	← valhala_22 left	12:25
	→ thinkpad joined	12:25
	← zulutango left	12:26
Vampire0	silverdust, man git clone	12:27
gitinfo	silverdust: the git-clone manpage is available at https://gitirc.eu/git-clone.html	12:27
	→ tarkus joined	12:28
	→ jeffreylevesque joined	12:29
	→ freddieptf joined	12:29
	→ rahtgaz joined	12:30
	← Trendrrr left	12:30
	← qt-x left	12:31
	→ onehrxn joined	12:31
	→ Trendrrr joined	12:32
	← Cabanossi left	12:32
	← onehrxn left	12:32
silverdust	Oh it says You must specify a repository to clone	12:33
	which I did . I have `git clone --reference https://github.com/owner/project.git`	12:33
	Also tried `git clone --reference-if-available path-to-remote`	12:34
Vampire0	silverdust, no, you misread it	12:35
	→ Cabanossi joined	12:35
	→ Chuguniy joined	12:35
Vampire0	silverdust, if you clone a remote, you can specify a local repository where the object files are taken from instead of downloaded if available	12:35
	→ onehrxn joined	12:35
jast	which doesn't seem to be the case here	12:35
	← onehrxn left	12:35
	→ c0ded joined	12:35
jast	unfortunately resumable clone is not supported yet, apparently because it's very tricky to implement	12:36
	→ Tobbi joined	12:36
silverdust	Ah I see	12:36
	→ TbobbyZ joined	12:36
Vampire0	jast, yeah, I said I don't know whether it will work. I said it might work if the files were put to the final place while downloading	12:37
	:-)	12:37
jast	git removes the partial clone if aborted using Ctrl-C or SIGTERM	12:38
	so the only way it could work is if the frozen clone command isn't terminated in the meantime	12:39
	→ ma5ter joined	12:39
Vampire0	ah, nice to know	12:39
	thx jast	12:39
jast	and the partial pack file is downloaded using a temporary name so (a) it's probably not valid and (b) it's not in the right place for --reference to be able to use it	12:40
	← c0ded left	12:40
Stummi	can I exclude a given Author name with git log?	12:40
	I see theres a --author option but I would like it to use to exclude an author	12:40
	→ onehrxn joined	12:40
	← onehrxn left	12:41
	← TbobbyZ left	12:41
jast	Stummi: there's no straightforward option to do it, it would involve a bit of scripting	12:41
	← Tobbi left	12:42
osse	Maybe --no-author magically works	12:42
	← ma5ter left	12:42
	→ onehrxn joined	12:42
jast	no, that's invalid	12:42
osse	Other than that it's a pattern, so construct a pattern that excludes the author.	12:42
	Probably hard in BRE/ERE	12:42
	→ ma5ter joined	12:42
	→ kurkale6ka joined	12:43
	← onehrxn left	12:43
	← bitmod left	12:44
	→ irqq joined	12:44
	→ theoceaniscool joined	12:45
	← manuelschneid3r left	12:45
	← kurkale61 left	12:45
	← ma5ter left	12:46
	← Trendrrr left	12:46
	← freddieptf left	12:46
	→ a_thakur joined	12:46
	← mentazoom left	12:46
	→ onehrxn joined	12:47
	← GT4066 left	12:47
	← onehrxn left	12:47
	→ Trendrrr joined	12:47
	→ kurkale61 joined	12:47
	→ mischat joined	12:47
	→ venmx joined	12:48
	→ onehrxn joined	12:48
	← onehrxn left	12:49
	→ Gustavo6046 joined	12:49
	← fahadash left	12:50
	← kurkale6ka left	12:50
	→ aruns__ joined	12:50
	→ dsdeiz joined	12:50
	← re1 left	12:51
	← mischat_ left	12:51
	→ onehrxn joined	12:51
	← tarkus left	12:51
	← aruns left	12:52
	← venmx left	12:52
	→ trent_ joined	12:53
	← ojdo left	12:53
	→ LTRand joined	12:53
	← onehrxn left	12:53
	← dsdeiz left	12:55
	← kyan left	12:55
	→ perlpilot joined	12:55
	← aruns__ left	12:55
	→ livingstn joined	12:56
	← Trendrrr left	12:57
	→ tarkus joined	12:58
	→ Trendrrr joined	12:58
	← shiriru left	12:58
	→ skywritergr joined	13:00
	→ ojdo joined	13:00
	← rahtgaz left	13:00
	← sarri left	13:01
	← notebox left	13:02
	← lagothri1 left	13:03
	→ sarri joined	13:03
	← sarri left	13:03
	→ sarri joined	13:03
	→ savoir-faire joined	13:04
	→ TheFuzzball joined	13:04
	← Trendrrr left	13:05
	→ onehrxn joined	13:06
	→ absence joined	13:06
	← TheFuzzball left	13:06
	→ Trendrrr joined	13:07
	← onehrxn left	13:07
	→ aruns__ joined	13:07
absence	is there an oposite of commitid~ that gives a more recent commit?	13:07
_ikke_	nope	13:07
	There might be an infinite amount of commits, and git does not track the children per commit	13:08
	it does track the parents	13:08
trent_	Is there an easy way to teach a person git from start to finish, I've been doing it to 4 newb programmers at work and it tires me out	13:09
	← Snugglebash left	13:09
	← tarkus left	13:10
Vampire0	trent_, from start to finish? Tell them to study all man-pages with all options. :-D	13:10
absence	_ikke_: ok, i'll try to find a way to work around it. thanks	13:10
_ikke_	!book	13:10
gitinfo	There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable	13:10
Vampire0	trent_, other than that, record your explanations and then present that to others, or use ready Git talks that explain what you want explained	13:10
	← Cavallari left	13:10
	→ onehrxn joined	13:11
Vampire0	trent_, besides the man pages !book also is good	13:11
gitinfo	trent_: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable	13:11
trent_	Okay I should definitely check the book out, thanks	13:12
	← onehrxn left	13:12
Vampire0	trent_, you're welcome	13:13
gitinfo	trent_: This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them with "thank you", "thankyou", "thanks", "thx", "ty" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person but don't expect immediate increase. Ten thanks make up one karma point.	13:13
	← a_thakur left	13:13
	→ robertparkerx joined	13:13
trent_	Vampire0: thx	13:13
	→ manuelschneid3r joined	13:14
	← Trendrrr left	13:14
trent_	_ikke_: thanks	13:14
	nice system by the way	13:14
	→ iw1042 joined	13:14
trent_	.karma Vampire0	13:14
gitinfo	the Genuine Real Life Karma™ REST API results are back! v‍ampire0: 40 (1 in past 30 days) (4 given out)	13:14
	→ a_thakur joined	13:15
	→ Trendrrr joined	13:15
	→ onehrxn joined	13:15
_ikke_	Vampire0 is rising fast :P	13:15
	.karma _ikke_	13:15
gitinfo	the Genuine Real Life Karma™ REST API results are back! _‍ikke_: 245 (4 in past 30 days) (4 given out)	13:15
	← onehrxn left	13:16
Vampire0	Not as fast as you :-D	13:16
	→ tarkus joined	13:16
	← iw1042 left	13:16
	→ geojunkieSCI joined	13:16
	→ fission6 joined	13:17
	→ chitopunk joined	13:17
	→ pbandark1 joined	13:17
	← pbandark left	13:17
	pbandark1 → pbandark	13:17
	→ Cavallari joined	13:17
	← Cabanossi left	13:18
	→ onehrxn joined	13:18
	← onehrxn left	13:19
	← joshszep left	13:19
	→ Dougie187 joined	13:19
	→ Gsham joined	13:19
	→ Cabanossi joined	13:20
	→ onehrxn joined	13:20
	→ rda-mac joined	13:21
	← chitopunk left	13:21
	← onehrxn left	13:21
	→ SkyPatrol_ joined	13:21
	→ kyan joined	13:22
	→ chitopunk joined	13:22
	← SkyPatrol left	13:23
	→ onehrxn joined	13:23
	← Trendrrr left	13:25
	→ str joined	13:25
	→ QwertyDragon joined	13:26
	← Dougie187 left	13:26
	→ Trendrrr joined	13:26
	← ferr1 left	13:26
	→ Dougie187 joined	13:26
	← geojunkieSCI left	13:27
	← stoopkid left	13:27
	← ecuanaso left	13:28
	→ Ryanar joined	13:29
	→ geojunkieSCI joined	13:29
	← a_thakur left	13:29
	→ ahr3n joined	13:30
	← Rotaerk left	13:30
	→ Snugglebash joined	13:34
	← Trendrrr left	13:34
	→ notebox joined	13:35
	→ Trendrrr joined	13:35
	→ Campbeld joined	13:36
	← fission6 left	13:37
	← jknetl left	13:38
	→ lagothrix joined	13:38
	→ fission6 joined	13:40
	← ogny left	13:41
	→ boombatower joined	13:41
	→ ogny joined	13:42
	← alcohol left	13:43
	→ peacememories joined	13:43
	← synthroid left	13:44
	← JeroenT left	13:45
	← new_student left	13:45
	→ new_student joined	13:45
	← Trendrrr left	13:45
	← skywritergr left	13:46
	→ synthroid joined	13:47
	→ cap0ne joined	13:47
	→ Trendrrr joined	13:47
	→ JeroenT joined	13:47
	→ ZyX-I joined	13:48
	← Campbeld left	13:50
	← ronator left	13:50
	→ Campbeld joined	13:50
	→ Fallen0223 joined	13:50
	→ Silox\| joined	13:52
	← jleclanche left	13:53
	→ th3_d4rkl0rd joined	13:54
	← JeroenT left	13:54
	← Campbeld left	13:55
	→ gargola joined	13:56
	← strugee left	13:56
	← the_d4rkl0rd left	13:56
	← basiclaser left	13:57
	→ crose joined	13:57
	→ TheFuzzball joined	13:57
	→ aboccia joined	13:57
	→ mdbk joined	13:58
	← ahr3n left	13:58
	← fission6 left	13:59
	→ bitmod joined	13:59
	← Hunter1 left	14:00
	→ Hunter1 joined	14:00
	→ fission6 joined	14:01
	← roelmonn_ left	14:01
	→ dave0x6d joined	14:02
	→ strugee joined	14:02
	→ roelmonnens joined	14:02
	← Trendrrr left	14:03
	← Ryanar left	14:04
	← ErkiDerL1ony left	14:04
	→ Trendrrr joined	14:05
	← bitmod left	14:06
	→ Ryanar joined	14:06
	→ freimatz3 joined	14:07
	← roelmonnens left	14:07
	← cap0ne left	14:08
	← Gurkenglas left	14:08
	→ ShapeShifter499 joined	14:08
	→ JeroenT joined	14:09
	→ Gurkenglas joined	14:09
	← JeroenT left	14:10
	← arecaceae left	14:10
	→ arecaceae joined	14:10
	← dec0n left	14:10
	← onehrxn left	14:11
	← marcogmonteiro left	14:12
	→ nindustries joined	14:12
nindustries	Hi, one of my git submodule repos is not recogznied in gitlab, any way I can check this in the main repo if I did something wrong?	14:12
	← seschwar left	14:12
nindustries	other two sub-repos display fine	14:13
trent_	check .gitmodules file first	14:13
	→ AaronMT joined	14:13
trent_	nindustries: check .gitmodules file first	14:14
nindustries	trent_: there is no .gitmodules ?	14:14
	→ phinxy joined	14:15
trent_	nindustries: I was talking about https://git-scm.com/book/en/v2/Git-Tools-Submodules , are we talking about same thing?	14:15
nindustries	I literally just cloned three repos in a main one	14:16
	← imack left	14:16
	← Trendrrr left	14:17
trent_	nindustries: probably not the best idea	14:17
	→ marcogmonteiro joined	14:17
Vampire0	nindustries, !subr may help?	14:17
gitinfo	nindustries: [!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding.	14:17
nindustries	!submodule	14:18
gitinfo	git-submodule is ideal to add subsidiary git repositories to a git superproject when you do not control the subprojects or more specifically wish to fix the subproject at a specific revision even as the subproject changes upstream. See http://www.git-scm.com/book/en/Git-Tools-Submodules	14:18
	← peacememories left	14:18
	→ Trendrrr joined	14:18
	→ ansimation joined	14:18
	← mdbk left	14:18
	→ mdbk_ joined	14:18
lucasem	Is there a way I can `git pull` so all of my branches (which track an upstream remote branch) update?	14:19
	← livingstn left	14:19
nindustries	heh, so rm -r php/ && git submodule add repo:php -> 'php' already exists in the index	14:19
lucasem	I typically now do `git fetch; git checkout master; git pull; git checkout my-working-branch`	14:19
	→ onehrxn joined	14:20
Vampire0	lucasem, hardly possible, as pull involves merge or rebase which could need manual interaction due to conflicts	14:20
	lucasem, you can probably make a script or Git alias to do it, but I think it is not provided by default due to that reason	14:20
	← Gurkenglas left	14:21
Vampire0	nindustries, `git rm --cached --r php`	14:21
trent_	lucasem: something comes up if you google it	14:21
	!google	14:21
gitinfo	You're looking for the .search function. Please be patient, it takes a lil bit to load results.	14:21
	← robertparkerx left	14:21
	→ livingstn joined	14:21
	← onehrxn left	14:21
nindustries	ahh, yes !	14:21
	thanks	14:21
trent_	!google git pull all	14:21
gitinfo	You're looking for the .search function. Please be patient, it takes a lil bit to load results.	14:21
	← marcogmonteiro left	14:22
Vampire0	.search git pull all	14:22
gitinfo	Vampire0: .search error: query 'git pull all' failed: Incomplete response - 38	14:22
nindustries	Pretty	14:22
	→ mdbk joined	14:23
	← nindustries left	14:23
	→ peacememories joined	14:23
	← mdbk_ left	14:23
trent_	probably something wrong with google search api	14:23
	→ bitmod joined	14:23
	← CheckDavid left	14:23
Vampire0	seems so	14:23
	jast?	14:23
	→ jagob joined	14:24
	→ rda-mac_ joined	14:26
	→ shinnya joined	14:26
	← pks left	14:26
	← overlord_tm left	14:27
	← rda-mac left	14:28
	← Trendrrr left	14:28
	→ onehrxn joined	14:28
	→ pks joined	14:28
	→ docmur joined	14:29
	← onehrxn left	14:29
	→ Trendrrr joined	14:30
	← peacememories left	14:31
	→ onehrxn joined	14:31
docmur	If I checkut a commit off branch, can I checkin changes from checkout and push it to the server, if that makes sense	14:31
osse	yes	14:31
	← mischat left	14:31
osse	but you have to push to it a reference on the server. you can't push it up "bare"	14:32
	→ mischat joined	14:32
docmur	okay	14:32
osse	e.g. git checkout abc1234; make changes; git add ...; git commit; git push origin HEAD:somebranch	14:33
	← truckcrash left	14:33
	← chitopunk left	14:34
	← lindenle left	14:34
	→ lindenle joined	14:35
	← freimatz3 left	14:35
	→ freimatz3 joined	14:35
	→ martybr joined	14:36
	← Trendrrr left	14:38
	← freimatz left	14:39
	← TomyWork left	14:39
	→ TbobbyZ joined	14:39
	→ chitopunk joined	14:39
	→ Trendrrr joined	14:40
	← Neo left	14:40
	← enckse left	14:41
	← storrgie left	14:41
	← onehrxn left	14:41
	← Snugglebash left	14:42
	→ enckse joined	14:42
	→ Neo joined	14:42
acetakwas	Which is more ideal, that I continue with my existing Bitbucket account, or create a new Bitbucket account with my official email?	14:42
	→ onehrxn joined	14:43
	→ storrgie joined	14:43
	← enckse left	14:43
	← storrgie left	14:43
osse	can't you just change it?	14:44
	→ valhala_22 joined	14:44
	← TbobbyZ left	14:44
	→ mischat_ joined	14:45
	→ sammyo joined	14:46
	→ enckse joined	14:47
	← onehrxn left	14:47
docmur	Cool, I got it :)	14:47
	Made a new branh on the remote and push into that so I don't hurt my main branch	14:47
	→ storrgie joined	14:48
	← mischat left	14:48
	→ onehrxn joined	14:49
	← Trendrrr left	14:49
	← onehrxn left	14:49
	← chele left	14:50
	→ Trendrrr joined	14:51
	→ SteffanW joined	14:51
	→ onehrxn joined	14:51
	← star_prone left	14:51
	→ eshlox joined	14:52
	→ star_prone joined	14:52
	← cyberz left	14:52
	← onehrxn left	14:52
	← star_prone left	14:52
	→ star_prone joined	14:53
	← star_prone left	14:53
	← peepsalot left	14:53
	→ hotpanca_ joined	14:54
	→ czart__ joined	14:56
	← Trendrrr left	14:57
	← ogny left	14:57
	← valhala_22 left	14:57
	→ valhala_22 joined	14:58
czart__	Hey, how to customize "git-shell" user account, so that every time that user log in a default script is run before he/she gets the git-shell interactive access?	14:58
	→ Trendrrr joined	14:59
	← valhala_22 left	14:59
	← Silmarilion left	14:59
	← tunekey left	14:59
	→ valhala_22 joined	15:00
czart__	Is there any script similar to those /home/<USER>/.profile or /home/<USER>/.bashrc that are automatically run with "git-shell"?	15:00
	→ iw1042 joined	15:00
trent_	czart: https://git-scm.com/docs/git-shell does the docs help?	15:01
	→ guest3456 joined	15:01
guest3456	my VM crashed	15:01
	and now git is throwing errors	15:01
	:(	15:01
trent_	czart: If a ~/git-shell-commands directory is present, git shell will also handle other, custom commands by running "git-shell-commands/<command> <arguments>" from the user’s home directory.	15:01
guest3456	i try to checkout to master and it says "inflate data stream error unable to unpack xxxxx"	15:02
	→ overlord_tm joined	15:02
guest3456	loose object is corrupt	15:02
	→ TomyLobo joined	15:02
guest3456	what can i do ?	15:02
iw1042	hey guys, I'm trying to make it so when I push to master, the server that hosts the project pulls it down and redeploys the new code. With the research I've done, it seems that a post-receive hook is the best way to do this, does that sound right? Sorry if my terminology is off or I didn't explain it well	15:03
	→ jstein_ joined	15:03
	→ onehrxn joined	15:03
	→ Wysi joined	15:04
	← valhala_22 left	15:04
	← bgerber left	15:05
	→ kurkale6ka joined	15:05
	jstein_ → jstein	15:06
	← Cavallari left	15:06
	→ dreiss joined	15:06
	→ bgerber joined	15:06
	→ hagridaaron joined	15:06
guest3456	man im in trouble	15:07
	if i delete that corrupt object	15:07
	then it says fatal bad object HEAD	15:07
	can i recover this repo?	15:07
	← Trendrrr left	15:07
guest3456	very angry at myself for not pushing to remote	15:08
	← shodan` left	15:08
	→ dimi1947 joined	15:08
	→ TbobbyZ joined	15:08
	← kurkale61 left	15:08
	→ re1 joined	15:08
trent_	guest3456: I would say reset --hard HEAD for any fuckups	15:08
RichiH	guest3456: first: make one or three backup copies	15:08
	cp -a or rsync recommended	15:08
guest3456	the repo is corrupt	15:08
	← ertes-w left	15:09
guest3456	VM crashed and now i'm getting errors	15:09
RichiH	after that, there's a few tools to recover git repos	15:09
	→ Trendrrr joined	15:09
RichiH	it smells as if you have large part of the repo off-site and mainly care about HEAD, not so much about the commits in between	15:09
guest3456	i have most of the older commits pushed to gitlab	15:10
	i have maybe 10 commits locally that i need	15:10
trent_	some git rebase could help	15:10
	→ basiclaser joined	15:10
guest3456	i cant checkout to master or even do git status	15:10
	it keeps saying inflate data stream error, loose object corrupt	15:11
	← hotpanca_ left	15:11
	→ _joes____ joined	15:11
trent_	google every error message you come across and try to figure it tout	15:11
czart__	trent_: Yeah, I've read this website before. Oh, I can put the "initial setting" into "no-interactive-login" file. Thanks, I had this flash!	15:12
	→ chandu20 joined	15:12
guest3456	i did trent_	15:12
	i found this	15:12
	https://stackoverflow.com/questions/23725925/git-repository-corrupt-incorrect-header-check-loose-object-is-corrupt	15:12
	but he just deleted the files	15:12
	when i deleted it, then i get fatal bad object HEAD error	15:12
trent_	czart__: you're welcome	15:12
czart__	trent_: :)	15:12
	← livingstn left	15:13
	← mischat_ left	15:14
	→ hotpancakes joined	15:14
	→ mkru joined	15:15
	← Trendrrr left	15:15
	← manuelschneid3r left	15:15
	→ cyberz joined	15:15
	→ cdg joined	15:16
	→ mischat joined	15:16
	→ Trendrrr joined	15:16
	← rohitpaulk left	15:17
	→ sz0 joined	15:17
	→ kurkale61 joined	15:18
	← theoceaniscool left	15:20
	← kurkale6ka left	15:21
	← martybr left	15:21
trent_	.karma czart__	15:22
gitinfo	the karma of the given users is shrouded in the mists of uncertainty.	15:22
	→ martybr joined	15:22
	← freimatz3 left	15:22
trent_	mysterious	15:22
	← Trendrrr left	15:22
czart__	.karma trent	15:22
gitinfo	the karma of the given users is shrouded in the mists of uncertainty.	15:22
	← flaviodesousa left	15:22
trent_	:D	15:22
czart__	:)	15:22
	← hagridaaron left	15:23
	→ Trendrrr joined	15:24
	← martybr left	15:24
	→ martybr joined	15:24
	→ mentazoom joined	15:24
	→ Gurkenglas joined	15:26
	← tarkus left	15:26
	→ rmesta joined	15:26
	→ livingstn joined	15:26
	→ peacememories joined	15:27
	← docmur left	15:27
	← Trendrrr left	15:29
	→ hagridaaron joined	15:30
	→ Trendrrr joined	15:31
	→ mizu_no_oto joined	15:31
	← belmoussaoui left	15:31
	→ shodan` joined	15:31
	← rmesta left	15:33
	→ belmoussaoui joined	15:33
czart__	.karma czart	15:33
gitinfo	the karma of the given users is shrouded in the mists of uncertainty.	15:33
	← bgerber left	15:34
	→ MacWinner joined	15:34
	→ rmesta joined	15:34
	→ brent__ joined	15:35
	← peterppp left	15:36
	← Trendrrr left	15:37
	← Murii left	15:38
	→ Trendrrr joined	15:38
	→ Campbeld joined	15:39
	← belmoussaoui left	15:39
	→ Phylock joined	15:40
	→ belmoussaoui joined	15:40
	→ hobodave joined	15:41
	← hotpancakes left	15:41
	→ thiago joined	15:42
	→ bgerber joined	15:42
	← sweatsuit left	15:43
	← mkru left	15:44
	← wandering_vagran left	15:44
	→ cdg_ joined	15:44
	→ sweatsuit joined	15:45
	→ peepsalot joined	15:46
	← Campbeld left	15:46
	→ not-an-aardvark joined	15:47
	← cdg left	15:47
	← sondr3 left	15:48
	→ imack joined	15:49
	→ hotpancakes joined	15:49
	← Trendrrr left	15:50
	→ Trendrrr joined	15:51
	→ agd joined	15:51
	← bauruine left	15:51
	→ madewokherd joined	15:51
	agd → Guest21059	15:52
	← onehrxn left	15:52
	→ LiquidatorBrunt joined	15:52
LiquidatorBrunt	sup my git dawgs!	15:52
	→ kurkale6ka joined	15:53
LiquidatorBrunt	question: how do i best go about getting bug fix changes into a development branch? i made the bug fixes to master. do i create a third branch and then merge that into the dev branch?	15:54
	← nickel_dime_look left	15:54
	→ bauruine joined	15:54
	← kurkale61 left	15:54
cjohnson	You want to refresh the development branch to be up to date from master?	15:55
	you can just merge master into development	15:55
	You could also rebase master depending on whether it's safe to rewrite history in development or not	15:55
LiquidatorBrunt	aye	15:55
cjohnson	it would keep commit history clean	15:55
	← belzebite left	15:56
	→ kurkale61 joined	15:56
	→ rohitpaulk joined	15:58
	← kurkale6ka left	15:59
	← Trendrrr left	16:00
	← belmoussaoui left	16:01
	→ belmoussaoui joined	16:01
	→ c0ded joined	16:01
	→ Trendrrr joined	16:01
	← Silox\| left	16:01
LiquidatorBrunt	cjohnson: yeah merge seems the way to go. thanks bud	16:02
	← watabou left	16:02
	→ King_Hual joined	16:02
	→ orbyt_ joined	16:04
	← ResidentBiscuit left	16:04
	← hotpancakes left	16:04
	← Wysi left	16:05
	→ hotpancakes joined	16:05
	← King_Hual left	16:06
	← c0ded left	16:06
	← rohitpaulk left	16:07
	→ ecuanaso joined	16:07
	← fission6 left	16:07
	→ King_Hual joined	16:08
	→ Murii joined	16:08
	← shodan` left	16:08
	→ kpease joined	16:09
	← duderonomy left	16:09
	→ onehrxn joined	16:10
	→ dsdeiz joined	16:11
	← dsdeiz left	16:11
	→ dsdeiz joined	16:11
	← bilb_ono left	16:11
	→ Tantamounter joined	16:12
Tantamounter	How can I ignore the "gpg: signing failed: No secret key" error when mass reindexing with filter-branch?	16:12
	I want to resign the commits I have keys for but ignore the ones I do not	16:12
	→ svm_invictvs joined	16:13
	→ h12o joined	16:14
	→ anli joined	16:14
anli	If I create a mirror on github of a repo from another git provider, and another person has created a mirror before of the same project, will I just add id:s to github, pointing at already uploaded files?	16:15
	→ nitric joined	16:15
	← dsdeiz left	16:15
	← rmesta left	16:15
	→ rmesta joined	16:16
	→ rocktop_ joined	16:16
	← rmesta left	16:16
	← rocktop_ left	16:16
thiago	Tantamounter: you can determine if you have the key before trying to sign. If you don't have the secret key for that, don't try to sign.	16:16
	→ rmesta joined	16:16
Tantamounter	What	16:16
	I am mass rewriting the history with `git filter-branch`	16:17
grawity	hmm	16:17
thiago	right	16:17
	← rmesta left	16:17
Tantamounter	So I don't get to "choose" whether I sign	16:17
grawity	"I want to resign the commits I have keys for" – does filter-branch actually work that way?	16:17
Tantamounter	I either sign every commit or none of them	16:17
grawity	I thought it always signs using the default key	16:17
	→ YuGiOhJCJ joined	16:17
thiago	then why don't you sign them all with the same key	16:17
	→ rmesta joined	16:17
thiago	filter-branch may be trying to sign with the same key of the commit that is being rewritten	16:18
	← rmesta left	16:18
	→ rmesta joined	16:18
Tantamounter	It signs based on the email address of the commit	16:18
thiago	are all the emails yours?	16:18
Tantamounter	But obviously I don't have a key for [email@hidden.address]	16:18
	← mischat left	16:18
thiago	do all the emails have a matching secret key identity?	16:18
	← rmesta left	16:19
thiago	then either override the key for those commits or don't sign them	16:19
	→ rmesta joined	16:19
	→ dpl joined	16:19
	→ mischat joined	16:19
	← rmesta left	16:19
	← rocktop left	16:20
	→ rmesta joined	16:20
Tantamounter	I don't know how to selectively not sign them	16:20
	It tries to sign them all	16:20
	Or none at all	16:20
	← rmesta left	16:20
Tantamounter	I just want to sign the ones I have a key for	16:20
	→ rmesta joined	16:20
	← rmesta left	16:21
	→ rmesta joined	16:21
	← rmesta left	16:22
	→ rohitpaulk joined	16:22
	→ rmesta joined	16:22
thiago	sorry, I've never used filter-branch with signed commits	16:22
	← mrkake left	16:22
	← rmesta left	16:23
	→ bilb_ono joined	16:23
Tantamounter	I can tell	16:23
	← onehrxn left	16:23
	← Trendrrr left	16:23
	← mischat left	16:23
thiago	not sure many people have	16:23
	→ Trendrrr joined	16:25
	→ roelmonnens joined	16:26
	→ kadoban joined	16:26
	→ onehrxn joined	16:26
Tantamounter	Feels bad man	16:26
	→ GT4066 joined	16:27
	← Chuguniy left	16:27
	→ mrkake joined	16:27
	← roelmonnens left	16:31
	→ aruns joined	16:31
	← hotpancakes left	16:31
	→ hotpancakes joined	16:31
	← kurkale61 left	16:33
	← aruns__ left	16:33
	← brent__ left	16:33
	→ brent__ joined	16:34
	→ onehrxn_ joined	16:35
	← thiago left	16:36
	← Trendrrr left	16:37
	← Tantamounter left	16:37
	→ itseris joined	16:38
	← hotpancakes left	16:38
	← brent__ left	16:38
	← onehrxn left	16:38
	→ Trendrrr joined	16:38
	→ onehrxn joined	16:39
	← rohitpaulk left	16:40
	← iw1042 left	16:40
	← se1_ left	16:41
	← onehrxn_ left	16:41
	→ Sythrik joined	16:42
	→ MineCoins joined	16:42
	← KeyJoo left	16:46
	→ roygbiv joined	16:46
	← meLon left	16:46
	← hagridaaron left	16:46
	→ sondr3 joined	16:46
	→ Lauven joined	16:46
	→ meLon joined	16:46
	← _ADN_ left	16:47
	← Trendrrr left	16:47
	→ onehrxn_ joined	16:47
	→ peterbecich joined	16:48
	→ Trendrrr joined	16:48
	→ hotpancakes joined	16:48
	→ HardlySeen joined	16:49
	← Soni left	16:49
	→ venmx joined	16:49
	← jamick left	16:49
	← chandu20 left	16:49
	← Trendrrr left	16:50
	← onehrxn left	16:50
	← hotpancakes left	16:51
	→ thebope joined	16:51
	→ Trendrrr joined	16:51
	← thebope left	16:52
	→ SegFaultAX joined	16:52
	→ hotpancakes joined	16:52
	→ roygbiv_ joined	16:53
	← synthroid left	16:53
	← venmx left	16:53
	← roygbiv left	16:55
	← lordjancso left	16:56
	← hotpancakes left	16:57
anli	Is git snapshot based or are diffs stored for text files?	16:57
grawity	it's mainly the former, although the individual snapshots do get delta-compressed at the lowest storage layer	16:58
_ikke_	conceptually git is snapshot based	16:58
anli	If I change one char in a text file, I thought up to now that a new file would be stored	16:59
grawity	a new object does get stored for that – if it hasn't been stored before	16:59
_ikke_	correct	16:59
	→ hagridaaron joined	16:59
anli	That is beside the point, the important thing is here how it is stored	16:59
	→ peterbec` joined	17:00
anli	I understand that you want me to think conceptually about it	17:00
	→ CarlFK joined	17:00
	→ freimatz joined	17:00
grawity	how so? usually that's the least important thing when working with Git	17:00
anli	Well, I asked it :)	17:00
_ikke_	initially, git stores it as separate blobs, but git regular packs and compresses them	17:00
	→ rohitpaulk joined	17:00
	← hagridaaron left	17:00
anli	svn has to "play" the repo from the beginning if I check out a node in the middle of the graph, git seems to work instantly	17:01
	← MineCoins left	17:01
CarlFK	git blame shows me 3872c802 ... how do I see the diff? (or the last few changes to a given file)	17:01
	→ hosttor joined	17:01
_ikke_	anli: correct, git does not need to replay commits, each commit is a complete snapshot	17:01
	CarlFK: git show 3872c802	17:02
grawity	anli: the difference is that the storage layer is completely separate from Git as the VCS itself	17:02
	← g5pw left	17:02
CarlFK	_ikke_: boom. thank you	17:02
	← Trendrrr left	17:02
	← bgerber left	17:02
	← dijit[m] left	17:02
	← _flow_ left	17:02
	→ stoopkid joined	17:02
grawity	anli: so even if you have a delta-compressed packfile, it is not stored anything like svn, oldest -> deltas -> latest	17:02
	← DogHackit left	17:02
	→ hotpancakes joined	17:02
	← AndrewAlexMac left	17:03
	→ ZexaronS-2 joined	17:03
	← ZexaronS-2 left	17:03
	← dimi1947 left	17:03
anli	I assume that the storage layer cannot have a very long "diff chain" of a file, because then checking out a commit would take considerably longer time	17:03
	→ hotpanca_ joined	17:03
grawity	instead it just packs objects which look the most similar, and only goes ... I think 8 layers deep?	17:03
	← dreiss left	17:03
	← ZexaronS left	17:03
grawity	ah, the default depth is 50	17:03
	→ DogHackit joined	17:03
	→ dijit[m] joined	17:04
	→ Trendrrr joined	17:04
anli	So after 50 diff steps a totaly copy is stored?	17:04
	→ g5pw joined	17:04
grawity	sort of – again, it is not related to the commit history in any way	17:04
	→ AndrewAlexMac joined	17:04
anli	The conclusion is that binary files that are changed often get a bigger foot print in the repo	17:05
	→ bgerber joined	17:05
	→ _flow_ joined	17:05
grawity	it's mostly that binary file formats just don't delta that well	17:05
	often due to already being compressed	17:05
	← peterbec` left	17:05
_ikke_	binary files can delta, but they often change much	17:06
	← overlord_tm left	17:06
grawity	sure, it depends on the format	17:06
anli	If there was a way to express the changes of a binary file in like 50 chars explanation, that could make git handle those binary files better then?	17:06
	→ peterbec` joined	17:06
	← trent_ left	17:07
anli	ok	17:07
grawity	e.g. if you have a text file that's a JSON dump of something	17:07
	← gxt left	17:07
	← hotpancakes left	17:07
	← peterbec` left	17:07
grawity	and the dumper outputs {a: foo, b: bar, c: baz} today, but {b: bar, c: baz, a: foo} tomorrow, and likewise differently every time, that also won't delta as well, despite being "text"	17:07
	anyway, to continue from above, that's why I'd say that Git is 99% snapshot-based, and 1% delta-based	17:08
_ikke_	note that git can delta any object against any other object	17:08
anli	This discussion comes from blend files (blender). Those files are big, actually they are text based, but I assume the storage of them is hard to optimize for git	17:08
_ikke_	it does not have to be the same file	17:08
grawity	because the two parts (commit history, and storage) are completely independent of each other	17:08
anli	So the git server is not aware of which files that are binary or not?	17:08
	← MurphSlaw left	17:08
anli	Well, maybe that was more a guess than a conclusion	17:09
grawity	as far as you can define a git "server", yes, it doesn't really care about that	17:09
	only whether it can find sufficiently similar objects	17:09
	→ joshszep joined	17:09
anli	A git server = a git repo with the possible network solution to use it	17:09
	hehe	17:09
	So I define my hard disk as a git server ;)	17:09
	→ hotpancakes joined	17:10
	← joshszep left	17:10
anli	Lets say repo then	17:10
grawity	you can tweak some knobs as described in `man git repack` and `man git pack-objects`	17:10
gitinfo	the git-repack manpage is available at https://gitirc.eu/git-repack.html	17:10
	the git-pack-objects manpage is available at https://gitirc.eu/git-pack-objects.html	17:10
	→ freddieptf joined	17:10
	→ lorenzh joined	17:10
grawity	they probably won't make the repo any smaller, but at least they might speed up repacks	17:10
	→ joshszep joined	17:11
anli	Is it possible to see how well the git repo managed to optimize the storage of files?	17:11
	← hotpanca_ left	17:11
anli	If the git repo only "compresses" files, finding patterns in other files, then it is not really diff based, so a person claiming its diff based is not totally correct (or incorrect then)	17:12
	→ blackwind_123 joined	17:12
grawity	right, I would never call it "diff"-based	17:12
	← Trendrrr left	17:12
	← crose left	17:13
grawity	not even close to the way cvs/svn work, at least	17:13
	→ Trendrrr joined	17:14
	← mizu_no_oto left	17:14
	← jeffreylevesque left	17:14
	→ nuran joined	17:14
	← hotpancakes left	17:15
	← ecuanaso left	17:15
	→ hotpancakes joined	17:16
	← QwertyDragon left	17:16
	→ QwertyDragon joined	17:16
	→ ecuanaso joined	17:17
	← QwertyDragon left	17:17
	← onehrxn_ left	17:17
	← hotpancakes left	17:18
	→ pwnz0r joined	17:18
	→ roygbiv joined	17:18
	→ hotpancakes joined	17:19
	→ hagridaaron joined	17:19
	→ fission6 joined	17:20
	← livingstn left	17:20
	← pbandark left	17:20
	← Trendrrr left	17:21
	→ ZexaronS joined	17:21
	→ misosoup joined	17:21
	← roygbiv_ left	17:21
	→ Trendrrr joined	17:22
	← blackwind_123 left	17:23
	→ SkyPatrol joined	17:24
	← itseris left	17:24
	→ thiago joined	17:24
	→ dreiss joined	17:24
	→ blackwind_123 joined	17:25
	→ lavenders1 joined	17:25
	← SkyPatrol_ left	17:25
	← CarlFK left	17:26
grawity	anli: hmm `git verify-pack -s <foo.pack>` might give some clue	17:27
	→ itseris joined	17:27
	→ ResidentBiscuit joined	17:27
	← sjohnson left	17:27
grawity	it shows the delta chain lengths	17:28
	← Murii left	17:28
anli	cool	17:28
grawity	also `git verify-pack -v <foo.pack> \| awk blah-blah-blah` could be used to calculate the "raw" object size	17:28
	divide the packfile's real size by that, and you get the compression efficiency	17:28
	best to do that on freshly repacked repo (git gc)	17:28
	→ pxs joined	17:29
	← hagridaaron left	17:29
	→ QwertyDragon joined	17:29
	→ sjohnson joined	17:31
	← Trendrrr left	17:31
	→ peterbec` joined	17:31
	→ Trendrrr joined	17:32
	→ livingstn joined	17:32
	← Forlorn left	17:33
	← hotpancakes left	17:34
	← ecuanaso left	17:35
	→ ecuanaso joined	17:38
	← Trendrrr left	17:38
	← basiclaser left	17:39
	→ Trendrrr joined	17:40
	← Hunter1 left	17:42
	→ Hunter1 joined	17:43
	→ lyxus joined	17:43
	← perlpilot left	17:44
	→ perlpilot joined	17:45
	→ overlord_tm joined	17:46
	← peterbec` left	17:46
	→ peterbec` joined	17:47
	← Trendrrr left	17:49
	→ duderonomy joined	17:49
	→ Trendrrr joined	17:50
	← pwnz0r left	17:52
	← rwp left	17:52
	→ brent__ joined	17:53
	→ c0ded joined	17:54
	← lyxus left	17:55
	← Trendrrr left	17:56
	← SCHAPiE left	17:57
	← fission6 left	17:57
	← not-an-aardvark left	17:57
	→ Trendrrr joined	17:58
	← roygbiv left	17:58
	← itseris left	17:59
	← c0ded left	17:59
	← orbyt_ left	18:00
	← Lauven left	18:01
	→ Sasazuka joined	18:01
	→ valhala_22 joined	18:01
	→ fission6 joined	18:01
	← mdbk left	18:02
	→ sbasso joined	18:02
	→ mdbk joined	18:02
	← cdg_ left	18:02
	→ SCHAPiE joined	18:03
	← hosttor left	18:04
	← fission6 left	18:04
	→ Atm0spher1c joined	18:05
	← ecuanaso left	18:05
	← valhala_22 left	18:06
	← Trendrrr left	18:06
	→ fission6 joined	18:06
	← Gsham left	18:07
	← geojunkieSCI left	18:07
	← freddieptf left	18:07
	→ Trendrrr joined	18:08
	→ hotpancakes joined	18:08
	→ Tobbi joined	18:09
	→ venmx joined	18:09
	→ geojunkieSCI joined	18:09
	→ TbobbyZ_ joined	18:10
	→ Brian__ joined	18:10
	← slidercrank left	18:10
	← Brian__ left	18:11
	→ mdbk_ joined	18:11
	← mdbk left	18:11
	→ dsdeiz joined	18:11
	← mdbk_ left	18:12
	→ mdbk_ joined	18:12
	← hotpancakes left	18:13
	← MacWinner left	18:13
	← TbobbyZ left	18:13
	→ hotpancakes joined	18:13
	→ v-y joined	18:14
	← thib left	18:14
	← TbobbyZ_ left	18:15
	← Trendrrr left	18:15
	→ orbyt_ joined	18:15
	← peterbecich left	18:15
	← peterbec` left	18:15
	→ cagedwisdom joined	18:16
	← dsdeiz left	18:16
	→ Trendrrr joined	18:17
	← dayid left	18:17
	→ nixjdm joined	18:17
	→ gopar joined	18:18
	← TheFuzzball left	18:19
	→ d10n-work joined	18:19
	← Tobbi left	18:20
	→ cdown_ joined	18:21
	→ xall joined	18:21
	→ elliot-777 joined	18:22
	← Trendrrr left	18:23
	→ peterbec` joined	18:23
	→ ecuanaso joined	18:23
	→ peterbecich joined	18:23
	→ dayid joined	18:23
	← cdown left	18:24
	cdown_ → cdown	18:24
	→ Trendrrr joined	18:24
	← elliot-777 left	18:25
	→ chandu20 joined	18:26
	← afuentes left	18:27
	→ afuentes joined	18:27
	← sunri5e left	18:27
	← gopar left	18:27
	→ gopar joined	18:28
	→ sunri5e joined	18:28
	→ thib joined	18:28
	← Sauvin left	18:31
	← livingstn left	18:32
	→ cdg joined	18:32
	← venmx left	18:32
	→ itseris joined	18:33
	← acetakwas left	18:33
	← ecuanaso left	18:34
	← hotpancakes left	18:35
	← Trendrrr left	18:35
	→ Trendrrr joined	18:36
	← sbasso left	18:37
	→ kroete joined	18:38
	→ livingstn joined	18:38
	← itseris left	18:40
	← bauruine left	18:40
	→ Es0teric joined	18:40
	← rohitpaulk left	18:40
	← thib left	18:41
	← Yondering left	18:41
	→ thib joined	18:42
	→ bauruine joined	18:43
	← Trendrrr left	18:44
	→ Yondering joined	18:44
	→ sbasso joined	18:45
	→ Trendrrr joined	18:46
	← cstratak left	18:49
	← Cabanossi left	18:49
	→ Cabanossi joined	18:50
	← dave0x6d left	18:51
	→ valhala_22 joined	18:51
	← mdbk_ left	18:51
	→ dviola joined	18:52
	← chandu20 left	18:52
	← belmoussaoui left	18:53
	← ZyX-I left	18:53
	← SteffanW left	18:54
	→ TbobbyZ joined	18:54
	→ star_prone joined	18:55
	← aidalgol left	18:55
	← waltervargas[m] left	18:55
	← dijit[m] left	18:55
	← aviraldg left	18:55
	← valhala_22 left	18:56
	← monomon[m] left	18:56
	→ valhala_22 joined	18:56
	← peacememories left	18:58
	→ roygbiv joined	18:58
	← swalladge[m] left	18:58
	← flo[m] left	18:59
	← heftig left	18:59
	← Remramm left	18:59
	← KevinMGranger left	18:59
	← UncleCJ left	18:59
	← dyce[m] left	18:59
	← dikiaap left	18:59
	← patrickr[m] left	18:59
	← dbn[m] left	18:59
	← reactormonk[m] left	18:59
	← logos[m] left	18:59
	← unclechu left	18:59
	← SpEcHiDe left	18:59
	← am2on left	18:59
	← Satchmo1[m] left	18:59
	← spinningarrow[m] left	18:59
	← hiq[m] left	19:00
	← jascot[m] left	19:00
	← deepakbn[m] left	19:00
	← M-meznak left	19:00
	← musicmatze[m] left	19:00
	← orbyt_ left	19:00
	← notebox left	19:00
	← db8093246 left	19:01
	← Trendrrr left	19:02
	← v-y left	19:02
	→ dsdeiz joined	19:02
	← dsdeiz left	19:02
	→ dsdeiz joined	19:02
	← incredible left	19:03
	→ imack_ joined	19:03
	→ theoceaniscool joined	19:03
	→ Trendrrr joined	19:03
	→ jesst joined	19:04
	← peterbecich left	19:04
	→ incredible joined	19:04
	← fission6 left	19:04
	← peterbec` left	19:04
	← imack left	19:05
	← imack_ left	19:07
	← dsdeiz left	19:07
	← pxs left	19:08
	← govg left	19:08
	→ govg joined	19:09
	Peetz0r → Peetsnor	19:11
	← cdg left	19:11
	→ dave0x6d joined	19:12
	→ aca20031 joined	19:12
	→ cdg joined	19:12
	← blackwind_123 left	19:13
	← xall left	19:13
	→ sbasso_ joined	19:13
	← sbasso_ left	19:13
	→ sbasso_ joined	19:14
	← sbasso left	19:14
	← jesst left	19:15
	← afuentes left	19:15
	← sz0 left	19:16
	← Trendrrr left	19:17
	→ peterbec` joined	19:18
	→ blackwind_123 joined	19:18
	← govg left	19:19
	→ Trendrrr joined	19:19
	→ govg joined	19:20
	← jstein left	19:20
	← nixjdm left	19:21
	← hobodave left	19:21
	← eshlox left	19:21
	→ Murr- joined	19:23
	← Murr left	19:25
	→ Tobbi joined	19:25
	→ Quetzal joined	19:25
	Quetzal → Tuxtoriel	19:25
	→ jakew joined	19:26
	← Trendrrr left	19:27
	← jakew left	19:27
	→ Trendrrr joined	19:28
	→ kvaz joined	19:30
	← lavenders1 left	19:30
	→ db8093246 joined	19:30
	← blackwind_123 left	19:30
	→ hobodave joined	19:31
	← Murr- left	19:31
	→ Murr joined	19:32
	→ blackwind_123 joined	19:33
	← lorenzh left	19:33
	→ rahtgaz joined	19:33
	→ nixjdm joined	19:34
	→ notadeveloper joined	19:35
	Peetsnor → Peetz0r	19:36
	← Trendrrr left	19:36
	← Tobbi left	19:37
	→ paul424 joined	19:37
	← blackwind_123 left	19:38
	→ Trendrrr joined	19:38
	→ blackwind_123 joined	19:39
	← db8093246 left	19:39
	← bilb_ono left	19:40
	← rda-mac_ left	19:43
	→ hosttor joined	19:43
	→ rda-mac joined	19:44
	→ fission6 joined	19:44
	→ cdg_ joined	19:44
	← notadeveloper left	19:45
	→ anuxivm joined	19:46
	→ db8093246 joined	19:46
	← cdg left	19:47
	← gopar left	19:47
	← Trendrrr left	19:48
	→ invisbl joined	19:48
	→ gopar joined	19:48
	→ Trendrrr joined	19:49
	→ jnavila joined	19:49
	ec → purr	19:51
	purr → elliottcable	19:51
	→ lafleurdubien joined	19:52
	← scoobertron left	19:52
	→ Heros2050 joined	19:52
	← Heros2050 left	19:53
	← cata-doxas left	19:55
	→ lavenders1 joined	19:55
	← db8093246 left	19:57
	→ sbeller joined	19:57
	→ jrnieder joined	19:57
	→ bilb_ono joined	19:57
	← gopar left	19:58
	→ scoobertron joined	19:58
	→ c0ded joined	19:58
	→ gopar joined	19:59
	← peepsalot left	19:59
	← Trendrrr left	19:59
	→ cata-doxas joined	20:00
	→ Trendrrr joined	20:00
	← ResidentBiscuit left	20:02
	← c0ded left	20:03
	← Cabanossi left	20:04
	→ Cabanossi joined	20:05
	← beerdrop left	20:05
	→ orbyt_ joined	20:05
	← Gurkenglas left	20:05
	← blackwind_123 left	20:06
	→ allstar joined	20:06
	← Trendrrr left	20:07
	← allstar left	20:07
	→ blackwind_123 joined	20:08
	→ Trendrrr joined	20:08
	← cata-doxas left	20:08
	← roygbiv left	20:08
	← grawity left	20:10
	→ grawity joined	20:11
	← svm_invictvs left	20:11
	→ gruetzkopf joined	20:11
	→ cata-doxas joined	20:11
	← bauruine left	20:12
	→ ResidentBiscuit joined	20:12
	→ peterbecich joined	20:13
	← blackwind_123 left	20:13
	← Ryanar left	20:13
	→ bauruine joined	20:13
	→ blackwind_123 joined	20:14
	→ eshlox joined	20:15
	→ beerdrop joined	20:16
	→ nilg joined	20:17
	← Trendrrr left	20:17
	← Darcidride left	20:18
	→ KeyJoo joined	20:18
	← peterbecich left	20:18
	→ Trendrrr joined	20:19
	→ Tobbi joined	20:19
	← nixjdm left	20:21
	← blackwind_123 left	20:21
	← dermoth left	20:22
	← j08nY left	20:22
	→ HcsOmot joined	20:23
	← Fallen0223 left	20:23
	→ filcab joined	20:24
	Tuxtoriel → Quetzal2	20:24
	← ssarah left	20:24
	→ mostlybadfly joined	20:25
	← paul424 left	20:25
	→ big_area joined	20:25
	← Trendrrr left	20:26
	← monokrome left	20:27
	→ Trendrrr joined	20:27
	→ monokrome joined	20:27
	← monokrome left	20:27
	→ monokrome joined	20:28
HcsOmot	hi, I need some help/advice on branching. I've created a branch feature1 based of master. Started working, then realized that in order to finish the work for this feature, I need to do some other work, that doesn't actually belong on this branch because it's not really part of this feature, but something that's missing from master that hasn't been implemented yet. What's the best way to handle this? Should I create a branch add_missing	20:29
	→ Murii joined	20:29
	→ dermoth joined	20:29
	← lavenders1 left	20:29
HcsOmot	then what? merge that missing stuff into master? or just merge it into feature1? or rebase feature1 with master, after merging missing work to master?	20:30
	← gopar left	20:30
tang^	you could do add_missing based off master, merge it into master when done, rebase feature1 off master after that merge	20:30
HcsOmot	or should I rebase feature1 with missing_work branch?	20:30
	→ gopar joined	20:31
thiago	I'd simply check out master, add the missing things there, then rebase branch1 on top of that.	20:31
	→ notebox joined	20:32
	→ jstein_ joined	20:32
	← HardlySeen left	20:33
HcsOmot	I'm not suppose to add anything to master. all additions should be on their own branches, create a PR on upstream, and after lead approves/reviews, it gets merged.	20:33
	→ nixjdm joined	20:33
HcsOmot	then I rebase my origin master based on upstream master.	20:34
	so how do I best handle this?	20:34
	→ hobodave_ joined	20:34
	jstein_ → jstein	20:35
tang^	hmm, then you probably do want to rebase feature1 off missing_stuff	20:35
thiago	McKraken: your master is not the upstream's master	20:35
	← Trendrrr left	20:35
thiago	you can add whatever you want to master. It won't affect anyone else.	20:36
	← hobodave left	20:36
thiago	but if you prefer to work on a separate branch, then create one off master, do the work, the rebase branch1 on top of that (if you need the new feature)	20:36
HcsOmot	so, i check out missing_stuff based off master, implement, then check out feature1 and rebase from missing_stuff?	20:36
	yes, I need missing_stuff in order to finish feature1	20:37
	great, thank you	20:37
	→ hagridaaron joined	20:37
	← bilb_ono left	20:37
	→ Trendrrr joined	20:37
	→ themayor joined	20:37
thiago	you'll need to rebase --onto master once the missing stuff gets merged into master	20:38
	← hosttor left	20:38
	← ShapeShifter499 left	20:38
	← Tobbi left	20:39
	← hagridaaron left	20:40
	→ moth joined	20:40
HcsOmot	haven't used --unto yet. could you explain what that will do?	20:41
	→ charking joined	20:42
	→ ertes joined	20:42
	→ jaziz joined	20:42
	← star_prone left	20:43
	← charking left	20:43
	→ star_prone joined	20:44
	→ db8093246 joined	20:44
	→ hagridaaron joined	20:44
	← YuGiOhJCJ left	20:45
	← Trendrrr left	20:47
	← Quetzal2 left	20:47
qqx	--onto shouldn't be needed in there	20:48
	← db8093246 left	20:48
	← star_prone left	20:48
	← freimatz left	20:48
qqx	It's needed when you want to specify a different destination to rebase onto than the original base. But in the case being discussed I'd expect both of those to be `master`.	20:48
	← dermoth left	20:49
	→ Trendrrr joined	20:49
qqx	HcsOmot: It would be something like `git rebase --onto master dev` to take the commits in the current branch that aren't in 'dev', and apply them on top of master.	20:50
HcsOmot	dev being feature1 branch, which is missing stuff, and current branch being add_missing_stuff?	20:51
	→ Raging_Hog joined	20:52
	← Dougie187 left	20:52
	← cagedwisdom left	20:52
	→ tunekey joined	20:54
	→ irqq_ joined	20:55
	← Trendrrr left	20:55
	→ josgalo joined	20:55
	← irqq left	20:55
	→ Trendrrr joined	20:56
	← jnavila left	20:56
	→ shodan` joined	20:57
	← hagridaaron left	20:58
qqx	HcsOmot: In that example, the feature1 branch would be the currently checked out branch and not named in the command.	20:58
	No real equivalent for the dev branch I used in the example.	20:58
	If you do the rebase after add_missing_stuff is rebased onto master, you should be able to just use `git rebase master`. It defaults to using the named branch as the --onto branch.	20:59
	→ irqq joined	20:59
	→ rumble joined	20:59
	← bauruine left	20:59
qqx	If you instead want to do the rebase before the merge into master you could do `git rebase add_missing_stuff`. It should automatically be able to figure out the original base.	21:00
	So in either case the --onto option shouldn't be needed.	21:00
	In my original example 'dev' would be something that was built onto master, and the rebase would be moving a series from being based on dev to basing it on master, without including previous work from the 'dev' branch.	21:01
	← irqq_ left	21:02
	grumble → Guest77353	21:03
	← Guest77353 left	21:03
	rumble → grumble	21:03
qqx	s/build onto/built ontop of/	21:03
	→ dsdeiz joined	21:03
	← dsdeiz left	21:03
	→ dsdeiz joined	21:03
	← Cabanossi left	21:03
	→ kasual joined	21:04
	← AaronMT left	21:05
	→ Cabanossi joined	21:05
	← Trendrrr left	21:05
	← Raging_Hog left	21:05
	← d10n-work left	21:05
	→ cagedwisdom joined	21:06
	→ Trendrrr joined	21:06
HcsOmot	thank you	21:06
	→ bauruine joined	21:07
	← dpl left	21:07
	← dsdeiz left	21:08
	← rda-mac left	21:09
	← Trendrrr left	21:12
	→ cis_admin joined	21:13
	← cis_admin left	21:13
	← nilg left	21:13
	← valhala_22 left	21:13
	→ peterbecich joined	21:14
	→ Trendrrr joined	21:14
	← sbasso_ left	21:15
	→ sbasso joined	21:16
	→ ZyX-I joined	21:16
	← sjohnson left	21:17
	← cdown left	21:17
	→ cdown joined	21:17
	← kvaz left	21:17
	→ hagridaaron joined	21:17
	← peterbecich left	21:18
	→ JanC_ joined	21:19
	← fission6 left	21:19
	JanC → Guest55726	21:20
	← Guest55726 left	21:21
	JanC_ → JanC	21:21
	← sbasso left	21:21
	← nixjdm left	21:21
	→ svm_invictvs joined	21:21
	→ sjohnson joined	21:21
	← Trendrrr left	21:23
	← theoceaniscool left	21:24
	→ fission6 joined	21:24
	← Es0teric left	21:24
	→ Trendrrr joined	21:24
	← ExoUNX left	21:26
	← shodan` left	21:27
	← kasual left	21:28
	← thiago left	21:28
	→ jimmyrcom_ joined	21:28
	← iatkotep left	21:29
	← schleppel left	21:29
	← m4sk1n left	21:29
	← josgalo left	21:29
	← aruns left	21:29
	→ iatkotep joined	21:30
	← gopar left	21:30
	← rahtgaz left	21:30
	→ gopar joined	21:31
	← Trendrrr left	21:31
	→ askb joined	21:32
	→ d10n-work joined	21:32
	→ ecuanaso joined	21:32
	→ Trendrrr joined	21:33
	→ monomon[m] joined	21:33
	→ nixjdm joined	21:34
	← hobodave_ left	21:34
	← hhee left	21:35
	← ZyX-I left	21:35
	← gopar left	21:37
	← Rhonda left	21:37
	→ gopar joined	21:37
	← bauruine left	21:38
	→ mvensky joined	21:38
	← fission6 left	21:38
	← Trendrrr left	21:39
	→ kasual joined	21:40
	← jimmyrcom_ left	21:40
	← orbyt_ left	21:40
	→ Trendrrr joined	21:41
	→ Rhonda joined	21:41
	→ ski4x7 joined	21:41
	← ski4x7 left	21:42
	← kasual left	21:42
	→ kvaz joined	21:43
	→ xaxxon joined	21:43
	← ski7777 left	21:43
	→ ski4x7 joined	21:43
	← gopar left	21:43
	← Gustavo6046 left	21:43
	← ecuanaso left	21:44
	→ gopar joined	21:44
	→ Gustavo6046 joined	21:44
	→ c0ded joined	21:45
	→ bauruine joined	21:46
	→ hhee joined	21:46
	← ski4x7 left	21:46
	→ SkyPatrol_ joined	21:46
	← Trendrrr left	21:46
	→ ski7777 joined	21:47
	→ buffal0 joined	21:48
	→ Trendrrr joined	21:48
	← SkyPatrol left	21:48
	→ fission6 joined	21:49
	← ansimation left	21:49
	← robotroll left	21:49
	← def_jam left	21:50
	← eblip left	21:50
	← c0ded left	21:50
	← Murii left	21:51
	← ResidentBiscuit left	21:51
	→ eblip joined	21:52
	→ def_jam joined	21:52
	→ orbyt_ joined	21:52
	← gopar left	21:52
	→ felGru joined	21:53
	← blocky left	21:53
	→ gopar joined	21:53
	← hagridaaron left	21:53
	← stoopkid left	21:54
	← King_Hual left	21:56
	← netj left	21:56
	→ valhala_22 joined	21:56
	→ netj joined	21:56
	→ blocky joined	21:56
	→ hagridaaron joined	21:56
	← moth left	21:57
	← Phylock left	21:58
	← hagridaaron left	21:58
	→ reactormonk[m] joined	21:59
	→ patrickr[m] joined	21:59
	→ dbn[m] joined	21:59
	→ jascot[m] joined	21:59
	→ UncleCJ joined	21:59
	→ flo[m] joined	21:59
	→ hiq[m] joined	21:59
	→ unclechu joined	21:59
	→ waltervargas[m] joined	21:59
	→ heftig joined	21:59
	→ spinningarrow[m] joined	21:59
	→ logos[m] joined	21:59
	→ dyce[m] joined	21:59
	→ dikiaap joined	21:59
	→ M-meznak joined	21:59
	→ deepakbn[m] joined	21:59
	→ Guest85918 joined	21:59
	→ am2on joined	21:59
	→ aviraldg joined	21:59
	→ swalladge[m] joined	21:59
	→ SpEcHiDe joined	21:59
	→ Remramm joined	21:59
	→ musicmatze[m] joined	21:59
	→ KevinMGranger joined	21:59
	→ Satchmo1[m] joined	21:59
	→ dijit[m] joined	21:59
	← mentoc left	21:59
	← Trendrrr left	22:01
	→ Trendrrr joined	22:02
	← Cabanossi left	22:03
	← Guest85918 left	22:03
	→ Guest85918 joined	22:03
	← gopar left	22:03
	→ moth joined	22:03
	← kvaz left	22:04
	→ gopar joined	22:04
	→ Cabanossi joined	22:05
	→ ecuanaso joined	22:05
	← joshszep left	22:05
	→ joshszep joined	22:05
	← iatkotep left	22:06
	← GT4066 left	22:06
	→ robotroll joined	22:08
	→ SkyPatrol joined	22:09
	← guampa left	22:09
	→ NeXTSUN joined	22:10
	← Trendrrr left	22:10
	← joshszep left	22:10
	← SkyPatrol_ left	22:11
	→ Trendrrr joined	22:11
	← nixjdm left	22:12
	→ Tobbi joined	22:12
	← robotroll left	22:12
	→ thiago joined	22:12
	→ donught joined	22:12
	← donught left	22:13
	→ donught joined	22:13
	← konsolebox left	22:14
	→ peterbecich joined	22:15
	← xaxxon left	22:16
	← fission6 left	22:16
	← dege left	22:17
	← fees left	22:17
	← svm_invictvs left	22:17
	← valhala_22 left	22:19
	← peterbecich left	22:19
	← Trendrrr left	22:19
	← felGru left	22:19
	→ Guest58013 joined	22:20
	← Guest58013 left	22:20
	→ Guest58013 joined	22:20
	→ konsolebox joined	22:21
	→ Trendrrr joined	22:21
	→ safe joined	22:21
	→ svm_invictvs joined	22:22
	← cdown left	22:23
	→ tourdownunder joined	22:23
	← geojunkieSCI left	22:23
	→ MattMaker joined	22:24
	← PioneerAxon left	22:24
	→ Campbeld joined	22:27
	→ BrokenCog joined	22:27
	← gargola left	22:28
BrokenCog	hellos. I have a simple question which I'm pretty sure google already told me ... If I have a dir tree: top/ which is where I did git init etc, when I'm in top/some/other/sub/dir ... and run git commands, they are all relative to /top, correct??	22:28
	← Campbeld left	22:29
BrokenCog	er, top/ not /top.	22:29
	← TomyLobo left	22:30
	→ SkyPatrol_ joined	22:31
	← cdg_ left	22:31
	← SkyPatrol left	22:32
	→ Trel joined	22:34
Trel	I have two repos, a backend and a gui, and I want to pull the current version of the branches into a directory (combined) without any .git files. Is there any easy way to do that?	22:34
	← ecuanaso left	22:37
	→ c0ded joined	22:38
	→ CheckDavid joined	22:38
	→ shodan` joined	22:39
	→ lindenle_ joined	22:40
	← NeXTSUN left	22:41
	→ v01t joined	22:42
	→ steeze joined	22:42
	← c0ded left	22:42
	← lindenle left	22:43
	← gopar left	22:44
	→ eb0t joined	22:44
	→ gopar joined	22:44
	← kpease left	22:44
	← cust left	22:45
	→ gopar_ joined	22:45
	→ eb0t_ joined	22:45
	← def_jam left	22:46
	← Trendrrr left	22:46
	← eblip left	22:46
	→ Trendrrr joined	22:47
	← jstein left	22:49
	← gopar left	22:49
	← livingstn left	22:50
	← brent__ left	22:51
	← gopar_ left	22:52
	← monokrome left	22:52
	← v01t left	22:52
	→ brent___ joined	22:53
	→ bitri joined	22:53
	→ venmx joined	22:55
	← Trendrrr left	22:55
	→ Trendrrr joined	22:56
	← brent___ left	22:58
	← shodan` left	22:58
	← timthowt- left	23:02
	← Tobbi left	23:02
	← Trel left	23:02
	← Trendrrr left	23:02
	← finalbeta left	23:03
big_area	exit	23:03
	→ Trendrrr joined	23:04
	← jaziz left	23:04
	← mostlybadfly left	23:04
	← bauruine left	23:05
	← buffal0 left	23:05
	→ belmoussaoui joined	23:06
	← dersand left	23:08
	→ NeXTSUN joined	23:08
	→ iatkotep joined	23:09
	← Trendrrr left	23:10
	→ sbasso joined	23:10
	→ bauruine joined	23:10
	→ thebardian joined	23:11
	→ circ-user-EhQEy joined	23:11
	← sjohnson left	23:11
	→ Trendrrr joined	23:11
	← netj left	23:13
	← hhee left	23:13
	→ hhee joined	23:14
	← thebardian left	23:16
	← oprypin left	23:16
	→ blr_ joined	23:16
	→ skirk joined	23:17
	→ Jackneilll joined	23:17
	→ oprypin joined	23:17
	→ Elephantenna joined	23:17
	→ mali_ joined	23:17
	→ sjohnson joined	23:17
	→ Gustavo6046_ joined	23:17
	← Gustavo6046 left	23:17
	Gustavo6046_ → Gustavo6046	23:17
	→ sequence_ joined	23:17
	→ thebardian joined	23:17
	→ tinanoo1 joined	23:18
	→ monjwf_ joined	23:18
	→ SkyPatrol joined	23:18
	→ ReenignE- joined	23:19
	← ReenignE- left	23:19
	→ ReenignE- joined	23:19
	→ puff` joined	23:19
	→ mehs joined	23:20
	→ d-fence__ joined	23:20
	→ musl_ joined	23:20
	← svm_invictvs left	23:21
	→ Mathiasd1 joined	23:21
	← SkyPatrol_ left	23:21
	← dave0x6d left	23:21
	→ spb_ joined	23:21
	← thebardian left	23:21
	→ plasticb1y joined	23:21
	→ cite joined	23:21
	→ catsup_ joined	23:21
	→ colona_ joined	23:21
	← sbasso left	23:21
	→ bratchle1 joined	23:21
	← hyperair left	23:21
	→ Renter_ joined	23:21
	→ hyperair joined	23:21
	→ FabTG joined	23:21
	Peetz0r → pochenk	23:21
	→ vals_ joined	23:21
	→ pigeon_ joined	23:21
	→ tazle__ joined	23:21
	← jagob left	23:22
	→ BooK_ joined	23:22
	→ pypypypypy joined	23:22
	→ sbasso joined	23:22
	← PaulCapestany left	23:22
	← circ-user-EhQEy left	23:22
	→ cyberzeus_ joined	23:22
	→ ejnahc_ joined	23:22
	→ immae_ joined	23:22
	→ thebardian joined	23:22
	← Trendrrr left	23:22
	→ LovesTha joined	23:24
	→ c0ded joined	23:24
	→ lep2 joined	23:24
	→ preaction_ joined	23:24
	→ Trendrrr joined	23:24
	→ strayArc- joined	23:25
	→ mniip_ joined	23:25
	→ ojacobson_ joined	23:25
	→ tomaw\| joined	23:25
	→ jerrcs_ joined	23:25
	→ dan2k3k5 joined	23:25
	→ RickyB98\|BNC joined	23:25
	→ pks_ joined	23:25
	→ as_g5pw joined	23:25
	→ Afforess joined	23:25
	→ svm_invictvs joined	23:25
	→ thekingo- joined	23:26
	→ musca` joined	23:26
	→ suigeneris joined	23:26
	→ zululee_ joined	23:26
	← Trendrrr left	23:26
	→ naf_ joined	23:26
	← belmoussaoui left	23:26
	← dayid left	23:26
	← g5pw left	23:26
	← cyberz left	23:26
	← pks left	23:26
	← str left	23:26
	← garyserj left	23:26
	← d^sh left	23:26
	← Danzeel left	23:26
	← monjwf left	23:26
	← leeN left	23:26
	← HElephant left	23:26
	← nd left	23:26
	← causasui left	23:26
	← tinanoo left	23:26
	← RickyB98 left	23:26
	← zxd left	23:26
	← Jackneill left	23:26
	← blr left	23:26
	← naf left	23:26
	← pigeon left	23:26
	← stutter left	23:26
	← catsup left	23:26
	← strayArch left	23:26
	← ojacobson left	23:26
	← pypypypy1y left	23:26
	← mehs_ left	23:26
	← ReenignE left	23:26
	← leprechau left	23:26
	← dan2k3k4 left	23:26
	← ejnahc left	23:26
	← f0rks left	23:26
	← computerex left	23:26
	← scorphus` left	23:26
	← fibo_mach left	23:26
	← sentriz left	23:26
	← Afforess_ left	23:26
	← LovesTha- left	23:26
	← StuartMI left	23:26
	← tango_ left	23:26
	← austin987 left	23:26
	← jerrcs left	23:26
	← groundnuty left	23:26
	← skalpin left	23:26
	← tazle_ left	23:26
	← cyberzeus left	23:26
	← d-fence left	23:26
	← umbSublime left	23:26
	← puff left	23:26
	← zululee left	23:26
	← nicoulaj46 left	23:26
	← immae left	23:26
	← Mathiasdm left	23:26
	← musl left	23:26
	← Sandlayth left	23:26
	← Daviey left	23:26
	← Loomaanaatii left	23:26
	← Kartagis left	23:26
	← mniip left	23:26
	← Dyonisos left	23:26
	← cite_ left	23:26
	← spb left	23:26
	← blueyed left	23:26
	← musca left	23:26
	← Renter left	23:26
	← sequence left	23:26
	← xyphoid_ left	23:26
	jerrcs_ → jerrcs	23:26
	spb_ → spb	23:26
	preaction_ → preaction	23:26
	as_g5pw → g5pw	23:26
	pks_ → pks	23:26
	→ garyserj joined	23:26
	→ d^sh joined	23:26
	→ skalpin joined	23:26
	← sbasso left	23:26
	→ austin987 joined	23:26
	→ blueyed joined	23:27
	→ Loomaanaatii joined	23:27
	→ fibo_mach joined	23:27
	pochenk → Peetz0r	23:27
	→ nevyn joined	23:27
	← c0ded left	23:27
	→ xyphoid joined	23:27
	→ c0ded joined	23:27
	→ cust joined	23:27
	→ leeN joined	23:27
	→ groundnuty joined	23:27
	→ causasui joined	23:28
	→ sentriz joined	23:28
	← aivkiv left	23:28
	← nanga left	23:28
	← troyt_ left	23:28
	← nuck left	23:28
	→ umbSublime joined	23:28
	← umbSublime left	23:28
	→ umbSublime joined	23:28
	← steven left	23:28
	→ Sandlayth joined	23:28
	→ Squarism joined	23:28
	← zyxep left	23:28
	→ Daviey joined	23:28
	→ Trendrrr joined	23:29
	← Trendrrr left	23:29
	→ Trendrrr joined	23:29
	→ nanga joined	23:29
	← nanga left	23:29
	→ nanga joined	23:29
	← Trendrrr left	23:29
	→ troyt joined	23:30
	→ aivkiv joined	23:30
	→ zyxep joined	23:30
	→ steven joined	23:30
	→ shodan` joined	23:30
	→ Trendrrr joined	23:30
	← Trendrrr left	23:30
	→ s17 joined	23:31
	→ str joined	23:31
	→ cyberz joined	23:31
	→ Dyonisos joined	23:31
	→ belmoussaoui joined	23:31
	→ nd joined	23:31
	→ caffeinatedcode joined	23:31
	→ Trendrrr joined	23:31
	→ dayid joined	23:31
	← Trendrrr left	23:31
	← caffeinatedcode left	23:32
	→ caffeinatedcode joined	23:32
	← Dyonisos left	23:32
	→ Dyonisos joined	23:32
	← c0ded left	23:32
	← HcsOmot left	23:33
	→ Trendrrr joined	23:33
	→ michael_mbp joined	23:34
	← donught left	23:35
	← NeXTSUN left	23:36
	← thebardian left	23:36
	→ YuGiOhJCJ joined	23:36
	← anuxivm left	23:37
	→ brent__ joined	23:38
	→ nuck joined	23:38
	→ watabou joined	23:38
	← phinxy left	23:39
	→ pwnz0r joined	23:39
	← svm_invictvs left	23:39
	← orbyt_ left	23:39
	→ Rotaerk joined	23:40
	← brent__ left	23:42
	→ zxd joined	23:42
	→ eehackr joined	23:43
	→ SkyPatrol_ joined	23:44
	→ orbyt_ joined	23:44
	→ rmesta joined	23:46
	← SkyPatrol left	23:47
	← Trendrrr left	23:47
	→ Trendrrr joined	23:49
	← nitric left	23:49
	← hhee left	23:50
	← iatkotep left	23:50
	ReenignE- → ReenignE	23:51
	→ iatkotep joined	23:51
	← perrier-jouet left	23:53
	→ c0ded joined	23:55
	→ Bhootrk_ joined	23:55
	→ monokrome joined	23:55
	→ fission6 joined	23:56
	← Trendrrr left	23:56
	← iatkotep left	23:57
	→ Trendrrr joined	23:58

Logs Search ←Prev date Next date→

Channels Documentation