IRCloggy #git 2018-03-01

Provider of IRC logs since 2005.

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

	2018-03-01
	← weez17 left	00:00
	→ XDS2010\|AFK joined	00:00
	→ weez17 joined	00:00
	← cssko left	00:01
	← XDS2010\|AFK left	00:01
	→ weijin joined	00:01
	← hahuang65 left	00:01
	← anjen left	00:01
	→ dendazen joined	00:02
	→ hahuang65 joined	00:02
	→ cssko joined	00:03
	← dendazen left	00:04
	← exotime left	00:04
	← polyzen left	00:04
	← finalbeta left	00:04
	→ exotime joined	00:04
	← pandem left	00:04
	← orbyt_ left	00:05
	→ XDS2010\|AFK joined	00:05
	→ pandem joined	00:05
	← weijin left	00:05
	← ephemer0l left	00:06
	← XDS2010\|AFK left	00:06
	→ dmc joined	00:06
	← Guest6236 left	00:06
	← BlessJah left	00:08
	← texinwien_ left	00:08
	← __rob left	00:08
	→ texinwien_ joined	00:08
	→ dsdeiz_ joined	00:09
	→ orbyt_ joined	00:12
	→ DanielKarp joined	00:12
	→ XDS2010\|AFK joined	00:12
	← dsdeiz_ left	00:13
	← thiago left	00:13
	← XDS2010\|AFK left	00:13
	← DanielKarp left	00:13
snappy	if I do a `git diff master` from a branch i get a huge list of changes. I want to selectively import some changes (ala git add -p) from master into my branch, is there some kind of way to do this from the diff?	00:14
	← wrouesnel_ left	00:15
	← prsn left	00:15
	← ewitz left	00:16
	→ w0ng joined	00:16
	→ wrouesnel joined	00:16
	← sz0 left	00:17
	→ XDS2010\|AFK joined	00:17
	→ ewitz joined	00:17
	← XDS2010\|AFK left	00:18
	← \malex\ left	00:20
	← leeN left	00:20
	← Nudist69-M left	00:21
	← xcm left	00:21
	← nowhere_man left	00:21
	→ fassl joined	00:21
	→ ephemer0l_ joined	00:22
	→ xcm joined	00:22
	→ BlessJah joined	00:23
	← zzach left	00:23
	← chekbo_ left	00:23
	→ XDS2010\|AFK joined	00:24
	→ nowhere_man joined	00:25
	← XDS2010\|AFK left	00:25
	→ fission6 joined	00:25
	→ zzach joined	00:27
	→ dege joined	00:27
	← orbyt_ left	00:28
	→ XDS2010\|AFK joined	00:29
	← fission6 left	00:29
	← bluepixel left	00:29
	→ dege_ joined	00:30
	← XDS2010\|AFK left	00:30
	← xeno left	00:30
	→ weijin joined	00:31
	→ ljc joined	00:32
	← dege left	00:33
	← fassl left	00:33
	← robattila256 left	00:34
	→ Bhootrk joined	00:34
	← Bhootrk left	00:34
	→ Bhootrk joined	00:34
Hello71	probably doesn't make sense	00:35
	try rebase -i	00:35
	→ BenderRodriguez joined	00:35
	← hahuang65 left	00:35
	→ prsn joined	00:35
	← weijin left	00:36
	→ xeno joined	00:36
	→ XDS2010\|AFK joined	00:36
	← mikecmpbll left	00:36
	← NeXTSUN left	00:36
	← ioc_ left	00:36
	→ NeXTSUN joined	00:37
	← XDS2010\|AFK left	00:37
	← Guest60542 left	00:39
	→ hahuang65 joined	00:40
	← prsn left	00:40
	← sonarpulse left	00:41
	→ XDS2010\|AFK joined	00:41
	← cssko left	00:41
	← XDS2010\|AFK left	00:42
	← Thominus left	00:42
	→ Thominus joined	00:42
	← xfbs left	00:43
	→ chat joined	00:45
	chat → Guest84732	00:45
	→ cdg joined	00:46
	← jimmyrcom left	00:48
	← peepsalot left	00:48
	← dsdeiz left	00:49
	→ Nizumzen joined	00:49
	← cdg_ left	00:50
	← cdg left	00:50
	→ jimmyrcom joined	00:51
	← Thominus left	00:51
	dege_ → dege	00:51
	← bittyx left	00:52
	← yobop left	00:52
	→ dsdeiz joined	00:52
	← GotHyper left	00:52
	→ orbyt_ joined	00:52
	← sanscoeur left	00:54
	→ bittyx joined	00:56
	← rafasc left	00:58
	→ Nokurn_ joined	01:00
	← bittyx left	01:01
	← Nokurn_ left	01:01
	→ peepsalot joined	01:01
	→ mud joined	01:03
	→ gugah joined	01:03
	→ howdoi joined	01:03
	→ bittyx joined	01:03
	→ weijin joined	01:03
	← veegee left	01:05
	→ prsn joined	01:05
	← orbyt_ left	01:06
	← mel00010 left	01:06
	→ veegee joined	01:07
	← weijin left	01:07
	→ Nokurn joined	01:08
	→ aypea[3] joined	01:08
	→ dsdeiz_ joined	01:08
	← Gurkenglas left	01:09
	← prsn left	01:10
	← m0viefreak left	01:10
aypea[3]	hi. I've a patchset that I need to maintain over an external codebase. the codebase gets its own updates and, so, I need to make sure my patchset does not suffer from bitrot. any suggestions how I manage this in git? the original codebase is already in their git repo.	01:11
lupine	rebase often and well	01:12
	but better is to get your patchset integrated upstream	01:12
aypea[3]	alas, they wont have it.	01:12
	← dsdeiz_ left	01:12
	← learning left	01:12
	→ orbyt_ joined	01:13
	→ learning joined	01:14
	→ ferdna joined	01:14
	aypea[3] looks up rebasing. fun times...	01:14
	← sangy left	01:15
	→ weijin joined	01:15
	← shinnya left	01:15
	← frederfred left	01:16
	← joshbright left	01:16
	← Nizumzen left	01:17
	→ XDS2010\|AFK joined	01:18
	→ sangy joined	01:19
	← XDS2010\|AFK left	01:19
	← weijin left	01:19
	← hahuang65 left	01:20
	→ hahuang65 joined	01:21
	← hahuang65 left	01:22
	→ alezandro joined	01:22
	→ hahuang65 joined	01:23
	← daynaskully left	01:24
	← veegee left	01:25
	← Kaisyu7 left	01:25
	→ Kaisyu7 joined	01:25
	→ Sasazuka__ joined	01:26
	← quite left	01:27
	→ thiago joined	01:27
	← learning left	01:27
	→ mel00010 joined	01:27
	→ learning joined	01:28
	← dviola left	01:28
	→ veegee joined	01:28
	← Sasazuka left	01:28
	→ yobop joined	01:30
	→ Xuefer joined	01:30
	→ xaxxon joined	01:31
	← ferdna left	01:32
	← learning left	01:33
	← CheckDavid left	01:34
	← MoziM left	01:34
	→ prsn joined	01:36
	← sentriz left	01:36
	→ sentriz joined	01:37
	→ sleepingforest joined	01:37
	← bwn left	01:39
	→ \malex\ joined	01:39
	→ weijin joined	01:40
	← prsn left	01:40
	→ quite joined	01:40
	→ dviola joined	01:41
	← Puffball left	01:41
	→ Puffball joined	01:41
	→ XDS2010\|AFK joined	01:43
	← XDS2010\|AFK left	01:44
	← weijin left	01:44
	← SpeakerToMeat left	01:46
	→ cqi joined	01:46
	← ljc left	01:49
	← Arokh left	01:50
	← tombusby left	01:50
	← ghost43 left	01:50
	→ Arokh joined	01:50
	→ dvl joined	01:51
	← Koyae left	01:53
	→ ghost43 joined	01:53
	← slimetrap left	01:53
	→ tombusby joined	01:53
	→ sanscoeur joined	01:55
	→ fission6 joined	01:56
	→ yobop_ joined	01:56
	→ PioneerAxon joined	01:57
	← Eryn_1983_FL left	01:58
	← yobop left	01:59
	← jready left	01:59
	← sanscoeur left	02:00
	→ MoziM joined	02:00
	→ safe joined	02:01
	→ Eryn_1983_FL joined	02:03
	→ Programmer123 joined	02:04
	← yobop_ left	02:04
Programmer123	Hi yall	02:04
	← Arokh left	02:06
	← Jiffy left	02:06
	→ Arokh joined	02:06
	→ prsn joined	02:06
	← Sasazuka__ left	02:07
	← cqi left	02:07
	→ Jiffy_ joined	02:07
	← lungaro left	02:08
	← veremitz left	02:09
	→ veremitz joined	02:09
	← MoziM left	02:09
	→ weijin joined	02:09
	← cbreak left	02:10
	→ cbreak joined	02:10
	← prsn left	02:11
	← watabou left	02:11
	→ lungaro joined	02:11
	← cdown left	02:11
	→ finalbeta joined	02:12
	← goatish left	02:12
	← exotime left	02:12
	← veegee left	02:12
	← hahuang65 left	02:13
	→ SpeakerToMeat joined	02:13
	→ hahuang65 joined	02:14
	→ cdown joined	02:15
	← netj left	02:16
	← hahuang65 left	02:16
	→ netj joined	02:16
	→ xcesariox joined	02:17
	→ hahuang65 joined	02:18
	→ exotime joined	02:18
	← alezandro left	02:19
	← acidjnk left	02:19
	→ learning_ joined	02:20
	→ XDS2010\|AFK joined	02:20
	→ cdg joined	02:20
	← drodger_ left	02:21
	← XDS2010\|AFK left	02:21
	← xcesariox left	02:22
	→ drodger joined	02:23
	← garo left	02:24
	← Barrt left	02:25
	← Salek left	02:25
	→ garo joined	02:25
	→ bwn joined	02:26
	← cdown left	02:26
Programmer123	Anyone there?	02:26
	← veremitz left	02:26
	→ veremitz joined	02:27
	→ lessless joined	02:27
	→ Salek joined	02:28
mud	Programmer123: Yep, many people. how's it going.	02:28
	← sleepingforest left	02:30
	→ ferdna joined	02:31
	→ Snuupy joined	02:34
	← Guest21 left	02:34
lhx	Programmer123: sup	02:34
	→ dendazen joined	02:34
	← Dragon092 left	02:35
	← publio left	02:36
	→ prsn joined	02:37
	→ slimetrap joined	02:39
	→ watabou joined	02:39
	← prsn left	02:41
	→ Dragon092 joined	02:41
	← watabou left	02:41
	← kaiser left	02:42
	← dendazen left	02:43
	← thiago left	02:44
	← CodeSlingerPaul left	02:45
	→ XDS2010\|AFK joined	02:45
	← Raed\|Mobile left	02:45
	→ Raed\|Mobile joined	02:45
	← ilbot3 left	02:46
	← XDS2010\|AFK left	02:46
	← Celelibi left	02:46
	→ igemnace joined	02:46
Programmer123	Sorry yall, I went afk after a bit of inactivity.	02:46
	Whats goin on!	02:46
	← igemnace left	02:47
Programmer123	I'm just over here chillin	02:47
	→ igemnace joined	02:47
	← hahuang65 left	02:47
	← Raed\|Mobile left	02:51
	→ Raed\|Mobile joined	02:53
	→ joshbright joined	02:53
	← mooasaurus left	02:56
	→ mooasaurus joined	02:56
	→ cdown joined	02:57
	→ ilbot3 joined	02:57
	→ watabou joined	02:58
	← garo left	02:58
	→ garo joined	02:59
	→ hahuang65 joined	03:01
	← Nokurn left	03:03
	→ Nokurn joined	03:03
	→ cqi joined	03:05
	← khisanth_ left	03:05
	← slimetrap left	03:06
	← twopt left	03:07
	← heroux left	03:07
	→ prsn joined	03:07
	← weijin left	03:09
	← nanga left	03:10
	← hahuang65 left	03:10
	→ nikheizen joined	03:10
	→ Celelibi joined	03:11
	→ weijin joined	03:11
	→ YuGiOhJCJ joined	03:11
	→ hahuang65 joined	03:12
	→ xcesariox joined	03:13
	→ twopt joined	03:13
	← prsn left	03:15
	→ kn-928 joined	03:16
	→ lagothrix joined	03:16
	← YuGiOhJCJ left	03:16
	← xPucTu4 left	03:17
	→ dsdeiz_ joined	03:18
	← learning_ left	03:18
	← lagothri1 left	03:19
	→ khisanth_ joined	03:19
	← n0body left	03:20
	→ xPucTu4 joined	03:21
	→ XDS2010\|AFK joined	03:22
	← XDS2010\|AFK left	03:23
	← Dragon092 left	03:23
	→ Dragon092 joined	03:25
	← mekhami_ left	03:26
	← ldiamond_ left	03:27
	← dsdeiz_ left	03:27
	→ mekhami joined	03:28
	← twopt left	03:28
	→ nanga joined	03:28
	← nanga left	03:28
	→ nanga joined	03:28
	→ canvon joined	03:30
	→ Amanas joined	03:30
	← canvon_ left	03:30
	→ n0body joined	03:32
	← mborgard left	03:34
	→ antares9 joined	03:35
	→ rageshkrishna joined	03:37
	← lessless left	03:37
	→ z8z joined	03:37
	→ prsn joined	03:38
	← Dragon092 left	03:38
	← z8z left	03:40
	→ govg joined	03:41
	→ z8z joined	03:41
	← prsn left	03:42
	→ Dragon092 joined	03:43
	← z8z left	03:43
	antares9 → _antares_	03:43
	→ z8z joined	03:43
	← gugah left	03:44
	_antares_ → help	03:44
	← kgrimes left	03:44
	help → Guest15252	03:44
	← weijin left	03:45
	Guest15252 → _antares_	03:45
	← hahuang65 left	03:45
	← ferdna left	03:45
	→ hahuang65 joined	03:46
	← al-damiri left	03:47
	→ XDS2010\|AFK joined	03:47
	← cdg left	03:47
	→ dreiss joined	03:48
	← Raed\|Mobile left	03:48
	← XDS2010\|AFK left	03:48
	← lupine left	03:49
	← fission6 left	03:49
	← hesco left	03:50
	← hahuang65 left	03:51
	← aspiers left	03:55
	→ matsaman joined	03:55
	→ bluepixel joined	03:55
	→ lupine joined	03:56
	→ sanscoeur joined	03:56
	← chachasmooth left	03:56
	→ chachasmooth joined	03:57
	→ aspiers joined	03:58
	← matsaman left	03:58
	→ mollusk__ joined	04:00
	→ hahuang65 joined	04:00
	← c0ded left	04:00
	← xcesariox left	04:01
	← sanscoeur left	04:02
	← wgrant left	04:06
	← Praxi left	04:08
	→ cdg joined	04:12
	← dsdeiz left	04:12
	← mrBen2k2k2k_ left	04:13
	← mrBen2k2k2k left	04:13
	→ weijin joined	04:15
	← Amanas left	04:15
	← joshbright left	04:16
	→ dsdeiz joined	04:16
	← cdg left	04:16
	← luckman212 left	04:17
	← weijin left	04:18
	→ weijin joined	04:18
	→ wgrant joined	04:18
	→ mrBen2k2k2k joined	04:19
	→ daynaskully joined	04:19
	→ Bobdude joined	04:21
	→ alezandro joined	04:23
	→ luckman212 joined	04:24
	← hahuang65 left	04:25
	→ XDS2010\|AFK joined	04:25
	← XDS2010\|AFK left	04:25
	→ barryw joined	04:27
	← SirFunk left	04:27
	← alezandro left	04:27
	← barryw left	04:30
	→ SirFunk joined	04:31
	← kn-928 left	04:34
	→ barryw joined	04:38
	← barryw left	04:39
	← philipp64 left	04:40
	→ philipp64 joined	04:40
	← ertes-w left	04:41
	→ ertes-w joined	04:42
	← moei left	04:42
	← ertes-w left	04:42
	← xaxxon left	04:42
	→ ertes-w joined	04:43
	→ PioneerAxon_ joined	04:44
	→ barryw joined	04:45
	← PioneerAxon left	04:46
	← pnepe6 left	04:46
	→ Raed\|Mobile joined	04:48
	← barryw left	04:48
	→ barryw joined	04:48
	→ XDS2010\|AFK joined	04:49
	← XDS2010\|AFK left	04:50
	← Cabanossi left	04:50
	← barryw left	04:51
	→ Cabanossi joined	04:52
	→ Darcidride_ joined	04:53
	→ Darcidride__ joined	04:54
	→ barryw joined	04:54
	→ meadmoon joined	04:54
	→ mikemcowie joined	04:54
	← Darcidride_ left	04:54
	← Darcidride left	04:56
	← mud left	04:58
	← SirFunk left	04:58
	→ al-damiri joined	05:00
	← mikemcowie left	05:00
	→ mikemcowie joined	05:02
	→ ferdna joined	05:02
	← boombatower left	05:02
	→ zzz_ joined	05:03
	← zzz left	05:03
	← pks left	05:03
	← barryw left	05:04
	→ pks joined	05:04
	← mikemcowie left	05:09
	→ SirFunk joined	05:09
	→ mikemcowie joined	05:10
	← mikemcowie left	05:10
	← meadmoon left	05:13
	← uptime left	05:14
	→ hashem joined	05:19
	→ mattkrea joined	05:20
	→ Bhootrk_ joined	05:24
	→ uptime joined	05:24
	→ joshbright joined	05:24
	← weijin left	05:25
	← mattkrea left	05:26
	← Bhootrk left	05:26
	→ XDS2010\|AFK joined	05:27
	→ ColdKeyboard joined	05:27
	← XDS2010\|AFK left	05:27
	← ColdKeyboard left	05:28
	→ ColdKeyboard joined	05:28
	→ xaxxon joined	05:28
	→ Thominus joined	05:30
	← manuelschneid3r left	05:32
	ephemer0l_ → GeneralDiscourse	05:33
	→ ZyX-I joined	05:35
	← naoey left	05:35
	→ MoziM joined	05:39
	→ komonsterko joined	05:41
	← ZyX-I left	05:41
	→ weijin joined	05:45
	→ naoey joined	05:45
	→ manuelschneid3r joined	05:46
	→ thiago joined	05:46
	← Zialus left	05:47
	→ xcesariox joined	05:49
	→ zulutango joined	05:51
	← SleePy left	05:51
	→ XDS2010\|AFK joined	05:51
	← d1b left	05:51
	→ SleePy joined	05:52
	← XDS2010\|AFK left	05:52
	→ d1b joined	05:52
	→ sanscoeur joined	05:52
	→ Nudist69-M joined	05:53
	→ chaosruler joined	05:53
	← chaosruler left	05:54
	← orbyt_ left	05:55
	← sanscoeur left	05:57
	← Nokurn left	05:57
	← hashem left	05:59
	→ re1 joined	06:02
	→ skisela joined	06:02
	→ Nokurn joined	06:03
	← kaos01 left	06:03
	→ kaos01 joined	06:03
	← diogenese left	06:07
	← Iroha left	06:07
	→ Iroha joined	06:08
	← tt_ left	06:08
	→ tt joined	06:08
	→ prsn joined	06:10
	→ pfleck joined	06:11
	→ rajat joined	06:14
	← cqi left	06:14
	← prsn left	06:14
	→ cqi joined	06:14
	← Nudist69-M left	06:16
	← pfleck left	06:16
	← Iroha left	06:18
	→ Iroha joined	06:18
	← gsrhre left	06:23
	← glebihan left	06:23
	← ShapeShifter499 left	06:24
	→ DerpGusta joined	06:26
	← pp5mgt left	06:26
	→ alezandro joined	06:26
	→ pp5mgt joined	06:27
	→ glebihan joined	06:28
	← re1 left	06:28
	→ slimetrap joined	06:29
	→ PioneerAxon joined	06:29
	→ re1 joined	06:29
	← mollusk__ left	06:30
	→ mollusk_ joined	06:30
	← alezandro left	06:31
	← PioneerAxon_ left	06:31
	→ ShapeShifter499 joined	06:31
	→ zefferno joined	06:35
	← ShapeShifter499 left	06:35
	← slimetrap left	06:42
	→ LocaMocha joined	06:44
	← LocaMocha left	06:44
	→ wandering_vagran joined	06:45
	→ ZyX-I joined	06:46
	← mollusk_ left	06:47
	→ diogenese joined	06:48
	→ cdg joined	06:48
	→ LocaMocha joined	06:48
	→ freimatz joined	06:50
	← zzach left	06:50
	→ weijin_ joined	06:51
	→ NerdyPepper joined	06:51
	← diogenese left	06:52
	← cdg left	06:52
	→ sanscoeur joined	06:53
	← weijin left	06:53
	← sanscoeur left	06:58
	← nikheizen left	06:58
	← uptime left	06:58
	→ XDS2010\|AFK joined	06:59
	← XDS2010\|AFK left	06:59
	← dviola left	07:00
	← cqi left	07:01
	← mel00010 left	07:02
	mwsb → chu	07:03
	→ cqi joined	07:07
	→ pnepe6 joined	07:07
	← xcm left	07:07
	→ xcm joined	07:08
	← doug16k left	07:09
	→ uptime joined	07:09
	← joshbright left	07:11
	→ czart joined	07:12
	→ piggah joined	07:14
	→ doug16k joined	07:15
	→ kgrimes joined	07:16
	→ abba joined	07:16
	→ Tobbi joined	07:17
	→ pfleck joined	07:18
	← serialoverflow left	07:20
	← Guest45890 left	07:23
	→ bambams joined	07:23
	← bambams left	07:23
	→ bambams joined	07:23
	→ chele joined	07:25
	← ferdna left	07:26
	← vrishab left	07:26
	← al-damiri left	07:27
	→ serialoverflow joined	07:27
	LocaMocha → Sauvin	07:29
	→ tkore joined	07:31
	← NerdyPepper left	07:31
	← mniip left	07:33
	← MoziM left	07:33
	→ ferdna joined	07:35
	→ MoziM joined	07:35
	← energizer left	07:36
	→ energizer joined	07:36
	← xcesariox left	07:37
	← energizer left	07:38
	→ energizer joined	07:39
	→ vrishab joined	07:40
	← markzen left	07:43
	← safe left	07:44
	← ferdna left	07:48
	← glebihan left	07:50
	← re1 left	07:50
	← xaxxon left	07:52
	→ XDS2010\|AFK joined	07:53
	← XDS2010\|AFK left	07:54
	→ KeyJoo joined	07:57
	← xPucTu4 left	08:00
	→ systmkor joined	08:00
	→ rokups joined	08:01
	← ZyX-I left	08:01
	← tkore left	08:02
	← Tobbi left	08:03
	← _rgn left	08:04
	← dmc left	08:04
	← MacGyver left	08:05
	→ xPucTu4 joined	08:05
	→ mollusk__ joined	08:07
	→ staafl joined	08:07
	→ tsdh joined	08:08
	← selckin left	08:08
	→ selckin joined	08:08
tsdh	Hi. I'm converting a HG repo to a git one. After "git push my-test-remote --mirror" which resulted in output like "* [new branch] origin/AF00080_ECO517 -> origin/AF00080_ECO517" and then cloning my-test-remote again, "git branch -a" shows nothing but master and remotes/origin/HEAD, remotes/origin/master. Where are all branches?	08:10
	→ afuentes joined	08:11
	← fuzzmz left	08:11
tsdh	In contrast, "git tag --list" seems to show all tags we've ever set.	08:12
	← mollusk__ left	08:12
	→ seschwar joined	08:13
	→ fuzzmz joined	08:13
	← murph left	08:13
	→ diogenese joined	08:13
	← djb-irc left	08:14
	wagle_ → wagle	08:14
	← energizer left	08:15
	→ _rgn joined	08:16
	→ MacGyver joined	08:16
_ikke_	tsdh: what does git ls-remote <remote_repo> return?	08:16
	← SirFunk left	08:17
	→ must^ joined	08:17
	→ dmc joined	08:17
	→ TomyWork joined	08:18
	← cqi left	08:18
	→ SirFunk joined	08:19
tsdh	_ikke_: It shows lines like "92895364272b7b52862610393a0fbca92094acb refs/remotes/origin/AF00080_ECO517" which is one of the "lost" branches.	08:19
	→ djb-irc joined	08:19
jast	tsdh: I'm guessing the problem here is that the repo you tried to push had most of the branches as remote-tracking branches (hence the "origin/" prefix in the messages). if you push those using --mirror, they are outside the namespace of branches that are normally cloned.	08:19
_ikke_	right, the ls-remote confirms that	08:20
jast	where did your origin/AF00080_ECO517 come from? is that the result of a conversion process you ran locally? or elsewhere?	08:21
	→ energizer joined	08:21
tsdh	jast: Ah, right. What I did was convert from hg with fast-export. Then I took the chance to clean up the history with bfg where I had to do some commits. For making commits, I had to clone the bare conversion result repo.	08:21
	← must^ left	08:22
jast	ah right, that would do it	08:22
	→ venmx joined	08:22
	← guardian left	08:22
jast	unfortunately there's no super-easy way to clone from a bare repo and directly copy all branches into the normal namespace, but you can do it after the fact with a single operation	08:23
tsdh	go on, I'm all ears :-)	08:23
jast	in your local non-bare repo, try this bit of magic: git push . refs/remotes/origin/:refs/heads/	08:23
	← z8z left	08:23
jast	or you can use my-test-remote instead of '.' to inflict the same thing directly on your new remote	08:23
	with '.' it's basically a copy operation within the current repo	08:23
	→ dsdeiz_ joined	08:25
tsdh	jast: Ah, cool. So now I have foo instead of origin/foo. So now I can "git push --mirror", right?	08:27
jast	yep	08:27
tsdh	Great	08:27
jast	should be fast, too, because the remote already has all of the objects	08:27
	→ widp joined	08:27
tsdh	Oh, I created a new remote repo. :-)	08:28
	→ guardian joined	08:28
jast	right, that will work, too	08:28
	note that you'll have both refs/heads/foo and refs/remotes/origin/foo in the new remote	08:28
tsdh	...but not fast given the fact the repo is 2GB.	08:28
jast	you can clean it up later if you like	08:28
	→ fnm^ joined	08:28
jast	e.g. git push --delete my-test-remote refs/remotes/origin/*	08:29
	← dsdeiz_ left	08:29
	→ mel00010 joined	08:29
jast	ah well, what's 2GB between friends	08:29
	→ dmone joined	08:29
jast	(and a 56k link)	08:30
	→ Bobguy joined	08:30
tsdh	Right now, I wonder if I could skip the "create clone just to perform one cleanup commit". This commit just deletes some binary files which should have never been committed. Then I delete those files from the history with bfg. bfg has the requirement that files to be deleted are not referenced from the current HEAD.	08:31
jast	you could use filter-branch with --index-filter instead of bfg, though it might be slower	08:31
	← Bobdude left	08:31
jast	anyway, just goes to show that these kinds of assumptions should come with a toggle...	08:32
tsdh	jast: Yeah, that's the reason I did not use filter-branch.	08:33
jast	it might be faster patching bfg and then running it :)	08:33
	→ NerdyPepper joined	08:34
	← akushner left	08:34
sphalerite	if I want to stop a bisect, but not change the commit I'm on, is doing rm .git/BISECT_* a bad idea?	08:35
	← weijin_ left	08:36
jast	sphalerite: 'git bisect reset HEAD' might be easier	08:36
sphalerite	ah yes, that's nicer. Thanks!	08:36
jast	but your way should be fine too	08:36
osse	Somewhat related tip: Use lightweight tags as short lived "bookmarks"	08:37
	e.g. git tag gobackhere; git bisect reset; git checkout gobackhere	08:37
tsdh	jast: Oh, bfg has a --no-blob-protection flag. Maybe that's the thing I was looking for...	08:37
	← nadley left	08:37
osse	The downside is that they aren't really shortlived unless you take their lives yourself.	08:38
	← sim590 left	08:38
jast	side note, bisect can store extra state in refs/bisect refs, so when manually cleaning up you might miss those	08:38
	I took a brief look at bfg's source code but I don't really want to learn scala right now... :}	08:39
	← fatalhalt left	08:39
	→ CheckDavid joined	08:40
	→ doug16k_ joined	08:40
	→ weijin joined	08:40
	→ sim590 joined	08:40
	→ f2k joined	08:41
	← RBech left	08:41
	→ siva joined	08:42
	→ fatalhalt joined	08:43
	← thiago left	08:43
	← doug16k left	08:44
	← siva left	08:44
	→ mrBen2k2k2k_ joined	08:46
	→ Floflobel joined	08:48
	← abba left	08:51
	→ abba joined	08:51
	← energizer left	08:52
	→ murph joined	08:53
	← xPucTu4 left	08:53
	→ oxymoron93 joined	08:53
	murph → Guest43853	08:53
	→ sanscoeur joined	08:54
	→ energizer joined	08:54
	← dreiss left	08:54
	→ Metalindustrien joined	08:55
	→ heroux joined	08:56
	← energizer left	08:56
	→ energizer joined	08:56
	→ xPucTu4 joined	08:57
	← Metalindustrien left	08:58
	→ sQVe joined	08:58
	← sanscoeur left	08:59
	→ XDS2010\|AFK joined	09:01
	← SirFunk left	09:01
	→ schleppel joined	09:01
	← XDS2010\|AFK left	09:01
	→ f2k- joined	09:02
	→ SirFunk joined	09:02
	→ eghdk joined	09:04
eghdk	When I submit feature-X as a pull request to github and I'm waiting for it to be reviewed, how do I handle having to work on feature Y that is based off of feature-X branch?	09:04
jast	make a new branch based on feature-X	09:05
	← diogenese left	09:05
	→ f2k_ joined	09:05
jast	if it really depends on feature-X you're not going to be able to submit it before feature-X gets merged, anyway	09:05
	← f2k left	09:05
jast	you can rebase the feature-Y branch against the main branch later to clean things up	09:06
	→ diogenese joined	09:06
jast	(after feature-X has been merged)	09:06
	→ floppydh joined	09:07
eghdk	jast: I can technically submit the PR for Y, but I would have to wait for X to go in first right. So when I make the PR for Y I just do Y into master, or Y into X?	09:07
	→ mikecmpbll joined	09:08
jast	well, chances are if they merge X they won't keep a separate copy of X around, so you'd probably do the second PR for master	09:08
	← f2k- left	09:09
	→ cqi joined	09:12
	← Bobguy left	09:13
	→ prsn joined	09:13
	→ borkr joined	09:15
	← Programmer123 left	09:15
	→ fosonmeng joined	09:15
	← Bhootrk_ left	09:16
	← venmx left	09:17
	← fosonmeng left	09:17
	→ markzen joined	09:17
	← prsn left	09:17
	→ venmx joined	09:17
	→ moei joined	09:17
	→ ShekharReddy joined	09:18
	← banisterfiend left	09:20
	← cbreak left	09:20
	← venmx left	09:21
	→ cbreak joined	09:21
	← jnewt left	09:21
	← kgrimes left	09:22
	← Floflobel left	09:26
	→ Metalindustrien joined	09:26
	← rageshkrishna left	09:28
	← matkatmusic left	09:29
	← cliluw left	09:29
	← armyriad left	09:29
	→ nimomo joined	09:30
	→ rageshkrishna joined	09:31
	→ alezandro joined	09:31
	→ kurkale6ka joined	09:32
	← thxffo left	09:33
	← Willis left	09:33
	← jorj left	09:33
	← hunterlabs left	09:34
	← nimomo left	09:34
	← alezandro left	09:35
	← rageshkrishna left	09:35
	← _pi_ left	09:36
	→ paranoidaditya joined	09:39
	← shoogz left	09:39
paranoidaditya	Hi, noob question: I have a branch A2Q6 on the rep	09:40
	do I clone rep	09:40
	git checkout A2Q6	09:40
	→ shoogz joined	09:40
	← shoogz left	09:40
paranoidaditya	to see the branch files?	09:40
eghdk	jast: Got it. Will probably have to resubmit feature-Y at that point because I should merge master back in and then submit it again. Wonder if github has any kind of way to label pre-reqs like this? (besides just using labels). I know gitlab has a WIP keyword	09:40
cbreak	sure	09:40
	← weijin left	09:40
	→ shoogz joined	09:41
	← shoogz left	09:41
	→ shoogz joined	09:41
	→ cliluw joined	09:41
	← rvgate left	09:41
fuchstronaut	paranoidaditya: after checking out a branch, you should have the files in your working directory	09:41
	→ rvgate joined	09:41
paranoidaditya	fuchstronaut the files are not there	09:41
tobiasvl	paranoidaditya: !repro	09:41
	→ rosa joined	09:41
gitinfo	paranoidaditya: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see	09:41
paranoidaditya	all i see the files from master	09:41
fuchstronaut	paranoidaditya: go to the folder and type "git status" to see if you really checked that branch out	09:42
cbreak	paranoidaditya: check out the branch you want to be on	09:42
fuchstronaut	or use a tool like sourcetree, maybe that's easier to start with	09:43
paranoidaditya	I deleted the local folder, cloned again and switched branches	09:43
	worked this time	09:43
	→ nimomo joined	09:44
	← hussam left	09:45
	→ venmx joined	09:45
	→ oDn joined	09:46
	→ Willis joined	09:47
	→ eroux joined	09:49
	← afuentes left	09:49
paranoidaditya	how do I delete a branch on remote	09:49
osse	paranoidaditya: git push --delete remotename branchname	09:50
paranoidaditya	thank you osse	09:52
	← komonsterko left	09:52
	← Willis left	09:53
	→ Bhootrk joined	09:53
paranoidaditya	its a remote git rep for school homework and it is supposed to execute 'npm install and node app' for each branch but for some reason it wont build on my latest branch	09:53
	← mooasaurus left	09:53
paranoidaditya	alas it has delete protection	09:53
	→ komonsterko joined	09:53
	→ armyriad joined	09:54
	← diogenese left	09:54
	→ mooasaurus joined	09:55
	→ XDS2010\|AFK joined	09:55
fuchstronaut	i really like that yo u are using git and npm in school	09:55
	← XDS2010\|AFK left	09:56
	→ acidjnk joined	09:56
	← oDn left	09:57
	← oxymoron93 left	09:57
	← venmx left	09:57
	← raynold left	09:58
	← skisela left	09:58
	← fnm^ left	09:59
	← komonsterko left	09:59
	← KeyJoo left	09:59
	→ venmx joined	09:59
	← luckman212 left	10:00
	→ luckman212 joined	10:00
	← Xuefer left	10:01
	← nimomo left	10:02
	→ nimomo joined	10:02
	← Trieste left	10:02
	← IanLiu left	10:03
	← laumann_ left	10:04
	→ leeN joined	10:04
	← floppydh left	10:05
	→ floppydh_ joined	10:05
	→ tvale joined	10:05
	→ oxymoron93 joined	10:05
	→ Trieste joined	10:06
	→ lessless joined	10:06
markzen	are there CS schools where students don't touch git or mercurial	10:11
	→ weijin joined	10:11
jast	CS isn't about computers, duh	10:11
cbreak	computer science is as much about computer as astronomy is about telescopes	10:13
	→ prsn joined	10:14
markzen	glad I haven't been to your schools then	10:14
	→ achadwick joined	10:16
	→ cstratak joined	10:16
cbreak	yeah, it's not an easy school to succeed in :)	10:17
	← thinkpad left	10:17
cbreak	definitely not for someone that just wants to learn how to be a good sysadmin or programmer	10:18
	← prsn left	10:18
jast	I did learn a lot about problem-solving and trade-offs from it	10:19
	← xcm left	10:19
jast	and it gives you different ways to think about problems, too	10:19
	→ Darcidride joined	10:19
	→ xcm joined	10:19
	← weijin left	10:19
	← Mi5ter left	10:21
	→ Gurkenglas joined	10:23
markzen	why can't you do both?	10:23
	theory and hands-on	10:23
	← dpyro left	10:23
markzen	and what do you do when you get your diploma without hands-on experience?	10:23
	genuine question, I don't know how it works in other countries	10:24
	← cdown left	10:24
	← jimmyrcom left	10:26
	→ nowhereman_ joined	10:26
	← nowhere_man left	10:26
cbreak	markzen: we had practical parts	10:29
	but those weren't things like learning git	10:29
	it was expected that we'd learn the basics like that ourselves	10:29
	← piggah left	10:34
	→ kurkale61 joined	10:37
	→ re1 joined	10:38
	← kurkale61 left	10:39
	→ kurkale61 joined	10:39
	← kurkale6ka left	10:40
	← lessless left	10:40
	← nimomo left	10:40
	→ nimomo joined	10:41
	← nimomo left	10:41
markzen	remidns me of a blog post I read a few years ago; guy was just diplomed from a good school, then passed interviews with puzzles and whatnot, then once he got hired his boss would ask him to write a full-fledged mobile app, handling him the doc about "how to write a mobile app"	10:41
	in boss mind it was supposed to be easy, once you get diploma and solved interview puzzles	10:41
	poor guy was fired three weeks later	10:42
	→ weijin joined	10:42
jast	did boss mind learn anything? ;)	10:42
	→ IanLiu joined	10:42
markzen	doubt it	10:42
	→ nimomo joined	10:42
markzen	probably just shook their head	10:42
jast	and anyway, as the name implies, CS focuses mostly on the science side of things	10:42
	← bwn left	10:43
	→ tvw joined	10:43
markzen	yeah, perhaps that's a cultural thing	10:43
jast	with topics like discrete math, computability, complexity classes, formal languages, automata, etc.	10:43
markzen	probably is	10:43
	→ Mister joined	10:44
markzen	I guess you have CS schools on one hand, and "tech schools" (whatever you call it) on the other hand	10:44
	→ nimomo_ joined	10:44
	← nimomo left	10:44
markzen	here (France), we tend to do both, afaik	10:44
jast	generally, teaching programming seems to be pretty terrible almost everywhere	10:45
	→ rominronin joined	10:45
jast	and that's actually the easy part	10:45
	problem-solving skills? pretty much nobody teaches those	10:45
	← weijin left	10:46
	← Mister left	10:46
markzen	where do you get hired, when you learned pure CS stuff and probably lack hands-on skills?	10:47
	→ weijin joined	10:48
	→ cdg joined	10:48
	← xcm left	10:49
	← nimomo_ left	10:49
	→ piggah joined	10:49
	→ nimomo joined	10:49
jast	probably consulting	10:49
	← weijin left	10:49
	→ weijin joined	10:49
jast	... where lack of practical experience can easily be disguised	10:49
markzen	possibly	10:50
jast	or anywhere where nobody monitors your progress	10:50
	← cdg left	10:54
	← nimomo left	10:55
	→ Duikb00t joined	10:56
Duikb00t	Hello	10:56
	→ amatas_ joined	10:56
pandem	hello Duikb00t	10:56
	→ nimomo joined	10:57
	← dege left	10:57
	← cstratak left	10:58
	→ xcm joined	10:59
	→ Willis joined	11:00
	→ XDS2010\|AFK joined	11:03
	→ cstratak joined	11:03
	← energizer left	11:03
	→ YuGiOhJCJ joined	11:03
	← XDS2010\|AFK left	11:03
	← YuGiOhJCJ left	11:04
	→ YuGiOhJCJ joined	11:05
	← albel727 left	11:05
	→ xfbs joined	11:06
	→ energizer joined	11:07
	← energizer left	11:09
	→ energizer joined	11:10
	← weijin left	11:12
	→ h12o joined	11:12
	→ cdown joined	11:12
	← xcm left	11:13
	→ xcm joined	11:14
	← hypera1r left	11:14
	→ hyperair joined	11:15
	→ Nizumzen joined	11:17
	← nimomo left	11:18
	← amatas_ left	11:19
	→ amatas_ joined	11:21
	→ nimomo joined	11:21
	← energizer left	11:21
	← floppydh_ left	11:22
cbreak	markzen: CS has many aspects	11:22
	at my university we had several majors	11:23
	I went into software engineering, so mainly focused on how to design and build programs, and many aspects of that	11:23
	others went into computer graphics, theoretical computer science, or more into data sciences	11:23
	so now I work as software engineer. Others from the same uni work as researchers in their domain	11:24
	→ nowhere_man joined	11:27
	← piggah left	11:28
	← byte512 left	11:28
	→ sergej[m] joined	11:29
	← nowhereman_ left	11:31
	→ Mi5ter joined	11:31
	← h12o left	11:34
	→ m0viefreak joined	11:37
	← konsolebox left	11:37
	→ Cavallari joined	11:38
	← paranoidaditya left	11:38
	→ _pi_ joined	11:39
	← _pi_ left	11:39
	→ KeyJoo joined	11:41
	→ h12o joined	11:41
	← zulutango left	11:41
	← tvale left	11:42
	→ weijin joined	11:42
	→ konsolebox joined	11:43
	← weijin left	11:47
	→ srbcheema1 joined	11:47
	→ thxffo joined	11:50
	← cdown left	11:50
	→ weijin joined	11:54
srbcheema1	someone please have a look at https://stackoverflow.com/questions/49049047/delete-top-second-commit-using-git-rebase-i	11:54
	→ hunterlabs joined	11:55
srbcheema1	I am doing git rebase -i to delete top second commit .. it works fine for one branch while not for the other branch . dont know why is it happening	11:55
alcohol	srbcheema1: srbcheema1 are your branches identical?	11:55
	← manuelschneid3r left	11:56
srbcheema1	yepp logically identical almost just a comment difference	11:56
alcohol	so, in other words, no they are not identical	11:56
srbcheema1	hmm they are not	11:56
	→ manuelschneid3r joined	11:56
alcohol	then why do you expect the behaviour to be identical?	11:57
srbcheema1	I just logically thought if its working on one then it should work on second ..	11:57
	→ XDS2010\|AFK joined	11:57
srbcheema1	means all I need is a reason why they are not behaving same	11:57
	← XDS2010\|AFK left	11:58
	→ tvale joined	11:58
srbcheema1	@alcohol please once have a look at the link .. i have provided both the branches	11:58
	https://stackoverflow.com/questions/49049047/delete-top-second-commit-using-git-rebase-i	11:58
	← weijin left	11:58
	← YuGiOhJCJ left	12:02
	→ YuGiOhJCJ joined	12:02
m0viefreak	srbcheema1: you already got a perfectly valid answer in the comments there	12:02
	→ meadmoon joined	12:04
	← amatas_ left	12:04
	← cstratak left	12:04
	→ floppydh_ joined	12:05
	→ cstratak joined	12:05
srbcheema1	@m0viefreak i am still doubtful why it worked for branch "good" and why not for branch "bad"	12:06
m0viefreak	because you got lucky	12:06
	might as well not have	12:07
	→ ioc_ joined	12:07
srbcheema1	I am in doubt why is it behaving differently. whats difference in both	12:07
m0viefreak	probably the hunk context used by the merge strategy to do a "simple" merge	12:07
	→ mario_ joined	12:07
m0viefreak	using a merge-tool you could probably resolve the remaining conflicts more or less automatically	12:07
srbcheema1	have you checked the difference in two branches "good" and "bad"	12:08
	← mario_ left	12:08
	→ hussam joined	12:08
	→ albel727 joined	12:08
m0viefreak	no	12:08
	not in detail	12:08
srbcheema1	using merge tool is not issue . issue is the doubt on why git did so .. according to me it should have done same in both the branches. my point is I am not getting logical explanation on it	12:09
	← YuGiOhJCJ left	12:09
	→ weijin joined	12:09
m0viefreak	ive looked at it briefly	12:11
	seems obvious	12:11
srbcheema1	@m0viefreak I have displayed content of file after every change. there are only 5 commits , main is master commit , from there two branches emerge both the braches have 2 commits each. both the branchs are identical in content except the top commit is bit different	12:11
m0viefreak	in the bad case you introduced new context before the line yuu the modify in a follow-up commit	12:11
	removing that 1st commit then causes the context to be completely different	12:11
	as you can clearly see by the conflict markers	12:12
	← Darcidride left	12:12
	→ YuGiOhJCJ joined	12:12
	→ prsn joined	12:12
srbcheema1	ohkay so git does work be remembering the upper content .. i thought top commit should know is that it has to change the `int main(){` line to `int main(){//main func`	12:13
m0viefreak	what if that line was there more than once?	12:14
	← pp5mgt left	12:14
m0viefreak	which one should it change?	12:14
srbcheema1	I means with some position also and some more data	12:14
m0viefreak	there you have it	12:14
srbcheema1	that could identify that	12:14
m0viefreak	more data	12:14
srbcheema1	some more data that could uniquely identify that line uniquely in the file	12:15
m0viefreak	and that data is different when applying commit2 on commit1 than when applying comming2 on commit0	12:15
	so you got a conflict	12:15
	→ kbaegis joined	12:15
	→ pp5mgt joined	12:15
	← weijin left	12:16
	← cbreak left	12:16
	→ cbreak joined	12:16
	← prsn left	12:17
	→ goatish joined	12:17
srbcheema1	how can i get to know what that data that git uses to uniquely identify that line uniquely in file	12:17
	→ nHeck joined	12:17
m0viefreak	dunno, probably related to the merge-strategy used	12:18
srbcheema1	means is it the data lines just above it .. they too may be duplicate in file	12:18
	ohkay	12:18
	thanks for help	12:18
nHeck	Hi, I want to remove 3 commits from origin master, but I found that i cannot reset --hard then push --force on master, what's the solution?	12:18
srbcheema1	really all the info you provided was clear and helpful	12:18
oxymoron93	revert those commits nHeck	12:19
nHeck	okay, thanks :)	12:19
oxymoron93	seems like force push is forbidden by the owner of remote repo	12:19
	← srbcheema1 left	12:19
nHeck	will it remove the user that did those commit from git shortlog? The issue is that it's a school repo, and we're not allowed to have more than x users, but i pushed from a machine where my gitconfig did not have the right user name	12:22
	← cbreak left	12:22
	→ cbreak joined	12:22
	← Cabanossi left	12:22
m0viefreak	no, the original 3 commits will still be there	12:23
	→ srbcheema1 joined	12:23
	← meadmoon left	12:23
jast	well, if you can't force push, you can't get rid of those commits	12:23
	→ weijin joined	12:23
	→ shinnya joined	12:23
jast	you could try deleting and re-creating the branch (git push --delete), but probably that will be blocked, too	12:23
srbcheema1	@m0viefreak one more help if you can . like we can see commits in all branches using git log --oneline --decorate --graph --all can we also see those commits that are not in any branch	12:24
	basically I want to see a commit that i made in a branch and then i removed that branch	12:25
jast	look for it in 'git log -g'	12:25
nHeck	jast: but if i delete master there'll be nothing on it after right?	12:26
srbcheema1	@jast i have used it --graph and it only show all the commits in all the branches	12:26
	→ alezandro joined	12:26
jast	nHeck: you can, in theory, delete the remote branch, fix your local branch and then push it... but typically deleting the remote branch will be denied in the first place	12:26
	→ dsdeiz_ joined	12:26
jast	srbcheema1: -g is not --graph	12:26
srbcheema1	ohkay lemme give it a try	12:27
jast	it shows you the reflog (in this case the reflog of HEAD, since the reflog of your deleted branch is gone)	12:27
	→ cdg joined	12:27
oxymoron93	it is useful to read man git log before trying	12:27
gitinfo	the git-log manpage is available at https://gitirc.eu/git-log.html	12:27
jast	!reflog	12:27
gitinfo	The git reflog (`git log -g`) records the SHAs of your HEADs for 2+ weeks. `git checkout -b myrestore OLDSHA` and `git reset --hard OLDSHA` will relink to that state via a new and current branch respectively, see http://sethrobertson.github.com/GitFixUm/ for full details. WARNING: reset --hard will trash any uncommitted changes! Visualize with: gitk --all --date-order `git log -g --pretty=%H`	12:27
oxymoron93	wow didn't know	12:28
	→ southernirc joined	12:29
srbcheema1	didn't know what ? -g ? actually I thought they might be same --graph and -g	12:29
	← weijin left	12:29
jast	yeah, it's slightly confusing, but that's just the way it is	12:29
	← dsdeiz_ left	12:29
	← cqi left	12:29
	← pfleck left	12:29
	→ pfleck joined	12:30
jast	I think --graph was added later than -g so it was too late to use that :)	12:30
	← alezandro left	12:30
oxymoron93	didn't know git log -g is another reflog	12:31
jast	I prefer it because it sorts newest first	12:31
nHeck	jast: worked with git rebase then edit instead of pick then ammend! ty	12:31
	← chachasmooth left	12:31
	← cdg left	12:31
	→ chachasmooth joined	12:32
	← WakiMiko left	12:33
srbcheema1	i am confused in converstion .. are we all oxymoron93 jast nHeck talking on same issue or I m just getting confused as you are discussing some other issue . actually sorry for this i am newbie	12:33
	→ WakiMiko joined	12:33
osse	git reflog = git log -g --abbrev-commit --pretty=oneline	12:33
jast	srbcheema1: nHeck is talking about a different topic, the rest of recent conversation was all about you :)	12:35
	osse: also it shows the first entry first, and the newest last	12:35
	← YuGiOhJCJ left	12:35
osse	not here :O	12:36
	the outputs are identical	12:36
oxymoron93	for me too	12:36
	→ tcorneli joined	12:36
srbcheema1	ohh reflog is really the thing that i needed .. it keeps track of all the deleted comits	12:37
jast	it tracks every operation that changes a ref	12:37
	each branch (that still exists) has its own reflog, too	12:37
	← yn left	12:37
	→ anjen joined	12:38
	← southernirc left	12:40
	← kurkale61 left	12:40
srbcheema1	one thing more if a branch is deleted all the commits of that branch are gone. so if we know the top commit SHA of that branch can we restore it in future anytime ?	12:41
	← xfbs left	12:41
	→ math-alpha joined	12:41
osse	srbcheema1: yes	12:41
	srbcheema1: for at minimum 14 days	12:42
srbcheema1	after 14 days is the commit totally washed away if it is not in any branch	12:42
jast	not exactly	12:42
osse	it can be. depends on when git decides something needs to be deleted	12:42
	→ Anticom joined	12:43
osse	in practice it's often more than that	12:43
jast	git doesn't clear away old data on its own	12:43
srbcheema1	ohkay to experiment it i will have to wait 14 days .. can i recover it or not using SHA or not	12:43
	→ kurkale61 joined	12:43
jast	when you run 'git gc', it cleans up, and there are grace periods for unreferenced objects and reflog entries	12:43
	and once objects are cleaned away, you can't reference them at all, they're completely gone	12:44
nHeck	no way to delete commits from a remote's history if --force isn't allowed?	12:44
osse	jast: won't gc --auto delete such objects?	12:44
	→ cfoch_ joined	12:44
jast	I believe, from a quick read of the code, that --auto only packs loose objects	12:44
srbcheema1	so it means that we if we run gc then we cant recover that commit even if we have SHA and time is less than 14 days	12:44
osse	no	12:45
jast	oh, it does a repack	12:45
osse	only if you run gc and it's been MORE than 14 days	12:45
	← metts left	12:45
	← rajat left	12:45
srbcheema1	ohkay thanks for all the information	12:45
jast	right, --auto prunes the reflog, too	12:46
	so ignore what I said, git does do automatic clean-ups	12:47
	← shinnya left	12:47
	→ yn joined	12:47
jast	nHeck: if using --delete to remove and re-create the branch isn't allowed, either, then no	12:47
	(that's "git push --delete", not any other kind of delete)	12:48
	→ cdown joined	12:48
	→ flaviodesousa joined	12:48
	→ lessless joined	12:50
	← h12o left	12:50
	← m0viefreak left	12:51
	← floppydh_ left	12:51
	← LeMike_ left	12:52
	→ floppydh__ joined	12:52
	→ m0viefreak joined	12:52
	← tvale left	12:52
	← srbcheema1 left	12:52
	→ LeMike joined	12:52
	← zzz_ left	12:53
	← cbreak left	12:54
	→ cbreak joined	12:54
	→ metts joined	12:55
	→ sanscoeur joined	12:56
	← sanscoeur left	13:00
	→ mattkrea joined	13:00
	→ birgersp joined	13:01
	← Anticom left	13:03
	← Raed\|Mobile left	13:04
	→ rominron_ joined	13:04
	→ XDS2010\|AFK joined	13:05
	← floppydh__ left	13:05
	← XDS2010\|AFK left	13:05
	→ floppydh__ joined	13:05
	← rominron_ left	13:06
	→ rominro__ joined	13:06
	← cbreak left	13:06
	→ cbreak joined	13:06
	→ Sonderblade joined	13:07
	← rominronin left	13:07
	→ weijin joined	13:08
	→ tvale joined	13:10
	→ mborgard joined	13:10
	→ Anticom joined	13:11
	← Anticom left	13:11
	→ IchigoBlack joined	13:11
	← lessless left	13:11
	← weijin left	13:12
	→ denete joined	13:12
	← denete left	13:12
	→ denete joined	13:13
	← rosa left	13:20
	← dmc left	13:22
	← luckman212 left	13:23
	← pfleck left	13:23
	→ banisterfiend joined	13:23
	← dvl left	13:23
	← goatish left	13:24
	→ dvl joined	13:24
	→ dmc joined	13:25
	← re1 left	13:27
	→ re1 joined	13:27
	← mikecmpbll left	13:27
	← fahadash left	13:27
	→ lessless joined	13:29
	→ luckman212 joined	13:29
	→ weijin joined	13:30
	← xcm left	13:30
	→ xcm joined	13:31
	← Gurkenglas left	13:31
	← phinxy left	13:31
	→ CodeSlingerPaul joined	13:31
	← cdown left	13:31
	→ phluks joined	13:32
	← rwb left	13:33
	→ thinkpad joined	13:33
	→ ams__ joined	13:33
	→ TooLmaN joined	13:33
	← dvl left	13:34
	← weijin left	13:34
	→ Link_Doyle joined	13:35
	→ cdown joined	13:35
	← TooLmaN left	13:36
	→ floppydh___ joined	13:37
	← texinwien_ left	13:37
	→ TooLmaN joined	13:37
	← banisterfiend left	13:38
	→ texinwien_ joined	13:38
	→ southernirc joined	13:38
	← floppydh__ left	13:38
	← TooLmaN left	13:39
	← tcorneli left	13:41
	← math-alpha left	13:42
	← rominro__ left	13:42
	→ banisterfiend joined	13:42
	← banisterfiend left	13:43
	→ jorj joined	13:46
	→ weijin joined	13:46
	← mattkrea left	13:46
	← exotime left	13:49
leah2	anyone familiar with the git codebase? are there parts that can generate color that are not controlled by color.c:want_color or the git config --get-color[bool] things?	13:50
	→ exotime joined	13:50
	← weijin left	13:50
_ikke_	Not that familiar	13:50
leah2	at a first glimpse that seems to do it	13:51
	i'll ask the ml	13:51
_ikke_	yeah, they'll able to provide details	13:52
	← madewokherd left	13:53
	→ phinxy joined	13:57
	→ fission6 joined	13:59
	← nimomo left	13:59
	→ XDS2010\|AFK joined	13:59
	→ dege joined	13:59
	→ nimomo joined	13:59
	← XDS2010\|AFK left	14:00
	→ weijin joined	14:02
	← Sonderblade left	14:03
	← anjen left	14:03
	← re1 left	14:04
	→ banisterfiend joined	14:04
	→ dermoth joined	14:04
	→ fassl joined	14:05
	← weijin left	14:06
	→ synthroid joined	14:07
	→ cdg joined	14:08
	← texinwien_ left	14:08
	→ stutter_ joined	14:08
	→ Xuefer joined	14:09
	→ texinwien_ joined	14:09
	→ cdg_ joined	14:10
	→ rwb joined	14:10
	→ Sonderblade joined	14:11
	→ bonemind joined	14:12
	→ Raed\|Mobile joined	14:12
	← cdg left	14:13
	← fission6 left	14:15
	← xcm left	14:17
	→ xcm joined	14:17
	→ King_Hual joined	14:17
	← King_Hual left	14:17
	→ King_Hual joined	14:17
	→ Amanas joined	14:18
	→ MarioBranco joined	14:20
	← Mi5ter left	14:21
	← garo left	14:25
	→ garo joined	14:26
	→ dsdeiz_ joined	14:27
	← ShekharReddy left	14:27
tga	greets	14:28
	← pp5mgt left	14:28
	← cstratak left	14:29
tga	if I have history like A1 B1 A2 B2 HEAD, is there an easy way of turning it into A B HEAD, by combining random commits into a single one?	14:29
	← sQVe left	14:29
	← zefferno left	14:29
	← dsdeiz_ left	14:30
	→ mikecmpbll joined	14:30
_ikke_	tga: git rebase -i can do that	14:30
tga	oh hmm I had the impression I needed something more complicated	14:33
	tga tries it out	14:33
	→ AndresInSpace joined	14:33
	← Es0teric left	14:33
	→ durham joined	14:34
_ikke_	You can combine commits by choosing squash or fixup for the bottom commits (they will be squashed in the commit above)	14:34
jast	and you can reorder them	14:34
tga	thanks, I'll give it a try	14:35
	→ Es0teric joined	14:35
	← xcm left	14:36
	← pnepe6 left	14:36
	→ xcm joined	14:37
	→ mattkrea joined	14:37
	← mattkrea left	14:38
	→ Andros joined	14:38
	← Bhootrk left	14:38
	→ weijin joined	14:39
	→ Bhootrk joined	14:39
	→ re1 joined	14:39
	← birgersp left	14:40
	← re1 left	14:41
	→ mizu_no__ joined	14:41
	→ re1 joined	14:41
	→ talin joined	14:41
	← tombusby left	14:42
talin	hello. if i use git diff with a default difftool set, how can i force it to use regular diff?	14:42
jast	'git diff' doesn't use difftool, only 'git difftool' does	14:43
talin	weird... i get meld when i type git diff	14:43
jast	are you talking about custom diff drivers?	14:43
	→ tombusby joined	14:43
jast	well, that's weird	14:43
	← weijin left	14:43
	← mizu_no__ left	14:45
	→ pfleck joined	14:45
	← nimomo left	14:50
	← cliluw left	14:50
	→ rafasc joined	14:50
	→ raynold joined	14:50
	← cdown left	14:50
	→ morfin joined	14:51
morfin	it's possible to branch from old commit right?	14:51
	no idea how does this work when HEAD is detached	14:52
canton7	yes 'git checkout -b branchname <old commit>'	14:53
	(or 'git branch branchname <old commit>')	14:53
	it doesn't matter whether HEAD is attached or not	14:53
	← xcm left	14:53
	→ xcm joined	14:53
	→ cstratak joined	14:54
	→ weijin joined	14:56
	→ sanscoeur joined	14:56
	→ dviola joined	14:57
	← ioc_ left	14:57
	← dcpc007 left	14:57
	← nevodka left	14:58
	← Xuefer left	14:58
	→ cdg joined	14:59
	→ shpoont joined	14:59
	→ Xuefer joined	15:00
	← Cavallari left	15:01
	→ cdg__ joined	15:01
	← weijin left	15:01
	→ zzz joined	15:01
	→ cdown joined	15:01
	← sanscoeur left	15:01
	← cdg_ left	15:02
	← flaviodesousa left	15:03
	→ nimomo joined	15:03
	→ pnepe6 joined	15:03
	← cdg left	15:03
	→ h12o joined	15:03
	← cdg__ left	15:05
	← rigid left	15:05
	→ XDS2010\|AFK joined	15:06
	← xcm left	15:07
	→ nevodka joined	15:07
	→ xcm joined	15:07
	← XDS2010\|AFK left	15:07
	→ thiago joined	15:07
	← h12o left	15:08
	→ weijin joined	15:11
	→ PioneerAxon_ joined	15:14
	→ bwn joined	15:15
	← Bhootrk left	15:15
	← weijin left	15:16
	→ greyline joined	15:16
greyline	hi all	15:16
	→ PMS joined	15:16
greyline	oh.. you don't know anything about tortoisegit, do you?	15:16
	← PioneerAxon left	15:16
	← abba left	15:17
pandem	we don't?	15:17
	→ kn-928 joined	15:17
greyline	I have a project, every change is commited into the repo, and so on.	15:17
	then I removed a project from my local files, because I want to download that again from the repo	15:17
	← czart left	15:17
greyline	but pull doesn't download anything. Why?	15:18
pandem	maybe you should clone	15:18
greyline	pandem: to the same folder where there are the other files from the repo?	15:18
	pandem: because I want to download everything from the repo	15:19
	to the same folder, if possible	15:19
pandem	if you dont have a .git directory clone	15:19
	← Duikb00t left	15:19
greyline	pandem: I have a .git directory	15:19
pandem	if you do, then reset	15:19
greyline	pandem: what will do the reset?	15:19
fassl	can't you just checkout the branch again?	15:19
	→ czart joined	15:20
greyline	fassl: what does the checkout?	15:20
	← Link_Doyle left	15:20
fassl	it should checkout the files you deleted	15:21
greyline	fassl: the dictionary doesn't tell me much about checkout	15:21
	→ rigid joined	15:21
	← rigid left	15:21
	→ rigid joined	15:21
greyline	so it downloads the deleted files?	15:21
	← kn-928 left	15:22
	→ greggerz joined	15:22
canton7	greyline, this isn't SVN - all history is already on your computer	15:22
	→ madewokherd joined	15:23
	← pfleck left	15:23
greyline	canton7: I don't know what do you mean. What does it mean in practice?	15:23
	https://stackoverflow.com/questions/4235431/git-deleted-some-files-locally-how-do-i-get-them-from-a-remote-repository	15:23
	I have the same problem	15:23
	but I hate console commands, so how to do this in TortoiseGit?	15:24
canton7	greyline, it means that there's no need to download the deleted files from anywhere	15:24
	so don't get distracted by the commands which download data, like fetch and pull	15:24
	instead focus on the commands which change files in your working copy - checkout and reset	15:24
	in tortoisegit I think it's a little green arrow going counter-clockwise	15:25
	it's been a while	15:25
	→ Guest21 joined	15:25
Trieste	hi, I have a repo whose 'origin' remote is just a local path to a bare repo; it works if I push to it over ssh from another machine, but on the same machine, it hangs after outputting "Total 8 (delta 6), reused 0 (delta 0)" - and stays like that, no error, no change in the repo - how would I go about troubleshooting this?	15:25
greyline	canton7: revert?	15:26
	→ dsdeiz_ joined	15:26
canton7	maybe? 'revert' in normal git terminology means something else, but tortoisegit might be breaking the naming conventions	15:27
	→ Gurkenglas joined	15:27
	← durham left	15:28
greyline	canton7: okay, let's stay with your solution... what does "checkout and reset" mean in practice? git checkout HEAD <path> ?	15:28
	← dsdeiz_ left	15:29
	← Guest21 left	15:29
canton7	greyline, if you're using command-line git, first run 'git status'. Does it list your deleted files?	15:29
	→ czart_ joined	15:29
	→ durham joined	15:30
	← tunekey left	15:31
	→ bongjovi joined	15:31
greyline	canton7: yeah	15:31
canton7	greyline, then above, does it say the command to use to un-delete them? :)	15:31
	→ GotHyper joined	15:32
greyline	canton7: yeah, git checkout -- <file>	15:32
canton7	yep	15:32
	so do that	15:32
greyline	canton7: since I have deleted millions of files from this, can I just refer to a folder?	15:33
	← czart left	15:33
canton7	yes	15:33
fassl	git checkout .	15:33
	← manuelschneid3r left	15:33
fassl	should do it i think	15:33
canton7	(that will undo everything, not just the stuff you're trying to un-delete)	15:33
	that might be fine, or it might not, so be careful	15:33
fassl	ah sorry didnt think about that	15:34
	← Rhonda left	15:34
	→ Rhonda joined	15:34
greyline	canton7: just tell me how to download the deleted folder again	15:34
canton7	greyline, you said it youself	15:34
	'git checkout -- folder'	15:34
	← czart_ left	15:34
canton7	and as I said before, you're NOT downloading it	15:35
greyline	canton7: then what it did?	15:36
	→ czart joined	15:36
oxymoron93	it restored it to state at which HEAD points to	15:36
	← garo left	15:36
greyline	oxymoron93: but how did it restored that? without downloading that	15:37
	← zzz left	15:37
	→ fx250_ joined	15:37
	→ garo joined	15:37
	→ AaronMT joined	15:37
	→ zzz joined	15:37
	← SleePy left	15:37
	→ jready joined	15:38
	→ prsn joined	15:38
	← fx250__ left	15:38
canton7	greyline, again, all history is already on your computer	15:38
greyline	canton7: but I thought the original files are not	15:39
	canton7: anyway, thanks	15:39
canton7	all of history is	15:39
	→ shadow236 joined	15:39
greyline	canton7: okay, history meant for me a text history about what I did previously. So I thought it's a text file	15:39
	→ ShapeShifter499 joined	15:40
canton7	no, all of your commit history	15:40
	→ SleePy joined	15:40
greyline	okay	15:40
	← shadow236 left	15:41
	← Arkaniad left	15:41
	← Salek left	15:42
	→ Arkaniad joined	15:42
	← cstratak left	15:42
	→ Salek joined	15:42
	→ pfleck joined	15:43
	→ cstratak joined	15:43
	← exotime left	15:44
	← PMS left	15:44
	→ exotime joined	15:44
	→ Guest83002 joined	15:45
	→ weijin joined	15:50
	→ ShekharReddy joined	15:50
	→ mattkrea joined	15:50
	← oxymoron93 left	15:51
	← mattkrea left	15:51
	→ publio joined	15:51
	← banisterfiend left	15:52
	← synthroid left	15:53
	← seschwar left	15:53
	→ YuGiOhJCJ joined	15:54
	→ joshbright joined	15:54
	← weijin left	15:54
	← f2k_ left	15:56
	← garo left	15:58
	← YuGiOhJCJ left	15:58
	← Gurkenglas left	15:59
	→ YuGiOhJCJ joined	15:59
	→ garo joined	15:59
	→ black_13 joined	16:00
black_13	how do you show all remote branches	16:01
	→ XDS2010\|AFK joined	16:01
	← YuGiOhJCJ left	16:01
	← XDS2010\|AFK left	16:02
_ikke_	git branch -r (everything since last fetch)	16:02
	← nixjdm left	16:02
	← cdown left	16:02
_ikke_	git ls-remote <remote> refs/heads is what the remote currently has	16:02
	→ manuelschneid3r joined	16:02
	→ cdown joined	16:03
	→ threenuc joined	16:03
	← kaustubhw left	16:04
	← wandering_vagran left	16:04
	← Es0teric left	16:05
	← pfleck left	16:05
	→ nixjdm joined	16:05
	→ fission6 joined	16:05
	→ PMS joined	16:06
	→ Es0teric joined	16:06
	← freimatz left	16:09
	→ kpease_ joined	16:11
	← phinxy left	16:11
	→ fx250__ joined	16:12
	→ sanscoeur joined	16:13
	← fx250_ left	16:13
	→ weijin joined	16:14
	← nimomo left	16:14
	→ nimomo joined	16:16
	→ diogenese joined	16:16
	→ pfleck joined	16:16
	→ peacememories joined	16:16
	← diogenese left	16:16
	← sanscoeur left	16:17
	← stutter_ left	16:17
	→ diogenese joined	16:17
	← weijin left	16:18
	← nimomo left	16:20
	← chele left	16:23
	← prg318 left	16:23
	→ prg318 joined	16:24
	→ phinxy joined	16:25
	← diogenese left	16:27
	→ stutter_ joined	16:30
	→ rajat__ joined	16:30
	→ akushner joined	16:31
	← cdown left	16:31
	→ cdown joined	16:34
	→ al-damiri joined	16:35
	→ kneeki joined	16:36
	→ diogenese joined	16:38
	← durham left	16:39
	→ dendazen joined	16:39
	← diogenese left	16:40
	→ Marie joined	16:40
	← dmone left	16:41
	gitinfo set mode: +v	16:41
Marie	Hi I'm having an issue and I was wondering if someone had an explaination	16:42
	← alcohol left	16:42
Marie	everytime I push a new commit, it grabs older commits with it and I have no idea why.... and no I do checkout master BEFORE I create a new branch	16:42
	→ kfoonamalik joined	16:43
	→ salek_ joined	16:44
	→ alcohol joined	16:44
	← Salek left	16:44
	→ rosa joined	16:45
	← ePirat left	16:46
	← xcm left	16:46
	← thiago left	16:47
	← bonemind left	16:47
	→ xcm joined	16:47
	→ weijin joined	16:47
	→ Salek joined	16:47
_ikke_	Marie: what do you mean wih 'grabs older commits with it'	16:47
	← rosa left	16:47
	← peacememories left	16:48
Marie	@_ikke_ well when I look in bitbucket before I do a pull request, it shows the commit and there should be only one (latest one) but instead there are 2 older ones which were created in a different branch and merged days ago	16:48
	← salek_ left	16:49
	→ Cavallari joined	16:49
	→ ePirat joined	16:49
_ikke_	Marie: is bitbucket master up-to-date with your local master?	16:50
Marie	yes it is	16:50
_ikke_	what does git log --oneline master..<branchname> return	16:51
	→ synthroid joined	16:51
	← weijin left	16:51
Marie	4d0184b8a (HEAD -> temp-weather-msg, origin/temp-weather-msg) temporarily msg on basket about delivery delays due to weather	16:52
	← rajat__ left	16:52
_ikke_	so just one commit?	16:53
Marie	yes but in bitbucket there are 3 of them	16:54
_ikke_	Marie: try git log --oneline origin/master..<branchname>	16:54
Marie	4d0184b8a (HEAD -> temp-weather-msg, origin/temp-weather-msg) temporarily msg on basket about delivery delays due to weather 2d61399b4 (master) Merge branch 'master' of ssh://bitbucket.org/devs/pz e1d900ab5 (pcm-fix, TEST-new-component) pcm reflected by bunny pcm	16:56
	← Kulrak left	16:56
Marie	4d0184b8a (HEAD -> temp-weather-msg, origin/temp-weather-msg) temporarily msg on basket about delivery delays due to weather	16:56
	2d61399b4 (master) Merge branch 'master' of ssh://bitbucket.org/devs/pz	16:56
	e1d900ab5 (pcm-fix, TEST-new-component) pcm reflected by bunny pcm	16:56
	jamellebeats → sharkboy	16:56
	← upperdeck left	16:57
_ikke_	so that does show the extra commits?	16:57
	← lessless left	16:57
	→ Kulrak joined	16:57
	← Kulrak left	16:57
	→ Kulrak joined	16:57
	← Metalindustrien left	16:57
	← dege left	16:57
	← tvale left	16:58
	→ weijin joined	16:59
Marie	<_Ikke_> yes it does	17:02
_ikke_	ok, can you run git fetch origin, and then the previous command again?	17:03
	← weijin left	17:03
Marie	still same result	17:04
_ikke_	Right, so that means bitbucket is in fact not up-to-date	17:04
	git push origin master	17:05
Marie	still in my current branch right ?	17:05
	→ anjen joined	17:05
	→ pirocks_ joined	17:06
	← Es0teric left	17:06
	→ floppydh joined	17:07
_ikke_	doesn't matter	17:07
	the branch being pushed is explicitly mentioned, so it does not matter in which branch you are	17:08
	→ XDS2010\|AFK joined	17:08
Marie	lovely I only have 1 commit now in bitbucket and running git log --oneline origin/master..temp-weather-msg	17:08
	→ pout_ine joined	17:09
	← XDS2010\|AFK left	17:09
	← phinxy left	17:09
leah2	anyone else reading git@ via gmane? are there no new mails since a week?	17:10
	→ Es0teric joined	17:11
	→ tvale joined	17:11
	→ solaris joined	17:11
	← suspicious_frog left	17:12
	→ sleepingforest joined	17:12
_ikke_	leah2: you mean gmane news groups?	17:13
leah2	yes	17:13
Marie	msg/ _Ikke_	17:13
leah2	other groups update fine	17:13
_ikke_	Then, no, I don't use the newsgroups	17:13
leah2	:)	17:13
	← ski7777 left	17:15
	← Guest83002 left	17:16
	→ plitter joined	17:17
	→ mlopezviedma joined	17:18
	← kpease_ left	17:18
	← govg left	17:19
	← mlopezviedma left	17:19
	→ cdg joined	17:19
	→ mlopezviedma joined	17:19
	← mlopezviedma left	17:21
	→ mlopezviedma joined	17:21
	→ weijin joined	17:22
grawity	yeah, if you check gmane.discuss, there's been a lot of lists getting unsubscribed or otherwise broken	17:22
	the official git@ archive (public-inbox) provides its own NNTP service, so use that	17:22
osse	I thought the guys behind gmane took it down a couple of years ago	17:23
	→ kpease joined	17:24
	← Es0teric left	17:25
	← kpease left	17:25
	→ fahadash joined	17:25
	← xcm left	17:26
	← weijin left	17:26
_ikke_	only the web part	17:26
	they continued the nntp part	17:27
	→ xcm joined	17:27
	← denete left	17:27
	→ byte512 joined	17:28
grawity	the original person behind Gmane still runs NNTP	17:29
	the people who took over the web site kinda went AWOL	17:30
	on a related note, today's LWN has an article about public-inbox	17:30
	← srg left	17:31
	← akushner left	17:31
	→ denete joined	17:34
	← kurkale61 left	17:35
	→ weijin joined	17:35
	← DerpGusta left	17:35
	← tvale left	17:36
	→ phinxy joined	17:36
	→ ferdna joined	17:36
	← shpoont left	17:37
	→ sonarpulse joined	17:37
	← minionofgozer left	17:37
	→ shpoont joined	17:38
	→ kpease joined	17:38
	← Xuefer left	17:39
	← weijin left	17:39
	parsnip0 → parsnip	17:40
	→ fx250_ joined	17:41
	← fx250__ left	17:42
	← denete left	17:43
	← stutter_ left	17:43
	→ hahuang65 joined	17:43
	→ denete joined	17:44
	→ glebihan joined	17:45
	← lipvig left	17:45
	→ Tobbi joined	17:46
	← fission6 left	17:47
	→ lipvig joined	17:47
	← hahuang65 left	17:48
	→ h12o joined	17:48
	→ stutter_ joined	17:49
	← djb-irc left	17:49
Cu5tosLim3n	hi	17:50
gitinfo	Cu5tosLim3n: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	17:50
	→ hahuang65 joined	17:50
Cu5tosLim3n	how can I get the submodule commit # for specific repo commit #?	17:51
	→ tvale joined	17:51
	→ thiago joined	17:53
	← King_Hual left	17:53
	← h12o left	17:53
	← cstratak left	17:54
	← cdown left	17:54
	← achadwick left	17:55
	→ fx250__ joined	17:55
	→ mniip joined	17:56
	← pfleck left	17:56
	← floppydh___ left	17:56
	→ cliluw joined	17:57
	← fx250_ left	17:57
	→ Chipzz joined	17:57
	← ShekharReddy left	17:57
	← kfoonamalik left	17:58
	→ sanscoeur joined	17:59
	← floppydh left	18:00
	← PMS left	18:00
	→ PMS joined	18:01
	← thiago left	18:01
	← PMS left	18:01
rafasc	I am having issues with `git rerere`, if I have two branches (A and B) on the same commit, and lets say I rebase them on master. `git rebase master A` fix all conflicts and complete the rebase with --continue. Shouldn't `git rebase master B` work without conflicts?	18:03
	→ XDS2010\|AFK joined	18:03
	← XDS2010\|AFK left	18:03
	← staafl left	18:04
	← cbreak left	18:04
	→ cbreak joined	18:05
	→ sz0 joined	18:05
	→ dpyro joined	18:06
	→ weijin joined	18:06
	→ thiago joined	18:07
	← cdg left	18:08
	→ cdg_ joined	18:08
rafasc	another thing, shouldn't git rerere forget . delete everything on .git/rr-cache?	18:09
tang^	oh crud... autoclrf, I thought this was set already	18:10
	← stutter_ left	18:10
	← venmx left	18:10
	← hahuang65 left	18:10
	← weijin left	18:10
tang^	clrf? man, approach the end of warranty and suddenly the fingers wear out	18:12
	← watabou left	18:12
	← cdg_ left	18:13
	→ finalbeta1 joined	18:15
	→ hahuang65 joined	18:16
	→ stutter_ joined	18:16
	→ fission6 joined	18:17
	→ kaustubhw joined	18:19
	← finalbeta left	18:19
	→ birkh0ff joined	18:21
	→ Es0teric joined	18:22
birkh0ff	I'm doing pip install from git but it is cloning not the most up to date version	18:22
	→ Praxi joined	18:26
	→ ski7777 joined	18:27
	← prsn left	18:27
	juvenal_ → juvenal	18:28
	← pirocks_ left	18:28
	→ h12o joined	18:29
	→ hahuang62 joined	18:30
	← shpoont left	18:30
	→ diogenese joined	18:30
	→ nikheizen joined	18:31
	→ prsn joined	18:32
	← phinxy left	18:32
	→ qwebirc54647 joined	18:33
	← Es0teric left	18:33
	← qwebirc54647 left	18:33
AndresInSpace	if I exclude files in git/info/exclude	18:34
	← h12o left	18:34
AndresInSpace	I'll still get those if someone else committed it right	18:34
	→ Es0teric joined	18:34
AndresInSpace	if I clone repo or such, or pull latest changes	18:35
rafasc	AndresInSpace: yes	18:35
AndresInSpace	k thanks	18:35
	← diogenese left	18:35
rafasc	the behaviour you mentioned can be achieved with sparse checkouts though	18:35
	kind of, git will still transfer the objects to your local repo, but it won't place the files in your working directory.	18:36
	→ weijin joined	18:39
	← parsnip left	18:39
	← Sonderblade left	18:39
	← AfroThundr left	18:39
	→ phinxy joined	18:40
	→ bitBaron joined	18:41
rafasc	I definitely don't understand git rerere. with A->abc123 $git rebase master A; [fix conflicts]; git rebase --continue; $ git reset --hard abc123; $git rebase master A;	18:41
	← sanscoeur left	18:41
	→ sanscoeur joined	18:42
rafasc	Resolved 'filename' using previous resolution. error: Failed to merge in the changes.	18:42
	← hahuang62 left	18:42
	→ venmx joined	18:43
	← sanscoeur left	18:43
	← TomyWork left	18:43
	→ sanscoeur joined	18:43
	← weijin left	18:43
	→ yobop joined	18:44
	← widp left	18:46
	← phinxy left	18:46
	→ jaybeers joined	18:49
	→ kfoonamalik joined	18:50
jaybeers	how would I go about changing the colors used by the invocation of diff that happens when I do "commit -v"?	18:50
grawity	you would edit the color scheme of your text editor	18:50
jaybeers	it's not the same color scheme I get with "git diff"	18:51
	oh geez	18:51
	I just did that didn't I?	18:51
grawity	how should I know?	18:51
	→ dansan joined	18:51
jaybeers	no, I mean, I just brought a question to the completely wrong channel	18:51
Ownix	Probably a dumb question but if I create a tag on a dev branch and later merge to master will that tag show clearly on master?	18:51
dansan	How can I get a jar open that's stuck. It's jelly	18:51
	← yobop left	18:52
dansan	I just brought a question to the completely wrong channel	18:52
	=) Just kidding jaybeer	18:52
grawity	dansan: unzip foo.jar	18:52
jaybeers	brain fart!	18:52
dansan	lol!!	18:52
Ownix	I am trying to tag version releases without committing directly to master since all merges are in the form of Pull Requests which get squash merged by a manager	18:52
dansan	grawity \o/	18:52
	→ weijin joined	18:52
	→ Sonderblade joined	18:52
grawity	some text editors really have a color scheme for .git/COMMIT_EDITMSG	18:52
dansan	What is the easiest way to get the hash of your head? Wow, that sounds strange...	18:53
	git log --pretty=%H\|tail -1, but is there a better way?	18:53
jaybeers	grawity: yeah that's definitely what it is, I just wasn't thinking	18:53
	dansan: how dare you. :D	18:53
dansan	loL!!	18:53
	← synthroid left	18:54
jaybeers	Ownix: tags are tied to commits, not branches, so as long as that commit still exists the tag will as well	18:54
	← cbreak left	18:55
	→ cbreak joined	18:55
	← weijin left	18:57
dansan	oops, I meant git log --pretty=%H\|head -1	18:57
	→ buyfn joined	18:57
	← stutter_ left	18:58
	→ wootehfoot joined	18:58
	← Xiti left	18:58
rafasc	dansan: git rev-parse HEAD?	18:58
	→ Xiti joined	18:58
dansan	rafasc: ty!	18:59
	← zzz left	18:59
	← bongjovi left	19:01
	→ mattkrea joined	19:01
	→ watabou joined	19:01
	→ pirocks_ joined	19:01
	→ Guest21 joined	19:02
	← mattkrea left	19:03
	← tvale left	19:03
Ownix	jaybeers: this might be outside the scope of this but is it unwise to bump my projects version number and tag it with that version number inside of a feature/bugfix branch?	19:04
	It seems to me like it would be more desirable to tag and commit directly to master	19:05
	tag the merge commit anyway, IE "this is version 1.2 and everything in this commit is being released.	19:05
	→ ldiamond_ joined	19:06
	← plitter left	19:06
	← rokups left	19:07
	→ energizer joined	19:07
	← tvw left	19:08
	→ yobop joined	19:08
Ownix	I suppose id benefit more with a more complicated branching system with dedicated branches for releases.	19:08
	← MarioBranco left	19:09
	→ XDS2010\|AFK joined	19:10
	→ h12o joined	19:11
rafasc	Ownix: if master is your release branch, you would get some jumps in versions	19:11
	← XDS2010\|AFK left	19:11
	→ akushner joined	19:12
	→ cdg joined	19:13
	← hahuang65 left	19:13
	← Guest21 left	19:14
	→ durham joined	19:15
	← h12o left	19:15
	→ zzz joined	19:16
	→ tvale joined	19:16
	← cdg left	19:17
	← akushner left	19:17
	→ Sasazuka joined	19:17
jaybeers	Ownix: that's really down to personal preference but personally I wouldn't do that, no	19:19
	→ Phylock joined	19:19
jaybeers	now, what some people do is make a version branch, and then do feature branches off _that_, in which case I'd say it would make sense to commit the version bump to the version branch	19:20
	← thiago left	19:20
	→ thiago joined	19:20
jaybeers	the trouble with doing version bumps in branches is that you never know what order they're going to be merged in	19:21
	now, in practical terms you can just update the version number right before you commit, and then in practical terms you don't have the problem	19:22
	← imanc_ left	19:23
jaybeers	I prefer to solve it more conceptually though and just apply the version bump directly to master. Having said that, although I have spent time thinking about it I wouldn't say my depth of git experience makes me an authoritative source. :)	19:23
	← tombusby left	19:23
	→ tombusby_ joined	19:23
	→ robattila256 joined	19:25
	→ piggah joined	19:25
	← Sauvin left	19:27
Ownix	jaybeers: Thanks that is very helpful. A release brancgh (in your case a version branch) that will eventually be merged back to master sounds like a great idea. I am a one mean team right now so I have a lot of flexibility but I want to automate as much as possible and also I want to be able to connect a software release back to a specific commit which will really alleviate pain in hotfixing/patching issues in older major	19:27
	versions when upgrading is not possible	19:27
	on man team* also one mean team XD	19:27
jaybeers	connecting a release to a commit is what you want tags for	19:28
fassl	we ended up with just one release branch so we could monitor this one with buildbot and issue automatic release builds	19:28
rafasc	jaybeers: that's a good point. Not only the order, but you might lose some versions if you discard a feature.	19:28
jaybeers	huh, yeah that too I guess	19:29
	although the true pragmatist would say it doesn't matter if version numbers aren't sequential I suppose :)	19:29
	but we're not savages	19:29
	Ownix: have you looked into git-flow?	19:29
	rafasc cries in semver.org	19:30
	→ weijin joined	19:30
	→ Noldorin joined	19:30
jaybeers	it's definitely overkill for one-person projects _but_ once you get it set up it's still straightforward and personally I like the habits it trains	19:30
	→ mattkrea joined	19:31
	← zzz left	19:31
	← thiago left	19:32
	← mattkrea left	19:32
	→ Enphuego joined	19:33
jaybeers	http://nvie.com/posts/a-successful-git-branching-model/	19:33
Ownix	Thanks jaybeers I have heard of it and used a variation of it when I worked on a fast paced team	19:34
	→ stutter_ joined	19:34
	← weijin left	19:34
Ownix	I miss having a teamlead/project manager handle all the JIRA tasks and branching/merging/releasing	19:34
	now im the one re-inventing the wheel.	19:34
	← yobop left	19:34
jaybeers	heh	19:34
	→ phinxy joined	19:37
	→ thiago joined	19:37
	→ fnm^ joined	19:38
	← bket left	19:38
	← fnm^ left	19:38
	← phinxy left	19:40
	← xcm left	19:41
	→ xcm joined	19:41
	→ bket joined	19:42
	← Puffball left	19:44
	→ oxymoron93 joined	19:46
	← buyfn left	19:47
	← venmx left	19:49
	→ re1_ joined	19:50
	← re1_ left	19:50
	← tvale left	19:50
	→ h12o joined	19:52
	→ weijin joined	19:53
	← re1 left	19:53
	← h12o left	19:56
	← Sonderblade left	19:57
	← weijin left	19:57
	→ phinxy joined	19:59
	← joshbright left	19:59
	→ yobop joined	20:01
	← cbreak left	20:01
	→ cbreak joined	20:01
	→ re1 joined	20:02
	→ XDS2010\|AFK joined	20:05
	← Es0teric left	20:05
	← XDS2010\|AFK left	20:05
	← ams__ left	20:06
	→ synthroid joined	20:07
	→ cdown joined	20:07
	→ Darcidride joined	20:07
	→ weijin joined	20:07
	→ ToBeFree joined	20:08
	gitinfo set mode: +v	20:08
	→ romanlevin joined	20:11
	→ qwebirc97753 joined	20:12
	← weijin left	20:12
	→ livingstn joined	20:12
	← re1 left	20:15
	← sz0 left	20:15
	← qwebirc97753 left	20:19
oxymoron93	I guess there are no problem with git on Hawaii	20:20
	→ Es0teric joined	20:21
	← yobop left	20:23
	← southernirc left	20:24
	→ pfleck joined	20:24
	← solaris left	20:27
	→ jimmyrcom joined	20:27
	→ djapo joined	20:28
	← watabou left	20:29
	→ joshbright joined	20:29
	→ shpoont joined	20:30
	← fassl left	20:31
	→ kgrimes joined	20:32
	→ ZyX-I joined	20:32
	→ aeontech joined	20:33
	→ h12o joined	20:33
	→ King_Hual joined	20:34
	← King_Hual left	20:34
	→ King_Hual joined	20:34
	→ plitter joined	20:36
	← kpease left	20:37
	→ Simonious_ joined	20:38
	← h12o left	20:38
	→ akushner joined	20:39
	→ \void joined	20:40
	← cbreak left	20:41
	→ jnavila joined	20:42
	→ weijin joined	20:43
	← jimmyrcom left	20:44
	← fission6 left	20:44
	→ nocbreak joined	20:45
	← netj left	20:48
	→ netj joined	20:48
	← weijin left	20:48
	→ buyfn joined	20:49
	→ fission6 joined	20:49
	← borkr left	20:51
	← kbaegis left	20:52
	← mborgard left	20:54
	→ sleepingdeforest joined	20:55
	← madewokherd left	20:56
	→ zzz joined	20:57
	← thiago left	20:59
	← Case_Of left	20:59
	← IchigoBlack left	20:59
	← sleepingforest left	20:59
	→ Case_Of joined	21:00
	→ solaris joined	21:01
	← kgrimes left	21:01
	← ShapeShifter499 left	21:02
	→ kgrimes joined	21:02
	← solaris left	21:02
	→ cdg joined	21:03
	→ zino_ joined	21:05
	← Praxi left	21:05
	← Kulrak left	21:06
	→ Kulrak joined	21:06
	← Kulrak left	21:06
	→ Kulrak joined	21:06
	→ weijin joined	21:07
	→ kyan joined	21:08
	← cdg left	21:08
	→ cdg joined	21:09
	← manuelschneid3r left	21:09
	← Darcidride left	21:12
	← weijin left	21:12
	→ fx250_ joined	21:12
	→ XDS2010\|AFK joined	21:12
	← XDS2010\|AFK left	21:13
	← jack_rabbit left	21:14
	← fx250__ left	21:14
	← romanlevin left	21:14
	← synthroid left	21:14
	← ToBeFree left	21:17
	← kfoonamalik left	21:17
	→ Mike11 joined	21:17
guardian	hello, is it possible after a clone has been done, to modify it to "do as if --reference had been used"?	21:18
	→ weijin joined	21:18
	← Cavallari left	21:19
_ikke_	I don't think so	21:20
guardian	ok	21:20
	→ watabou joined	21:21
	← denete left	21:21
	← nocbreak left	21:22
	→ synthroid joined	21:22
	← weijin left	21:22
	→ cbreak joined	21:23
	→ crose joined	21:23
	→ Gurkenglas joined	21:26
	← pfleck left	21:27
	→ pfleck joined	21:28
	→ peacememories joined	21:29
	← CheckDavid left	21:29
	→ Puffball joined	21:31
	← phluks left	21:32
	→ Bobdude joined	21:32
	← zino_ left	21:32
	← dendazen left	21:33
	→ chaosruler joined	21:34
	← fission6 left	21:34
	→ h12o joined	21:35
	← cbreak left	21:36
	→ nocbreak joined	21:36
	← Raed\|Mobile left	21:36
	← akushner left	21:38
	← AaronMT left	21:39
	← rwb left	21:39
	← h12o left	21:39
	← mlopezviedma left	21:43
	← nocbreak left	21:43
	→ cbreak joined	21:44
	← eroux left	21:44
	→ solaris joined	21:44
	→ yobop joined	21:45
	→ clime joined	21:45
	→ applecrumble joined	21:45
clime	is it possible to `git archive` a certain commit in the same repo on two different systems and get the same sha512 checksum?	21:46
	→ Jitta joined	21:46
	← synthroid left	21:47
clime	...by e.g. carefully chosing the git archive command-line parameters	21:47
	→ mborgard joined	21:47
	← solaris left	21:47
clime	I tried: git archive --format=tar.gz HEAD: > output.tar.gz on two different machines on the same repo ... but that gave different checksums in each case.	21:47
	← shpoont left	21:52
	→ leptone joined	21:52
	→ weijin joined	21:52
leptone	working on branch A I have a commit, then I branch off to branch B. I make a commit on branch B. A's last commit hash in the log is the same as B's second to last.	21:53
sphalerite	clime: tar isn't very suitable for deterministic archives AFAIK	21:53
leptone	I checkout branch A, make another commit, and then squash that commit.	21:54
clime	sphalerite: ok, I tried the same thing with zip but that didn't work either	21:54
	sphalerite: anyway, tar would be be mine main use-case so if it's not reliably possible, then it's just not possible.	21:55
	← crose left	21:55
leptone	Now branch B still has only one more commit in its log but the it's second to last commit hash is now idfferent than the commit hash of the last commit in branch A's log	21:55
clime	but it's a pity :(	21:55
sphalerite	clime: yeah I'm not really sure what's a good format. I know nix archives are deterministic but that's very unlikely to be suitable for your use case	21:55
leptone	so when i point branch B to branch A and look at the diffs all the additions in the second to last commit show as diff, but they're not really	21:56
	← cbreak left	21:56
leptone	how can I resolve this	21:56
	→ cbreak joined	21:56
leptone	obviously some kind of rebase	21:56
sphalerite	clime: not sure how far git archive will get you but there are some steps you can take to make tar behave more deterministically, like giving it a sorted file list and setting all the files' timestamps	21:56
	→ Raed\|Mobile joined	21:56
	← weijin left	21:57
leptone	my question is should I squash the last two commits on branch B into one and then rebase A	21:57
	or should I just rebase A directly?	21:57
clime	sphalerite: well, I guess I would need to ahave an option to tell to strip any non-determinism when packing	21:57
sphalerite	leptone: it's not very clear what you're trying to achieve	21:57
	→ dendazen joined	21:58
	← sentriz left	21:58
	→ fassl joined	21:59
	← Guest63502 left	21:59
	→ Natsume joined	22:00
	← ertes-w left	22:00
	← mattcen left	22:00
	→ ertes-w joined	22:00
clime	e.g. when I donwload tar.gz for a release from Github, I doubt it has always the same checksum for that same release. Or maybe it does?...probably no.	22:01
	← peacememories left	22:01
	→ fission6 joined	22:02
	→ weijin joined	22:03
	→ shinnya joined	22:03
	→ mlopezviedma joined	22:04
	← durham left	22:04
	→ filcab joined	22:04
	← mlopezviedma left	22:04
	→ durham joined	22:05
	filcab → Guest73166	22:05
	→ mlopezviedma joined	22:05
	← Natsume left	22:07
	→ XDS2010\|AFK joined	22:07
	→ mattcen joined	22:07
	← weijin left	22:07
	← Mike11 left	22:07
	← XDS2010\|AFK left	22:07
	← njbair left	22:08
	→ jamiejackson joined	22:09
	← durham left	22:09
sphalerite	clime: actually https://unix.stackexchange.com/questions/164104/how-to-create-a-deterministic-tar-gz-using-git-archive seems to be your exact question :)	22:09
	→ shpoont joined	22:09
sphalerite	clime: and yes, github's archives are nondeterministic	22:09
	→ njbair joined	22:09
sphalerite	I do a lot of stuff with the nix package manager, and it has some funky workaroudns for that	22:10
	→ sentriz joined	22:10
sphalerite	basically fetching them, unpacking them, and then hashing the (deterministic) nix archive of the result	22:10
	← Thominus left	22:10
clime	sphalerite: thanks okay.	22:11
	sphalerite: I feel silly but what is nix archive?	22:12
sphalerite	it's a deterministic serialisation format for a directory tree, which discards stuff like timestamps. Devised primarily for the nix package manager.	22:12
	Nothing to feel silly about, it is somewhat obscure :)	22:13
	(but nix is awesome and you should totally check it out https://nixos.org/nix )	22:13
clime	sphalerite: okay, interesting.	22:13
	looking. Thx.	22:13
	← sentriz left	22:14
clime	sphalerite: so repacking it into nix is totally valid option. Good to know there is a way to do it.	22:15
	sphalerite: that package (the archiver) is probably not available in Fedora, right?	22:16
	→ h12o joined	22:16
sphalerite	yeeeah but it's not exactly a ubiquitous format nor is a whole package manager a dependency you really want to pull in	22:16
	so the patch mentioned in the answer on the SO question is probably a better solution for your case	22:17
	→ sentriz joined	22:17
clime	sphalerite: okay	22:17
	← Phylock left	22:17
	→ peacememories joined	22:18
	← anjen left	22:19
	← jnavila left	22:20
	← neunon left	22:21
	← h12o left	22:21
	→ jstein_ joined	22:21
	jstein_ → jstein	22:21
	← sentriz left	22:21
	← Guest73166 left	22:22
	← wootehfoot left	22:22
	→ favrin85 joined	22:22
	← favrin85 left	22:23
	→ kpease_ joined	22:23
	→ sentriz joined	22:24
	→ rwb joined	22:24
	→ d10n-work joined	22:25
	→ neunon joined	22:26
	→ filcab_ joined	22:28
	→ fx250__ joined	22:28
	← sentriz left	22:28
	→ BookBill joined	22:30
	← fx250_ left	22:30
	← BookBill left	22:31
	← cdown left	22:31
	← ZyX-I left	22:32
	← kyan left	22:33
	← xcm left	22:34
	← yobop left	22:34
	→ jimmyrcom joined	22:34
	→ cdown joined	22:34
	← piggah left	22:35
	← jimmyrcom left	22:35
	→ weijin joined	22:35
	→ stancil joined	22:35
	← MattMaker left	22:36
	← fission6 left	22:36
	→ jimmyrcom joined	22:36
	→ Praxi joined	22:36
	→ MattMaker joined	22:36
	← nikheizen left	22:38
	← Nizumzen left	22:39
	→ Nizumzen joined	22:39
	← weijin left	22:39
	← mattcen left	22:41
	← AndresInSpace left	22:42
	← bitBaron left	22:42
	→ sentriz joined	22:44
	← dendazen left	22:46
	→ gugah joined	22:48
	→ mattcen joined	22:50
	← exotime left	22:51
	← King_Hual left	22:52
	← jready left	22:52
	→ yobop joined	22:52
	→ SyntaxxxErr0r joined	22:52
	→ jready joined	22:52
	← shpoont left	22:53
	← dermoth left	22:54
	→ btree joined	22:54
	← watabou left	22:55
	→ dermoth joined	22:55
	→ shpoont joined	22:55
	→ exotime joined	22:56
	→ weijin joined	22:56
	← jready left	22:57
	← buyfn left	22:58
	← weijin left	23:01
	→ crose joined	23:01
	→ tunekey joined	23:03
	→ fx250_ joined	23:03
	← peacememories left	23:04
	← fx250__ left	23:04
	← njbair left	23:05
	→ venmx joined	23:05
	→ njbair joined	23:06
	← crose left	23:06
	← btree left	23:06
	← Jitta left	23:10
	→ fx250__ joined	23:11
	→ cdg_ joined	23:12
	← fx250_ left	23:12
	→ weijin joined	23:14
	← cdg_ left	23:14
	← threenuc left	23:14
	→ XDS2010\|AFK joined	23:14
	← cdg left	23:15
	← zzz left	23:15
	← XDS2010\|AFK left	23:15
mns	we have a Git repository at work, setup in some data center internally somewhere far away. I want to setup a local read-only mirror of it, so that people can at least pull easily from a local mirror. How would I do this ?	23:15
	← jamiejackson left	23:16
	← howdoi left	23:16
	→ zombieleet joined	23:17
	← weijin left	23:18
	← Andros left	23:18
	← mborgard left	23:19
	→ goweol joined	23:19
	← mikecmpbll left	23:20
	← greggerz left	23:20
black_13	how do you show branch history	23:24
	or show what files were changed over time in a given branch	23:24
	← cbreak left	23:24
	→ cbreak joined	23:25
	← leeN left	23:26
	→ hahuang65 joined	23:27
	← kpease_ left	23:27
	→ nowhereman_ joined	23:27
	← nowhere_man left	23:31
	← \void left	23:31
	← pfleck left	23:34
	→ thiago joined	23:35
	→ weijin joined	23:36
	→ zzz joined	23:37
	→ alip joined	23:37
	→ fstd_ joined	23:37
	→ cagomez joined	23:39
	← stutter_ left	23:39
	→ tremblerz joined	23:40
	← zombieleet left	23:40
	← weijin left	23:41
	← fstd left	23:41
	fstd_ → fstd	23:41
	→ jready joined	23:42
	→ dendazen joined	23:42
	→ nd joined	23:44
tremblerz	Hi! I made some change, made the `add` then `commit` and then did pull which showed conflicts with two files, I resolved the conflict and after merge some of the changes I had made and committed and weren't part of the conflict are lost	23:44
	← zzz left	23:44
tremblerz	I have no idea how could this happen	23:44
	← fahadash left	23:45
	→ kbaegis joined	23:45
	← jready left	23:46
	← livingstn left	23:46
	← nd_ left	23:47
	→ z0_ joined	23:47
	← venmx left	23:48
	← tsia left	23:49
	→ mixaz joined	23:50
	z0_ → z0	23:50
	← NeXTSUN left	23:51
	→ NeXTSUN joined	23:51
	← z0 left	23:53
	→ watabou joined	23:54
	← kbaegis left	23:54
	→ z0 joined	23:55
	← rafasc left	23:56
	→ sanscoeu_ joined	23:58
	← SyntaxxxErr0r left	23:58

Logs Search ←Prev date Next date→

Channels Documentation