IRCloggy #git 2018-03-27

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-27
	← weez17 left	00:00
	→ weez17 joined	00:00
	← fission6 left	00:01
	→ fstd_ joined	00:01
	→ fission6 joined	00:02
	← cahoots left	00:02
	→ sat-aton__ joined	00:03
	→ linuxmodder joined	00:04
	← fstd left	00:04
	fstd_ → fstd	00:04
	← Olipro left	00:05
	← sat-aton left	00:06
	→ cahoots joined	00:07
	← jottr left	00:08
	← m0viefreak left	00:10
	qpdb → Guest78746	00:10
	→ qpdb joined	00:10
	← kingarmadillo left	00:12
	→ armin_ joined	00:12
	← shinnya left	00:13
	→ kingarmadillo joined	00:13
	← Guest78746 left	00:13
	← ProCycle left	00:13
	← fission6 left	00:13
	→ weijin joined	00:15
	← armin left	00:16
	← paxri01 left	00:16
	→ sat-aton joined	00:16
	← sat-aton__ left	00:18
	← habbasi left	00:19
	← thiago left	00:20
	← weijin left	00:20
	→ sat-aton__ joined	00:21
	→ thiago joined	00:22
	← sat-aton left	00:23
	← _ikke_ left	00:24
	→ habbasi joined	00:26
	← cdg left	00:27
	→ paxri01 joined	00:27
	→ sat-aton joined	00:29
	→ _ikke_ joined	00:29
bemo	is it possible to tell when a commit was fetched? (as opposed to the commit date for the commit)	00:29
	→ rchavik joined	00:29
	← sat-aton__ left	00:31
	→ sat-aton__ joined	00:32
	→ [Brain] joined	00:34
	→ flippo joined	00:34
	→ XD joined	00:34
	← sat-aton left	00:34
	← kn-928 left	00:35
	← mmattice left	00:35
	← metalraiden34 left	00:35
	→ weijin joined	00:36
	→ cpr joined	00:38
	← paxri01 left	00:39
	← IndianArya left	00:40
	← weijin left	00:41
	← cpr left	00:41
	→ cpr joined	00:42
	← cpr left	00:43
	→ sat-aton joined	00:44
	← sat-aton left	00:44
	→ sat-aton joined	00:44
bemo	i.e., when it was introduced into the local repository	00:45
	← rockfordal2 left	00:45
	→ IndianArya joined	00:45
	← sat-aton__ left	00:46
	← infinisil left	00:47
	→ durham_ joined	00:47
	→ sat-aton__ joined	00:47
	→ infinisil joined	00:47
	← cahoots left	00:48
	← sat-aton left	00:50
	→ weijin joined	00:50
	→ noobineer joined	00:50
	→ satifant joined	00:50
	← durham left	00:51
	← durham_ left	00:52
	← sat-aton__ left	00:53
	→ cahoots_ joined	00:53
	← pfleck left	00:53
	← nevodka left	00:54
	← dsdeiz left	00:54
	→ sat-aton joined	00:54
	← weijin left	00:54
	← sat-aton left	00:54
	→ sat-aton joined	00:54
nevyn	create/modify time of the object file in the local store?	00:56
	like if you find it in .git/objects.... then just stat the file	00:56
	← satifant left	00:57
	→ dsdeiz joined	00:57
nevyn	bemo: ^^	00:57
	→ durham joined	00:57
	→ h12o joined	00:59
	← ferdna left	00:59
	→ widp joined	00:59
	→ sat-aton__ joined	01:01
	← zxd left	01:03
	← sat-aton left	01:03
	→ nimomo joined	01:04
	← thiago left	01:04
	→ johnflux_ joined	01:04
	→ sat-aton joined	01:04
	→ zxd joined	01:05
	→ ferdna joined	01:06
	→ justanotheruser joined	01:06
bemo	right... does that work if they've been packed? (I'm talking about something I know almost nothing about now)	01:07
	← sat-aton__ left	01:07
	← justanotheruser left	01:07
	→ justanotheruser joined	01:07
nevyn	I thought packing only was for transport	01:08
	← Catatronic left	01:08
bemo	nevyn: oh, is it?	01:08
nevyn	and fetch unpacked into the local store	01:08
	→ sat-aton__ joined	01:08
	← nimomo left	01:08
bemo	okay, I guess I may have asked the wrong question then... I'm really trying to find out when someone may have made a change that introduced a commit into the remote server. (I was using "local" to mean it wasn't from the primary "upstream" repo)	01:09
	← sat-aton left	01:11
bemo	it's a weird question, I know... I just noticed some new history that had been introduced into a repository on one of our servers... but the date is like 2006, and I'm curious when that particular object was "fetched" or introduced into that server's repository... may not be possible to track that... <?>	01:11
	→ stutter_ joined	01:12
	→ sat-aton joined	01:13
	← sat-aton left	01:13
	→ sat-aton joined	01:13
	→ Catatronic joined	01:13
	← sat-aton__ left	01:14
	← felixsanz left	01:14
	→ mmattice joined	01:15
	→ sat-aton__ joined	01:16
	→ felixsanz joined	01:17
	→ asphyxia joined	01:18
	← alhariel left	01:18
	← sat-aton left	01:18
	← asphyxia left	01:19
	→ sat-aton joined	01:20
	→ alhariel joined	01:22
	→ spacesuitdiver joined	01:22
	← sat-aton__ left	01:23
	← novas0x2a\|w left	01:23
	→ weijin joined	01:23
	← spacesuitdiver left	01:24
	→ singlerider joined	01:25
	← Sasazuka left	01:27
	→ xaxxon joined	01:28
	← VoradorPT left	01:28
	← cfoch__ left	01:28
	← weijin left	01:28
	← noobineer left	01:28
	→ noobineer joined	01:28
	→ finalbeta joined	01:28
	← scarabx left	01:30
	← Guest73 left	01:30
	← durham left	01:30
	→ jakogut_ joined	01:30
	← Fernando-Basso left	01:30
	← noobineer left	01:31
	← govg left	01:32
	→ pilcrow joined	01:33
	→ noobineer joined	01:33
	← noobineer left	01:33
	← endiruna left	01:33
	← alezandro left	01:34
	→ durham joined	01:35
	← notze left	01:35
	← XD left	01:37
	→ nimomo joined	01:39
	→ cdg joined	01:43
	← nimomo left	01:44
	→ weijin joined	01:44
	→ cagomez joined	01:46
	← ilbot3 left	01:46
	← cdg left	01:48
	← weijin left	01:48
	← IndianArya left	01:50
	→ mel00010 joined	01:51
	← cagomez left	01:51
	→ IndianArya joined	01:52
	← linuxmodder left	01:53
	→ weijin joined	01:54
	→ ilbot3 joined	01:56
	← h12o left	01:56
nevyn	so with local access to that server it is. by the same method but I don't think there's an inband way to do it.	01:56
	→ linuxmodder joined	01:57
	← widp left	01:57
	← stutter_ left	01:58
	← mborgard left	01:58
	→ fran__ joined	01:59
	→ Lyqyd joined	02:01
	→ lagothrix joined	02:02
	← jakogut_ left	02:02
	→ jakogut_ joined	02:02
	← fran__ left	02:03
	← lagothri1 left	02:05
	← weijin left	02:06
	→ Olipro joined	02:06
	Olipro → Guest72808	02:06
	← einnjo left	02:07
	→ duderonomy joined	02:08
	→ mlopezviedma_ joined	02:08
supernovah	if I git commit -am "something" and git push -uf origin origin/master and bitbucket.org says, last activity 81 seconds ago for a branch which I'm the only person with any rights to even push or pull from, should I expect to see a new commit on bitbucket?	02:09
	→ thiago joined	02:09
	← mlopezviedma left	02:10
	→ Rebuked joined	02:11
supernovah	it says I'm ahead of master by 1 commit	02:11
	remote is called "master" not origin/master, does that matter?	02:11
	→ mborgard joined	02:12
	→ nimomo joined	02:13
	Rebuked → Rebuked_	02:14
	← johnflux_ left	02:14
	→ alezandro joined	02:15
	← nimomo left	02:18
	← Rebuked_ left	02:19
	← watabou left	02:21
	← filcab left	02:23
	→ weijin joined	02:24
	← xaxxon left	02:24
	← mlopezviedma_ left	02:24
	→ widp joined	02:25
	→ filcab joined	02:25
	→ xaxxon joined	02:26
	← sentriz left	02:30
	← guideline left	02:34
	← LichtMacher left	02:34
	← thiago left	02:35
	→ sentriz joined	02:36
	→ xaxxon_ joined	02:36
	← xaxxon left	02:38
	→ kn-928 joined	02:38
	← dansan_ left	02:41
	→ dansan joined	02:41
	→ nimomo joined	02:41
	xaxxon_ → xaxxon	02:42
	→ morenoh149 joined	02:42
	← IndianArya left	02:42
	← weijin left	02:46
	← nimomo left	02:46
	→ weijin joined	02:49
	← LiftLeft left	02:51
	→ johnflux_ joined	02:52
	← sleepingforest left	02:56
	← weijin left	02:57
	→ nimomo joined	02:59
	← rchavik left	03:00
	→ lagothri1 joined	03:00
	→ rchavik joined	03:01
	→ guideline joined	03:01
	→ weijin joined	03:03
	← nimomo left	03:03
	← lagothrix left	03:03
	← rchavik left	03:04
	→ sat-aton__ joined	03:05
	→ duckydan joined	03:06
	← boombatower left	03:07
	← sat-aton left	03:07
	→ jkphaze joined	03:08
	stoopkid → stoopbob	03:13
	← jkphaze left	03:13
	← durham left	03:14
	→ durham joined	03:14
	← durham left	03:14
	← weijin left	03:14
	→ durham joined	03:14
	← durham left	03:15
	→ durham joined	03:16
	← durham left	03:16
	→ durham joined	03:17
	→ jkphaze joined	03:17
	← durham left	03:17
	→ Mattiasl_ joined	03:17
	→ Goplat joined	03:18
	← Mattiaslndstrm left	03:18
	← mborgard left	03:21
	→ rchavik joined	03:22
	→ IndianArya joined	03:22
	→ Raging_Hog joined	03:24
	→ jstimm joined	03:24
	→ karstensrage joined	03:24
	→ weijin joined	03:25
	← fr33domlover left	03:30
	← muricantrump left	03:30
	→ canvon joined	03:30
	→ nimomo joined	03:30
	← canvon_ left	03:31
	→ piggah joined	03:31
	← nimomo left	03:35
	← weijin left	03:36
	← fletom left	03:38
	→ weijin joined	03:40
	← weijin left	03:44
	→ mar77i_ joined	03:44
	← orbyt_ left	03:50
	← theology left	03:50
	← piggah left	03:57
	← kn-928 left	03:58
	→ fletom joined	03:58
	← flippo left	04:00
	→ orbyt_ joined	04:00
	← linuxmodder left	04:00
	← ferdna left	04:00
	→ Crypt0x joined	04:01
	→ linuxmodder joined	04:03
	→ weijin joined	04:04
	→ piggah joined	04:04
	→ govg joined	04:05
	→ Moondhum joined	04:07
	→ Sokol joined	04:08
	← weijin left	04:08
	← Moondhum left	04:08
	→ ferdna joined	04:11
	→ Gurkenglas joined	04:12
	→ PioneerAxon_ joined	04:14
	← PioneerAxon_ left	04:14
	→ PioneerAxon_ joined	04:15
	← PioneerAxon left	04:15
	→ weijin joined	04:16
	← Gurkenglas left	04:17
	→ Gurkenglas joined	04:17
	← weijin left	04:17
	→ justan0theruser joined	04:18
	← justan0theruser left	04:19
	→ justan0theruser joined	04:19
	← justanotheruser left	04:20
	→ weijin joined	04:23
	← piggah left	04:23
	→ xaxxon_ joined	04:24
	← xaxxon left	04:27
	← weijin left	04:27
	← orbyt_ left	04:28
	← jstimm left	04:28
	← kriskropd left	04:33
	→ jstimm joined	04:37
	← IndianArya left	04:38
	← ferdna left	04:39
	← alezandro left	04:39
	xaxxon_ → xaxxon	04:40
	→ goweol1 joined	04:42
	← goweol left	04:43
	→ ferdna joined	04:44
	← morenoh149 left	04:44
	→ hays joined	04:46
	→ sarp joined	04:46
	← Nizumzen left	04:46
	→ watabou joined	04:48
	← watabou left	04:49
	← john-34 left	04:50
	← Sokol left	04:51
	→ Nizumzen joined	04:51
	→ Sokol joined	04:51
	← hbautista left	04:53
	← Mattiasl_ left	04:53
	→ john-34 joined	04:55
	→ weijin joined	04:56
	← Lyqyd left	04:57
	← RougeR left	04:59
	→ chan201 joined	04:59
	← Raging_Hog left	05:00
	← weijin left	05:00
	→ wandering_vagran joined	05:01
	← pks left	05:02
	→ pks joined	05:04
	→ semicolon joined	05:05
	← alhariel left	05:07
	→ weijin joined	05:09
	← john-34 left	05:10
	← chan201 left	05:11
	→ chan201_ joined	05:11
	→ john-34 joined	05:11
	← Circuitsoft left	05:13
	← weijin left	05:14
	← waveclaw left	05:15
	← __main__ left	05:16
	→ __main__ joined	05:17
	← jstimm left	05:17
	→ ArcaTech joined	05:17
	→ jstimm joined	05:17
	→ Darcidride_ joined	05:17
	→ Darcidride__ joined	05:18
	→ waveclaw joined	05:18
	← zlsyx left	05:18
	← Darcidride left	05:19
	← ferdna left	05:20
	← sarp left	05:20
	← Darcidride_ left	05:21
	→ sat-aton joined	05:23
	→ dege joined	05:23
	← jstimm left	05:24
	← Thominus left	05:24
	→ Thominus joined	05:25
	← sat-aton__ left	05:25
	← Thominus left	05:26
	← liefer left	05:27
	→ re1 joined	05:27
	→ cdg joined	05:27
	→ liefer joined	05:28
	→ jstimm joined	05:29
	← jstimm left	05:30
	→ novas0x2a\|w joined	05:30
	→ jstimm joined	05:31
	← cdg left	05:33
	→ howdoi joined	05:33
	→ weijin joined	05:33
	→ nowhereman_ joined	05:33
	→ sarp joined	05:33
	→ sauvin_ joined	05:34
	← nowhere_man left	05:36
	← NerdyPepper left	05:37
	→ LiftLeft joined	05:37
	← weijin left	05:37
	→ Shin_Aska joined	05:39
	→ alezandro joined	05:41
	← john-34 left	05:41
	→ rosa joined	05:41
	→ john-34 joined	05:41
	← john-34 left	05:44
	← dege left	05:44
	→ sleepingforest joined	05:44
	→ john-34 joined	05:44
	← sleepingforest left	05:44
	← alezandro left	05:45
	← johnflux_ left	05:45
	→ sleepingforest joined	05:45
	← dreiss left	05:45
	→ weijin joined	05:45
	→ muelleme joined	05:46
	→ themill joined	05:46
	→ piggah joined	05:46
	→ dege joined	05:47
	← jstimm left	05:48
	→ firegurafiku joined	05:48
	← hays left	05:48
	→ subhojit777 joined	05:49
	→ johnflux_ joined	05:49
	← zhibli left	05:50
	← weijin left	05:50
	← Shin_Aska left	05:50
	← sentriz left	05:51
	→ sentriz joined	05:52
	→ jstimm joined	05:52
	→ veegee joined	05:52
	→ watabou joined	05:53
	→ Raging_Hog joined	05:53
	← rosa left	05:53
	← muelleme left	05:53
	→ rosa joined	05:54
	→ Guest73 joined	05:54
	← novas0x2a\|w left	05:56
	→ novas0x2a\|w1 joined	05:56
	→ venmx joined	05:56
	→ ronskisika joined	06:00
	← jkphaze left	06:00
	→ skisela joined	06:00
	← jstimm left	06:01
	→ jstimm joined	06:02
	→ rexan joined	06:03
	→ weijin joined	06:03
	← Raging_Hog left	06:04
	→ freimatz joined	06:04
	← chan201_ left	06:05
	← weijin left	06:08
	→ jready joined	06:08
	← jstimm left	06:08
	← piggah left	06:09
	→ pfleck joined	06:10
	→ jstimm joined	06:11
	← johnflux_ left	06:12
	→ KeyJoo joined	06:13
	← jstimm left	06:14
	← pfleck left	06:14
	→ jstimm joined	06:14
	← jimmyrcom left	06:15
	→ weijin joined	06:16
	← jstimm left	06:17
	← jready left	06:17
	→ nowhere_man joined	06:18
	← nowhereman_ left	06:18
	→ jstimm joined	06:18
	→ fr33domlover joined	06:19
	→ manuels joined	06:20
	← sauvin_ left	06:20
	← weijin left	06:20
	← staafl__ left	06:26
	→ staafl_ joined	06:26
	→ Gurkenglas_ joined	06:26
	← xaxxon left	06:27
	→ tkore\w joined	06:29
	← tkore\w left	06:29
	→ tkore\w joined	06:29
	← Gurkenglas left	06:29
	→ shpoont_ joined	06:30
	← FortunaTP left	06:31
	→ FortunaTP joined	06:31
	→ sat-aton__ joined	06:32
	→ rominronin joined	06:32
	→ sanscoeu_ joined	06:32
	→ navidr joined	06:33
	→ weijin joined	06:33
	← sat-aton left	06:34
	→ sat-aton joined	06:34
	← sat-aton left	06:34
	→ sat-aton joined	06:34
	→ sauvin_ joined	06:35
	← sanscoeur left	06:35
	← duderonomy left	06:36
	sauvin_ → bocaneri	06:37
	→ Tobbi joined	06:37
	← sat-aton__ left	06:37
	← weijin left	06:38
	→ weijin joined	06:38
	← venmx left	06:38
	← weijin left	06:39
	← sat-aton left	06:41
	→ zeroed joined	06:43
	→ NerdyPepper joined	06:43
	→ xaxxon joined	06:43
	→ satifant joined	06:43
	← jstimm left	06:48
	→ sammyg joined	06:48
	→ jstimm joined	06:48
	← Random832 left	06:50
	← kingarmadillo left	06:50
	→ tarkus joined	06:52
	→ rokups joined	06:55
	→ weijin joined	06:55
	→ dreiss joined	06:56
	→ asphyxia joined	06:57
	← subhojit777 left	06:58
	→ kes joined	06:58
	← weijin left	07:00
	← ronskisika left	07:00
	→ ronskisika joined	07:00
	← xaxxon left	07:01
	→ weijin joined	07:03
	→ paxri01 joined	07:04
	→ rfuentess joined	07:05
	← Gurkenglas_ left	07:06
	← Guest73 left	07:07
	← weijin left	07:07
	→ Random832 joined	07:09
	→ abba joined	07:09
	→ RougeR joined	07:10
	← RougeR left	07:10
	→ RougeR joined	07:10
	→ oxymoron93 joined	07:11
	← sarp left	07:13
	→ cur8or joined	07:13
widp	Is using git for backup a good idea?	07:13
	← thallada left	07:15
	→ kingarmadillo joined	07:16
rfuentess	widp, ABSOLUTELY! well ,depends	07:17
	which type of backup ? :P	07:17
	and how much private must be ?	07:18
	← cur8or left	07:18
	→ weijin joined	07:18
	→ Shin_Aska joined	07:19
widp	Let's say as Google drive replacement.	07:19
	→ flaviodesousa joined	07:19
	mar77i_ → mar77i	07:19
	→ sarp joined	07:20
NerdyPepper	widp: is there a reason you want to replace g drive?	07:20
rfuentess	widp, mmm like for an incremental backup ? For binaries files	07:20
widp	NerdyPepper: my question was actually motivated by Google keep	07:21
	← Serus left	07:21
	← kingarmadillo left	07:21
NerdyPepper	widp: if it aint binaries, go for it	07:21
widp	I replaced that by something called syncthing, for syncing text files.	07:22
	And an app that deals wiTh these text files I think uses git as the back end.	07:22
	I am not really sure if Google keep syncing is more reliable.	07:22
rfuentess	widp, I found this for e-mail archives, https://www.worthe-it.co.za/ops/2017/12/21/using-git-for-incremental-backups.html	07:22
	← weijin left	07:22
rfuentess	maybe can be used in a similar fashion for the notes?	07:23
	← Bobdude left	07:23
	← dsdeiz left	07:23
	→ MurkyLizard joined	07:24
NerdyPepper	widp: what exactly is the use case here?	07:24
	→ Guest73 joined	07:24
widp	I don't really know.	07:24
	I see people using git everywhere these days.	07:24
	I guess I just wanted to find somethings that git is not good at.	07:25
	Binary backups are one.	07:25
	→ pfleck joined	07:25
	→ dsdeiz joined	07:26
	→ Serus joined	07:27
widp	I also hear mercurial has better "porcelain"	07:27
	→ sostenuto joined	07:29
	← mattcen left	07:33
	← pnepe6 left	07:33
	← alyptik left	07:33
	← Oatmeal left	07:33
	→ schleppel joined	07:35
	→ pnepe6_ joined	07:35
	→ dmone joined	07:35
	← sammyg left	07:35
	← dreiss left	07:35
	← up_the_irons left	07:35
	→ up_the_irons joined	07:35
	→ typikal joined	07:35
	← gmh left	07:35
	→ mattcen_ joined	07:35
	typikal → alyptik	07:35
	mattcen_ → mattcen	07:35
	→ sammyg joined	07:38
	→ thallada joined	07:39
	← asphyxia left	07:39
	← pfleck left	07:39
	→ gmh joined	07:40
	← paxri01 left	07:42
	→ Guest73_ joined	07:48
	← Guest73 left	07:49
	← sarp left	07:49
	→ grayjoc joined	07:49
	→ cdown joined	07:49
	← gmh left	07:49
	→ sarp joined	07:49
	← sammyg left	07:49
	← ShapeShifter499 left	07:49
	← nivag left	07:49
	← TinkerT left	07:49
	→ weijin joined	07:49
	→ kingarmadillo joined	07:49
	→ TinkerT joined	07:50
	→ nivag joined	07:52
	← kingarmadillo left	07:54
	← rosa left	07:58
	← weijin left	07:58
	→ gmh joined	07:58
	→ no_gravity joined	07:58
no_gravity	Good Morning	07:58
	When a file gets renamed, git does show it as if the files was deleted and a new file was created. Is that normal?	07:58
	→ pfleck joined	07:58
	→ venmx joined	07:59
selckin	yes	08:00
NerdyPepper	no_gravity: yeah	08:00
	→ seschwar joined	08:00
selckin	you can configure it to try and detect it and show it as move, but still recorded same way	08:00
	→ eshlox joined	08:00
no_gravity	So how do you deal with it? If a coder renames a file, how do you make sure the content is not changed?	08:01
	→ howlymowly joined	08:01
	← cdown left	08:01
	→ Raging_Hog joined	08:02
	← pfleck left	08:02
	← KeyJoo left	08:03
	→ gareppa joined	08:04
	→ King_Hual joined	08:04
	← King_Hual left	08:04
	→ King_Hual joined	08:04
	← ronskisika left	08:05
	→ kriskropd joined	08:06
	→ sammyg joined	08:06
	→ cagomez joined	08:07
	← rexan left	08:07
	← zeroed left	08:08
	→ floppydh joined	08:09
	→ Coop56 joined	08:10
	→ sword` joined	08:10
	← Coop left	08:10
	← sword left	08:11
	→ ShapeShifter499 joined	08:11
	← cagomez left	08:12
	→ leeN joined	08:13
	→ MartyH joined	08:13
	← Nizumzen left	08:14
	→ mosab joined	08:14
	← ArcaTech left	08:14
	← cahoots_ left	08:15
	→ cahoots__ joined	08:15
	← gareppa left	08:15
	→ Oatmeal joined	08:15
	→ gareppa joined	08:16
	→ borkr joined	08:17
	← sleepingforest left	08:17
	← borkr left	08:17
	→ zeroed joined	08:18
	→ f2k joined	08:18
	→ KeyJoo joined	08:18
	← peterR`` left	08:19
	← RougeR left	08:19
	← MartyH left	08:20
	→ MartyH joined	08:20
MartyH	Probably a really tired question, and there is lots on the internet, but I can't figure out what I need to do: I'm getting warnings LF line endings are being converted to CRLF. I don't want this to happen, I want my line endings to be committed as they are in my working directory. git config -l shows core.autocrlf=false	08:20
	what else should I be doing?	08:21
	(or shouldn't I be doing?)	08:21
	→ Asenar joined	08:21
	← john-34 left	08:22
	→ weijin joined	08:24
	→ kaustubhw joined	08:27
no_gravity	Now I see 'git log' has a --follow parameter.	08:27
	That correctly detects that rename.	08:27
	← weijin left	08:28
	← kaustubhw left	08:28
	→ kaustubhw joined	08:29
	← kriskropd left	08:30
	→ tvale joined	08:33
	← shpoont_ left	08:34
	→ kingarmadillo joined	08:36
	→ sleepyhead joined	08:37
	← freimatz left	08:37
	→ EvilDMP joined	08:38
	← Goplat left	08:38
	← jast left	08:39
	→ jast joined	08:39
EvilDMP	I was looking through the git diff man pages, but couldn't find an answer: is it possible to do a git diff some-other-branch with an option to show only additions made some-other-branch?	08:40
	i.e. I only want to know what some-other-branch has that this branch lacks.	08:40
canton7	EvilDMP, --diff-filter	08:41
	→ RougeR joined	08:41
	← kingarmadillo left	08:41
	→ fairuz joined	08:42
	→ bolovanos joined	08:42
	← firegurafiku left	08:43
	→ weijin joined	08:43
	→ alezandro joined	08:44
	← tvale left	08:45
	← sarp left	08:46
	← gareppa left	08:47
	→ kurkale61 joined	08:48
	← weijin left	08:48
	← alezandro left	08:49
	→ FilipNortic_ joined	08:52
	← kurkale61 left	08:52
	→ kurkale61 joined	08:52
	→ weijin joined	08:53
	← Crypt0x left	08:53
	← FilipNortic left	08:54
	→ gareppa joined	08:54
	← gareppa left	08:55
	→ mixaz joined	08:55
	→ jottr joined	08:55
	← g00s left	08:56
	→ gareppa joined	08:57
	← weijin left	08:59
	→ phinxy joined	08:59
	→ tvale joined	08:59
	→ weijin joined	09:02
	→ jready joined	09:03
	→ cstratak joined	09:03
	← no_gravity left	09:04
	← manuels left	09:04
EvilDMP	Thanks canton7, that does the trick	09:05
	← dhollinger left	09:05
	← gareppa left	09:05
	→ manuels joined	09:05
	← re1 left	09:06
	← energizer left	09:06
	← daidoji left	09:07
	→ newbie\|8 joined	09:07
	← jready left	09:07
	← fairuz left	09:07
	← weijin left	09:07
	→ nowhereman joined	09:07
	nowhereman → Guest92986	09:07
	← nowhere_man left	09:07
	→ gareppa joined	09:08
	→ piggah joined	09:10
	→ checkItOut joined	09:10
	← mosab left	09:11
	→ goweol joined	09:13
	← tunekey left	09:13
	← Guest56018 left	09:14
	→ bubo joined	09:14
	← checkItOut left	09:14
bubo	How can I pop just one file from a stash?	09:15
	→ checkItOut joined	09:15
	← Shin_Aska left	09:16
	← goweol1 left	09:16
	→ goweol2 joined	09:16
	→ goweol1 joined	09:17
bubo	nvm, google it	09:18
	← catsup left	09:18
	→ catsup joined	09:18
	← catsup left	09:19
	← gareppa left	09:19
	→ catsup joined	09:19
	← goweol left	09:20
	← goweol2 left	09:20
	→ asphyxia joined	09:21
	→ nimomo joined	09:22
	← noteness left	09:22
	→ cdg joined	09:26
	← skisela left	09:27
	→ weijin joined	09:27
	← sostenuto left	09:28
	→ sostenuto joined	09:28
	← cdg left	09:31
	→ kriskropd joined	09:31
	→ igemnace joined	09:31
	→ dhollinger joined	09:31
	→ tt joined	09:32
	← weijin left	09:32
	→ zefferno joined	09:33
	→ afuentes joined	09:33
	← howdoi left	09:34
	← sammyg left	09:35
	→ noteness joined	09:37
	← tarkus left	09:37
	→ kingarmadillo joined	09:38
	← zefferno left	09:38
	→ gareppa joined	09:39
	→ tarkus joined	09:39
	→ sammyg joined	09:40
	→ weijin joined	09:40
	← kingarmadillo left	09:42
	← gareppa left	09:43
	← Guest92986 left	09:43
	← sleepyhead left	09:44
	← weijin left	09:45
	→ re1 joined	09:46
	→ weijin joined	09:47
	→ Guest92986 joined	09:47
	→ Mavericks joined	09:48
	→ rominron_ joined	09:48
	← weijin left	09:48
	→ weijin joined	09:48
	← rominron_ left	09:50
	→ rominro__ joined	09:50
	→ rongjunxue joined	09:50
	→ ferr joined	09:50
	← leeN left	09:50
	← noteness left	09:51
	→ zefferno joined	09:51
	→ leeN joined	09:51
	→ cdown joined	09:52
	← jottr left	09:52
	→ rexan joined	09:52
	← rexan left	09:52
	→ rexan joined	09:52
	← rominronin left	09:52
	← weijin left	09:53
	← rominro__ left	09:53
	← wandering_vagran left	09:53
	→ rominronin joined	09:54
	← rominronin left	09:54
	→ rominronin joined	09:54
	→ weijin joined	09:54
	← cdown left	09:54
	→ vk joined	09:57
	→ jkphaze joined	09:58
	→ firegurafiku joined	09:59
	→ YuGiOhJCJ joined	10:01
	→ Gurkenglas_ joined	10:01
	← Mavericks left	10:05
	→ thiago joined	10:05
	← weijin left	10:06
	→ sanscoeur joined	10:06
	← sanscoeu_ left	10:09
	→ noteness joined	10:09
	← KeyJoo left	10:10
	← Puffball left	10:14
	← YuGiOhJCJ left	10:14
	→ skywater joined	10:15
	→ YuGiOhJCJ joined	10:16
	← waveclaw left	10:17
	← jkphaze left	10:18
	→ waveclaw joined	10:19
	→ weijin joined	10:19
	← rvgate left	10:21
	→ jottr joined	10:25
	← weijin left	10:26
	→ alwyn joined	10:26
	← noteness left	10:27
alwyn	Hi, I'm trying to replace a submodule with a module of the same name, but a completely different repo. I've removed the submodule and re-added it successfully, but if I now want to update existing clones of the repository they will say "fatal: reference is not a tree / Unable to checkout 'hash' in submodule path 'my-mod'	10:28
	→ gareppa joined	10:28
alwyn	What am I doing wrong, or what are the proper steps to take to achieve this?	10:28
	← doug16k left	10:31
	← dpyro left	10:31
	← asphyxia left	10:32
	→ archer121 joined	10:32
archer121	Hi, I created a template github repo that will be used by students in their sorftware engineering lab. It will teach them GitHub+CircleCI+Heroku for CI/CD. Can some take a look at it and provide some feedback?	10:32
	https://github.com/arc30/php-template	10:32
	← raynold left	10:32
	→ weijin joined	10:34
	→ checkItO_ joined	10:35
	← jast left	10:35
	→ jast joined	10:36
	← sammyg left	10:37
	← checkItOut left	10:37
	→ kingarmadillo joined	10:39
	← rominronin left	10:39
	← checkItO_ left	10:39
	→ rominronin joined	10:40
	→ freimatz joined	10:41
	← weijin left	10:42
	→ wandering_vagran joined	10:43
	→ borkr joined	10:43
	→ Fernando-Basso joined	10:43
	→ hays joined	10:43
	← hays left	10:44
	← Guest73_ left	10:44
	← rominronin left	10:44
	← vk left	10:44
	← kingarmadillo left	10:44
	→ ch3pjw joined	10:45
	← tvale left	10:48
	→ fairuz joined	10:49
	→ kingarmadillo joined	10:50
	→ weijin joined	10:51
	→ rvgate joined	10:52
	← kingarmadillo left	10:54
	← fairuz left	10:56
	→ thiago_ joined	10:57
	← thiago left	10:57
	→ fairuz joined	10:58
	← weijin left	10:59
	← LiftLeft left	10:59
	← tandra left	11:00
	← gareppa left	11:01
	← thiago_ left	11:02
	→ chris_wot joined	11:03
	→ tvale joined	11:04
	→ daidoji joined	11:04
	→ weijin joined	11:05
	→ rominronin joined	11:05
	← rominronin left	11:05
	→ rominronin joined	11:06
	← grayjoc left	11:06
	→ shpoont_ joined	11:06
	→ johnflux_ joined	11:07
	← weijin left	11:09
	← shpoont_ left	11:10
	→ john-34 joined	11:10
	→ sammyg joined	11:11
	→ Guest73 joined	11:12
	→ garo joined	11:13
	→ weijin joined	11:13
	→ noteness joined	11:14
	← tvale left	11:16
	← fairuz left	11:16
	← weijin left	11:17
	→ KeyJoo joined	11:18
garo	A long time ago I forked a repository from someone else. I fixed a bug in my copy of the rep, committed it (in my master-branch) but never send a pull request	11:19
	After that I completely forgot about my fork until now.	11:20
	← john-34 left	11:20
garo	Meanwhile the original rep has received many changes, the bug that i fixed for myself was also fixed by others (in a completely different way)	11:20
	→ palmtree joined	11:21
	→ john-34 joined	11:21
garo	I now want to ignore my last commit (if necessary i'll keep it in another branch) and pull all new code from the original rep	11:22
	(How) Can i do this ?	11:22
	→ enckse joined	11:22
garo	(Both the original rep and my fork are on github)	11:22
	← Guest92986 left	11:23
	← john-34 left	11:24
	→ john-34 joined	11:24
	← jfr left	11:24
	← john-34 left	11:25
	← filcab left	11:25
	→ weijin joined	11:25
	→ john-34 joined	11:26
	→ filcab joined	11:27
	→ phluks joined	11:27
	← jstimm left	11:28
	→ alezandro joined	11:29
	← rexan left	11:31
	→ tvale joined	11:32
lupine	It seems `git fetch` leads to refs being stored unpacked. is there a way to get around that?	11:32
	← weijin left	11:32
	← noteness left	11:33
	← alezandro left	11:33
	→ jstimm joined	11:35
	← zeroed left	11:38
MartyH	garo You could consider side-stepping the issue, deleting your clone, re-cloning from upstream, and push -f'ing to your repo.	11:40
	← jstimm left	11:40
canton7	lupine, why do you care whether refs are packed or unpacked?	11:41
garo	Can i delete a clone in github ?	11:41
	I was also hoping this was possible but couldn't find a way	11:42
	→ weijin joined	11:42
garo	(nobody forked me so deleting would be no problem at all)	11:42
grawity	you probably don't need to – you can just push the updated branches, etc.	11:42
canton7	garo, yes, there's a button to delete a repo under the admin section of the repo	11:42
grawity	but the repository delete button is in the Admin tab	11:42
lupine	canton7: `git fetch` runs faster when they're packed	11:42
grawity	so pack them after every fetch	11:43
canton7	lupine, I'm surprised your repo is big enough to notice... How many refs do you have?	11:43
garo	No admin tab visible...	11:43
lupine	right, but then I still have to do the fetch, which goes slowly	11:43
	canton7: I've got 4 million repositories to take care of ^^	11:43
garo	nevermind	11:43
canton7	wow	11:43
	→ fairuz joined	11:44
lupine	life is suffer	11:44
garo	(it seems to be called "settings")	11:44
lupine	I've found `git remote update --prune`, but that seems to pull objects as well	11:44
	← King_Hual left	11:44
grawity	so pack them before the first fetch	11:44
	`git pack-refs --all --prune`	11:44
	or reconsider whether you need all those refs	11:45
lupine	the remote-tracking branches don't exist before the first fetch	11:45
	I'm trying to find the step that will cause them to exist	11:45
grawity	but then they cannot possibly make the fetch slow	11:45
lupine	the fetch gets them, stores them unpacked, then grabs objects for them	11:45
	with clone, they're stored packed	11:45
	← rchavik left	11:45
grawity	do you mean creating the ton of unpacked refs is slow?	11:45
	→ kingarmadillo joined	11:46
lupine	creating them, and then using them in fetch afterwards	11:46
grawity	also I'm fairly sure that refs are only updated after downloading the object pack	11:46
	`git fetch` is not split into two stages the way you're describing	11:46
lupine	hmm, perhaps I'm misunderstanding something then	11:47
	→ Startintin joined	11:48
lupine	ah, maybe this is it: we're using `--prune`, which does update remote-tracking branches before running the fetch proper	11:49
grawity	possibly	11:50
	← johnflux_ left	11:50
grawity	a regular fetch: reads local refs; connects to server; asks for ref list; gets ref list; sends a bunch of "want <hash>" commands; gets a packfile; writes out the packfile; writes out updated refs	11:50
	(doing it the other way around would leave you with refs which point nowhere)	11:51
	← kingarmadillo left	11:51
grawity	I don't know which step --prune is inserted into	11:51
	← tomfarr left	11:52
lupine	aye, which is actually sort of what I want - a sequence of commands that leaves me with a "broken" repository", containing refs pointing to objects I don't have, all neatly bundled into `packed-refs`	11:52
grawity	tbh, git ls-remote > .git/packed-refs	11:53
lupine	2.16 has a bunch of performance optimizations that help in the unpacked case though, so maybe it's not too important	11:53
	that works after the initial git fetch	11:53
	oh, wait, I see	11:53
skywater	hi	11:53
gitinfo	skywater: 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.	11:53
skywater	What is the best way to automatic deploy code from git to the ftp server?	11:53
grawity	hmm, the output for peeled tags ("^{}" lines) is slightly different from what pack-refs uses	11:53
	and to actually make use of those lines, you'd have to also echo a "# pack-refs with: peeled " header line	11:54
	but not hard to sed/awk everything into the proper format	11:54
	→ Cavallari joined	11:54
	→ Phylock joined	11:54
	← weijin left	11:54
	→ johnflux_ joined	11:57
lupine	`git ls-remote --refs` would exclude those; would that be a bad thing?	11:58
grawity	probably not	11:58
	← Raging_Hog left	11:59
grawity	storing peeled refs is a performance optimization	11:59
	→ daidoji70 joined	12:00
canton7	skywater, !deploy	12:00
gitinfo	skywater: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html	12:00
	→ bruce_lee joined	12:01
	← daidoji left	12:01
lupine	thanks, that was all super-helpful :)	12:01
	← MurkyLizard left	12:02
	→ weijin joined	12:02
MartyH	Probably a really tired question, and there is lots on the internet, but I can't figure out what I need to do: I'm getting warnings LF line endings are being converted to CRLF. I don't want this to happen, I want my line endings to be committed as they are in my working directory. git config -l shows core.autocrlf=false What else should I be doing (or shouldn't I be doing that maybe I'm doing now)?	12:02
	→ MurkyLizard joined	12:02
	← palmtree left	12:02
	→ zeroed joined	12:03
	← Cavallari left	12:05
	→ palmtree joined	12:05
	← weijin left	12:07
	← lempamo left	12:07
	← nimomo left	12:07
	→ lempamo joined	12:07
rts-sander	MartyH, https://stackoverflow.com/a/1967986	12:07
	→ nimomo joined	12:07
	→ amatas joined	12:08
MartyH	@rts-sander: There I read "If core.autocrlf is set to false, no line-ending conversion is ever performed". core.autocrlf is set to false for me. I still get warnings that LF is being converted to CRLF	12:10
	→ wxg joined	12:10
	→ sha-2 joined	12:11
rts-sander	MartyH, not sure why that is	12:12
	← nimomo left	12:13
	→ to1ne`` joined	12:13
grawity	see if you have any .gitattributes files	12:13
	→ nd joined	12:13
alwyn	Hi, I'm trying to replace a submodule with a different repository under the same name. I think I have it down, but when I try to update a clone it doesn't work at all. Even if I try deinit, then init. Then, it will show the right remote in the submodule path doing remote -v, but if I then actually do submodule update, it will replace the remote with the old one	12:14
	Where am I going wrong?	12:14
	← nd_ left	12:14
	→ weijin joined	12:14
MartyH	@grawity I do, it contains * text=auto. Would removing that resolve the problem? Does removing that have any other consequences (on diffing and merging for example)?	12:15
	← garo left	12:15
	→ garo joined	12:17
	→ shpoont_ joined	12:17
	→ brodock joined	12:17
	← piggah left	12:18
	← fairuz left	12:18
	← weijin left	12:19
	→ mborgard joined	12:19
	→ nimomo joined	12:20
	→ IanLiu joined	12:20
	← ferr left	12:23
	← tarkus left	12:24
	← garo left	12:24
	→ weijin joined	12:24
	← hussam left	12:25
	← nimomo left	12:26
	→ garo joined	12:26
	→ rexan joined	12:28
	→ metalraiden34 joined	12:28
	→ piggah joined	12:29
	← joekeilty left	12:29
	→ Gotham25 joined	12:29
	← weijin left	12:29
	→ tarkus joined	12:30
	← Darcidride__ left	12:31
	→ joekeilty joined	12:31
	→ gareppa joined	12:32
	← gareppa left	12:32
	→ reprazent joined	12:32
	→ gareppa joined	12:32
	→ nimomo joined	12:32
Gotham25	Hi. I have a master branch and feature branch. And there are some classes in master which were later modified in feature branch. Now that I have release1 as master and release2 as feature. I don't want the classes in release1. So I'm deleting that in master.	12:32
	→ thiago joined	12:33
Gotham25	Also I'm doing a periodic rebase of feature on master branch. So if I delete the code from master does it delete from feature too ?	12:33
	→ Darcidride joined	12:33
	→ fission6 joined	12:34
	← nimomo left	12:35
	← metalraiden34 left	12:35
	→ metalraiden34 joined	12:36
	← gareppa left	12:36
	← palmtree left	12:37
	← tvale left	12:37
	← metalraiden34 left	12:37
	→ metalraiden34 joined	12:38
	→ Strepsils joined	12:39
	→ kingarmadillo joined	12:39
	→ ivan_ joined	12:40
	gitinfo set mode: +v	12:41
ivan_	Hi everybody	12:41
	→ Ishtv4n joined	12:41
	← wxg left	12:41
ivan_	Does anybody have time to help a noob like me?	12:42
	← johnflux_ left	12:42
	← freimatz left	12:42
ivan_	I'm trying to configure properly git but I'm getting always some error messages and I don't really know why	12:43
	→ gareppa joined	12:43
	→ Franckapik joined	12:43
ivan_	Someone's active? :/	12:44
	← kingarmadillo left	12:44
bremner	ivan_: try asking about a concrete error message	12:45
	→ jungsubk joined	12:45
ivan_	Ok, that's the story	12:45
	I'm in Ubuntu, I'm in my folder project with the terminal	12:46
	→ cdown joined	12:46
ivan_	I've properly configured atom	12:47
	git init	12:47
	made some changes	12:47
	git add .	12:47
	And then git commit	12:47
alwyn	And what is the error you're getting?	12:47
	→ ecuanaso joined	12:47
	→ palmtree joined	12:48
ivan_	But the console is always returning this message: Aborting commit due to empty commit message	12:48
alwyn	Wellll your commit message is empty	12:48
ivan_	Atom pop up, I can write my commit message but it doesn't save anything	12:48
bremner	ivan_: it sounds like atom returns too quickly	12:48
	→ fairuz joined	12:49
bremner	ivan_: try a different editor, or tell atom to wait	12:49
ivan_	I've done it :/	12:49
	git config --global core.editor "atom --wait"	12:49
bremner	if you type "atom --wait" on the command line does it return immediately?	12:50
ivan_	The console supposed to be waiting, right?	12:50
	→ tvale joined	12:51
ivan_	if I type atom --wait it popup with some strange things on it :O	12:51
	→ Sasazuka joined	12:52
ivan_	Like this: x+)JMU�4g01��b��]K�f�-�ɣtm�]��< �LL2�RR+�2Jrs�/��ƮHb;��E��Y��\|�!fd3(�׺��#��v��8"�l]T%�)�	12:52
bremner	fix atom?	12:52
	→ escproxy joined	12:53
ivan_	How?	12:53
bremner	it's not part of git. You will probably get better help for atom somewhere else.	12:54
	as I said, you could try a different editor, like nano, to figure out your git problems	12:54
	→ MarioBranco joined	12:54
ivan_	But apparently, as alwyn said, it's because commit message is empty	12:55
alwyn	Probably because atom returns when you run it	12:55
ivan_	But I suppose to fill the message in Atom (or any other editor), right?	12:55
alwyn	So in the end I would say it does come down to being atom	12:56
bremner	sigh.	12:56
	→ Thominus joined	12:56
	→ weijin joined	12:56
alwyn	Or like bremner suggested, try a different editor	12:56
ivan_	But Atom opens properly the message	12:56
	→ Guest92986 joined	12:56
	← escproxy left	12:56
	→ escproxy joined	12:57
	← cdown left	12:57
ivan_	When I launch git commit, Atom pops up and opens properly COMMIT_EDITMSG	12:58
	With this inside:	12:58
	# Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # Sul branch master # # Commit iniziale # # Changes to be committed: # new file: css/app.css # new file: index.html # new file: js/app.js #	12:58
oxymoron93	do you enter the message?	12:58
alwyn	You need to enter something... Read the text /o\	12:59
	← RougeR left	13:00
	← weijin left	13:00
	→ kingarmadillo joined	13:00
Wulfe813	ivan_: If you're using atom, couldn't just make your commit from atom?	13:00
ivan_	To be clear: I'm following a Git course on Udacity. There is written that typing git commit should launch my editor, and there I can type the message	13:01
	← fairuz left	13:01
ivan_	The console supposed to be "frozen", waiting for the editor	13:01
grawity	yes, assuming that the editor doesn't try to work against you	13:01
	← Thominus left	13:03
ivan_	I'm just trying to follow a course that supposed to be "right". Atom should be configured (it's actually pretty flat now)	13:03
	→ Thominus joined	13:03
	← rvgate left	13:04
	← Thominus left	13:04
	← mborgard left	13:04
Wulfe813	Hmmm. Try using "atom --wait --new-window", maybe?	13:05
	← jungsubk left	13:05
	→ Thominus joined	13:06
	← kingarmadillo left	13:06
	← manuels left	13:06
	← IanLiu left	13:07
ivan_	I'm trying	13:07
	← re1 left	13:08
	→ paxri01 joined	13:08
ivan_	Nope	13:09
	Atom pops up and I can edit the message	13:09
	But the console "doesn't wait" the text editor	13:10
	And return the error message	13:10
	→ jungsubk joined	13:10
Wulfe813	Dunno then. I just tried it, didn't have any issue.	13:10
	← brodock left	13:10
	→ Dougie187 joined	13:11
ivan_	Maybe I can unistall git and atom and then try again	13:11
	How can I completely uninstall git?	13:11
	(I'm trying with Sublime)	13:12
	← piggah left	13:13
	→ IanLiu joined	13:13
	← ecuanaso left	13:15
alwyn	Does it work with vim?	13:17
	← fission6 left	13:17
alwyn	If it works with vim or nano, you should probably really ask in #atom	13:17
ivan_	Ok, with sublime everything works fine	13:17
	So it's definitely Atom	13:18
	→ RougeR joined	13:18
ivan_	Thank you guys, I'm sorry to be so noob :P	13:18
	→ mborgard joined	13:18
	← gareppa left	13:19
	→ jready joined	13:19
	← Strepsils left	13:20
	→ negaduck joined	13:20
	→ Es0teric joined	13:20
	← rongjunxue left	13:24
	← tarkus left	13:25
	→ weijin joined	13:25
	→ freimatz joined	13:25
	→ cdg joined	13:26
	→ kn-928 joined	13:26
	← kurkale61 left	13:28
	→ kurkale6ka joined	13:28
	← weijin left	13:29
	→ ecuanaso joined	13:30
	→ muricantrump joined	13:32
	← duckydan left	13:34
s17	i was in a branch 'branch-a' and edited some files, then commited them. i changed to a new branch 'branch-b' edited some files and pushed, yet it included the changed files from branch-a. what am i doing wrong	13:36
rfuentess	ivan https://help.github.com/articles/associating-text-editors-with-git/	13:36
	→ rvgate joined	13:36
	→ johnflux_ joined	13:36
	→ shinnya joined	13:37
	→ mckendricks joined	13:38
	← rfuentess left	13:39
	→ stutter_ joined	13:39
Asenar	s17, how did you switch to a new branch ? with `git checkout -b branch-b` ?	13:40
	→ kingarmadillo joined	13:40
	← ecuanaso left	13:40
	← garo left	13:41
	← stutter_ left	13:41
	→ stutter_ joined	13:41
Asenar	if yes, that's a normal behavior : you are on a new branch, based on the previous one. If you wanted to create an other branch which start from somewhere else, you need to use `git checkout -b newbranch <somesha1>`	13:41
	→ garo joined	13:42
	→ noteness joined	13:43
	→ ecuanaso joined	13:43
	→ dreiss joined	13:43
	→ AndresInSpace joined	13:44
	→ jstein_ joined	13:44
	jstein_ → jstein	13:44
	← Gotham25 left	13:45
	← kingarmadillo left	13:45
	← Sasazuka left	13:45
	← daidoji70 left	13:46
	← ivan_ left	13:46
	← escproxy left	13:46
	← Es0teric left	13:46
	→ daidoji joined	13:46
	← sammyg left	13:47
	← oxymoron93 left	13:48
	→ Es0teric joined	13:49
	← navidr left	13:50
	← semicolon left	13:52
	→ CheckDavid joined	13:55
	→ weijin joined	13:58
	← Sokol left	13:59
	← dreiss left	14:00
	→ fran__ joined	14:01
	→ CodeSlingerPaul joined	14:01
	→ zivester joined	14:02
	→ dviola joined	14:02
	← weijin left	14:02
s17	i was in branch-a, it already existed, then, yes, to go to new branch "git branch -b ..."	14:03
	would it be better to switch back to master first?	14:03
	before branch -b	14:03
osse	no	14:04
	→ no_gravity joined	14:04
	→ kingarmadillo joined	14:04
s17	ok, i'll remember about the sha hash	14:04
	thanks	14:04
	← shinnya left	14:05
osse	if you go back to master then branch-b will be the same as master initially	14:05
	unless you give a hash	14:05
	← garo left	14:05
	← fran__ left	14:05
no_gravity	Hello! One of my coders get 'unpack error' when trying to push. Any ideas what that means?	14:06
	← jungsubk left	14:06
	← jottr left	14:06
	→ garo joined	14:06
	← amosbird left	14:07
	→ weijin joined	14:07
	→ amosbird joined	14:07
	→ orbyt_ joined	14:08
	← zeroed left	14:08
s17	well, that's what i wanted. i wanted to edit the files from master but in a new branch and not include the edits from some other branch which has not yet been pushed	14:09
	→ hmoreno joined	14:09
osse	then all these do the same:	14:10
	← kingarmadillo left	14:10
osse	git checkout -b branch-b master	14:10
	git checkout master; git checkout -b branch-b	14:10
	← YuGiOhJCJ left	14:10
osse	git branch branch-b master; git checkout branch-b	14:10
	git checkout master; git branch branch-b; git checkout branch-b	14:11
	probably some more :p	14:11
	← weijin left	14:11
cYmen	How do I look at the diff of a file that I also renamed?	14:12
	→ escproxy joined	14:13
osse	git diff --find-renames	14:13
	→ jstimm joined	14:13
cYmen	osse: hm...doesn't seem to work	14:14
	just show one file as empty	14:14
	→ raffo joined	14:14
cYmen	which filename do I pass? old or new?	14:14
	← orbyt_ left	14:14
Asenar	s17, you can either switch to master branch, or do `git branch otherbranch master` : this will create a new branch called «otherbranch» and make it start to «master». Then go on that new branch with `git checkout otherbranch`. But this can be achieved with one command : `git checkout -b otherbranch master` : create the branch «otherbranch» at the same start of master, and go to it	14:15
osse	cYmen: easiest is to pass none	14:16
Asenar	cYmen, maybe this will works : `git diff --follow path/to/files`	14:16
osse	cYmen: ah, you might need to stage the changes and use git diff --staged	14:16
	→ dreiss joined	14:17
Asenar	and yes, if changes are already staged you need --staged, or `git diff HEAD --follow path/to/file`	14:17
	→ greggerz joined	14:19
	← Oatmeal left	14:19
	→ Ranhir joined	14:19
	← noteness left	14:21
	← garo left	14:22
	← mckendricks left	14:23
	→ garo joined	14:24
	→ rafasc joined	14:25
no_gravity	Before I merge a commit, how can I know if it will be a fast forward merge?	14:25
grawity	do you need to know upfront, or do you need to force one or the other?	14:25
no_gravity	Well, I only want fast forward merges.	14:25
	← jready left	14:25
Asenar	you can do `git merge --ff-only`	14:25
no_gravity	To have a nice and clean history.	14:25
	Asenar: What will that do if it's not a ff merge?	14:26
s17	Asenar, osse: thanks	14:26
	→ kingarmadillo joined	14:26
	← skywater left	14:26
Asenar	It will be rejected and tell you it's not possible	14:26
no_gravity	Asenar: Nice, thanks.	14:26
grawity	it'll say it cannot fast-forward something that does not in fact go forward	14:26
Asenar	`git config --global branch.master.mergeoptions "--no-ff"`	14:26
	← abba left	14:26
Asenar	to set it by default for master	14:27
grawity	to test before merge,vgit merge-base --is-ancestor HEAD <the-merge-source>	14:27
	→ Crypt0x joined	14:27
	→ ronator joined	14:27
	→ kneeki joined	14:27
rafasc	if it's a tracking branch git remote show origin will tell if a branch it's fast-forwardable	14:27
	s/it's/is/	14:28
no_gravity	Asenar: 'fatal: Not possible to fast-forward, aborting.' - now how do I get an info why it's not possible?	14:28
	→ boombatower joined	14:29
grawity	there's only one reason	14:29
	← boombatower left	14:29
grawity	the two branches have diverged	14:29
Asenar	When a fast forward is not possible, this is always for the same reason : the branch you try to merge has diverged before the current branch	14:29
	→ boombatower joined	14:29
	← garo left	14:29
no_gravity	Asenar: I'm not merging a branch. I merge a commit that I fetched from a remote repo.	14:29
grawity	that's the same thing	14:30
Asenar	that means you have to rebase the other branch before	14:30
	→ weijin joined	14:30
no_gravity	Asenar: 'The other branch'?	14:30
	Asenar: There is only master.	14:30
	No other branches.	14:30
Asenar	You can think about remote repository and remote branch as any other local branch	14:30
	← kingarmadillo left	14:31
grawity	if you're merging something, it's still a branch, whether named or nameless	14:31
	→ garo joined	14:31
no_gravity	Ok, but the commit I want to merge is the commit after the current commit.	14:31
Asenar	in fact, `master` is a branch, `origin/master` is an other branch. So I think what you want is to apply your work in your master local branch after the origin/master branch.	14:31
no_gravity	What has diverged?	14:31
Asenar	For this you can do, if your current branch is `master`, the following : `git rebase origin/master`	14:32
	→ zeroed joined	14:32
grawity	run 'tig HEAD..thatcommit' and 'tig thatcommit..HEAD' to see	14:32
Asenar	a rebase «cut» your branch, and paste it at the end of the new base you want.	14:32
grawity	Asenar: I think you're reading this the other way round...	14:32
	← to1ne`` left	14:32
no_gravity	grawity: tig?	14:32
grawity	or any history viewer; gitk works	14:33
no_gravity	I only use git.	14:33
	I want to learn all about git first.	14:33
	← wandering_vagran left	14:33
	← Fysicus left	14:33
	← madewokherd left	14:33
	→ Fysicus joined	14:33
_ikke_	tig is tui (text user interface) for git	14:33
rafasc	no_gravity: gitk is bundled with git.	14:33
Asenar	you can try to display the git log with graph, like this command : `git log --graph --date-order --all --pretty=format:'%C(auto)%h%Creset %C(auto)%d%Creset %s %C(green)(%ad) %C(bold cyan)<%an>%Creset'`	14:34
no_gravity	rafasc: bash: gitk: command not found	14:34
	→ fission6 joined	14:34
rafasc	forgot to say usually	14:34
bremner	many distros split git into several packages	14:34
	and windows is probably special in its own way	14:34
	← tvale left	14:34
	← weijin left	14:35
no_gravity	Asenar: About the rebase.. do you mean 'git rebase <hash-of-the-commit>'?	14:35
grawity	first lesson of git: third-party tools still have the git nature and should not be avoided	14:35
	→ to1ne`` joined	14:35
grawity	hell, most of core git used to be a thirdparty "cogito" packagr.	14:35
	← howlymowly left	14:36
grawity	as for rebase, the other way around	14:36
	check out that commit, git rebase master, write down the new head commit, check out master, merge the new commit	14:36
	but only after you've actually taken a look at the history and figured out what is going on	14:37
no_gravity	grawity: What do you mean by 'check out that commit'?	14:37
grawity	as in git checkout...	14:37
	anyway, for pure git, you can use git log --oneline --decorate in place of tig/gitk above	14:37
	→ IndianArya joined	14:37
no_gravity	grawity: You mean 'git checkout <hash-of-that-commit>'?	14:37
grawity	errrrr	14:37
	also with --graph	14:37
	yes, that's what I mean	14:37
no_gravity	grawity: I can check out a commit I have not merged yet?	14:37
Asenar	no_gravity, the master branch of the remote repository has 1 commit. Your local master branch has also 1 commit: that means the 2 branch named «master» (local and remote) has diverged. So you have 2 (3) choices : the easiest is to do a merge, but this might create another commit	14:38
grawity	second lesson of git: all commits are like nameless branches, because branches are really just commit names	14:38
Asenar	the second one (what you try to do) is to rebase your work at the top of the remote master (`git rebase origin/master`)	14:39
no_gravity	grawity: 'git checkout <hash-of-commit>' gives me a rather long text output. Starting with "You are in 'detached HEAD' state."	14:40
	→ czart joined	14:40
Asenar	and the 3rd one, if the remote repository is private and you don't care about keeping history, is to do a `git cherry-pick origin/master` (that will take the changes of the remote commit and apply it to your local branch). But it's not a good practice and you need additionnal work to make the remote and local synchroed again	14:41
	→ synthroid joined	14:41
	→ skywater joined	14:42
	→ synthroi_ joined	14:42
no_gravity	Asenar: I don't get where the two repos have diverged and why I cannot fast forward merge the commit.	14:42
	← govg left	14:42
no_gravity	Asenar: The last commit in the remote repo before it was the current commit in the local repo.	14:42
Asenar	are you the only one to work on that repo ?	14:42
	is that a public repo ?	14:42
	is it*	14:43
no_gravity	Asenar: No. It's a remote repo where 2 coders push to.	14:43
	← metalraiden34 left	14:43
	→ metalraiden34 joined	14:44
	← czart_ left	14:44
	← rexan left	14:44
	→ govg joined	14:45
	→ alezandro joined	14:45
Asenar	So, coder1 and coder2 got the repo with `git clone`. So their both repositories are at the same point. Coder1 added a commit by `git push origin master`. coder2 did the same, but his push has been rejected because the remote repository has evolved.	14:45
	← RougeR left	14:45
	← synthroid left	14:45
no_gravity	Asenar: No	14:46
Asenar	Is your repo confidential ? if not, you can give us the result of this command in a pastebin link ? `git log --graph --date-order --all --pretty=format:'%C(auto)%h%Creset %C(auto)%d%Creset %s %C(green)(%ad) %C(bold cyan)<%an>%Creset'`	14:47
	→ RougeR joined	14:50
	← alezandro left	14:50
	→ tvale joined	14:50
	← synthroi_ left	14:50
	← govg left	14:50
	→ weijin joined	14:51
	→ rorro joined	14:51
Asenar	no_gravity, if you can't do a `git merge --ff-only`, the only reason is the branches has diverged.	14:51
no_gravity	One moment, telephone.	14:52
Asenar	If you usually do `git pull` to synchronize your local repository with the remote one, you might solve your problem with `git pull --rebase`	14:52
	← Kaisyu left	14:53
	→ m1n joined	14:55
	→ fairuz joined	14:55
	→ ferdna joined	14:56
	← f2k left	14:56
	← Crypt0x left	14:56
	← linuxmodder left	14:57
	← weijin left	14:58
	→ sleepingforest joined	15:00
	→ Oatmeal joined	15:01
	→ jottr joined	15:03
m1n	waiting for the "objects" to finish "unpacking" on this crap wifi. Is there a way to completely scrub a 25Mb file from the entire history so it doesn't download it when anyone clones? (no one else has cloned)	15:03
	→ Shin_Aska joined	15:03
m1n	this repo isn't even very big. I think I broke the repo. I think I am just going to delete the repo. It's stuck	15:04
	→ sleepee joined	15:04
grawity	a couple of ways, e.g. !bfg, or git filter-branch, or git rebase	15:04
gitinfo	A tool designed to remove large files, or passwords from history: https://rtyley.github.io/bfg-repo-cleaner/ (!rewrite applies)	15:04
	← sanscoeur left	15:04
	← IndianArya left	15:04
m1n	that's for removing parts of files, no?	15:04
	← palmtree left	15:04
m1n	or is bfg for entire files?	15:04
grawity	mainly the latter, but it doesn't make any difference to Git repos	15:04
	either way you are rewriting part of the commit history	15:04
	(and in all cases you'll have to `git push --force` the rewritten stuff)	15:05
	← metalraiden34 left	15:05
	→ metalraiden34 joined	15:05
	→ Mike11 joined	15:05
m1n	it finally unstuck itself after waiting for 10 minutes for ... one object that wasn't even very big. Ok thank you so much, grawity. I shall look into this, as I am just going to host the videos on youtube, rewrite the history and be merry	15:06
	→ linuxmodder joined	15:06
	hmoreno → morenoh149	15:07
m1n	I was actually trying to push a compressed 31 minute 112Mb file to github, and github, rightfully so, yelled at me for the file size @_@ just unnecessary and stupid. Time to rewrite history! hehe literally..	15:07
	← RougeR left	15:07
	← jottr left	15:08
	← metalraiden34 left	15:08
	→ durham joined	15:09
	→ jottr joined	15:09
moritz	rewrite history to a version where github never yelled at you!	15:10
	→ zlsyx joined	15:10
	→ jready joined	15:10
	→ metalraiden34 joined	15:10
	← garo left	15:10
	→ garo joined	15:12
	→ madewokherd joined	15:13
	← tvale left	15:14
Asenar	mhhh, I need to do something weird in git : I want to switch to an existing branch, but keeping the actual version of my files. I don't think there is a command for that, so I will probably do some tmp branch for this	15:14
m1n	gentle ladies, men, everyone else: We have successfully rewritten history. That, my friends and foes, is one small step for me yet one giant leap for this project. I'd like to thank academy and, in particular, grawity, who helped me realize my goals before even I could see what the end result should be. Thank you, all!	15:15
	→ tvale joined	15:16
	← garo left	15:16
	← m1n left	15:16
	→ IndianArya joined	15:17
	→ weijin joined	15:17
	→ alezandro joined	15:17
	→ garo joined	15:17
	← tkore\w left	15:18
	← jottr left	15:18
	← MartyH left	15:19
Asenar	no_gravity, I hope your problem is solved ^^	15:19
	→ crose joined	15:19
	→ al-damiri joined	15:19
	← zeroed left	15:20
no_gravity	Asenar: That was a long phone call. Now I'm back. Problem not solved :)	15:21
grawity	no_gravity: have you looked at the git log yet	15:21
	← weijin left	15:21
no_gravity	Asenar: I really would like to figure out how the branches are supposed to have diverged.	15:21
	grawity: How do you mean?	15:22
grawity	like, what I offered quite a while ago, when you first asked "how can they possibly be diverged"	15:22
	let's say you were on master, trying to merge commit xyz	15:22
	so look at `git log --graph --oneline --decorate xyz..master`	15:23
	→ jottr joined	15:23
no_gravity	grawity: what is 'xyz' here?	15:23
grawity	the commit ID?	15:23
	← Ishtv4n left	15:24
	→ zeroed joined	15:25
Asenar	If there is no sensitive data, you can you copy/paste the output of grawity command to http://vpaste.net/ and give us the link	15:25
	← kn-928 left	15:25
Asenar	xyz might be `origin/master`	15:25
no_gravity	grawity: That outputs something ... it looks like this: * <somehash?> (HEAD, <someRepo>/master, master) <comment of the last commit both repos have in common>	15:25
	→ Ishtv4n joined	15:25
grawity	that means xyz is not a descendant of the master branch	15:26
	which you claimed earlier that it is	15:26
no_gravity	What is a 'descendant of the master branch'?	15:26
Asenar	Maybe this command will be simplier : `git log --graph --oneline --decorate --all -5`	15:26
	← linuxmodder left	15:26
grawity	17:31 <no_gravity> Ok, but the commit I want to merge is the commit after the current commit.	15:27
	→ weijin joined	15:27
	← garo left	15:27
no_gravity	grawity: Yes, it is.	15:27
	← rvgate left	15:27
	← amatas left	15:27
grawity	but your log output says otherwise.	15:27
no_gravity	grawity: When I do 'git log', I see a commit with hash H1. And H1 is the commit that is before commit xyz in the remote repo.	15:28
grawity	do you mean you see it as the topmost commit in the log?	15:28
no_gravity	grawity: Yes	15:28
	← jottr left	15:28
grawity	how did you determine the latter part, "H1 is the commit that is before commit xyz in the remote repo"?	15:29
Asenar	no_gravity, can you copy/paste the output into vpaste.net (or something else). If log messages contains things you don't want to share, remove them	15:29
no_gravity	grawity: Same hash.	15:29
grawity	same hash as what?	15:29
	→ garo joined	15:29
grawity	that is, what tools and/or commands did you use to find out that it's "before" commit xyz?	15:29
Asenar	`git log --graph --oneline --decorate --all -5`	15:29
	→ peacememories joined	15:29
grawity	what output are you basing that on?	15:29
	→ jottr joined	15:29
no_gravity	grawity: When I do 'git log' in the local repo, I get these commits: D C A. When I do it in the remote repo, I get these: F E D C A.	15:30
	grawity: Each letter stands for a hash here.	15:30
	grawity: I did 'git fetch remoteRepo' locally. And now I want to merge commit D.	15:30
	grawity: correction: When I do 'git log' in the local repo, I get these commits: D C A. When I do it in the remote repo, I get these: F E D C B A.	15:30
	Damn.. once again :)	15:30
	grawity: correction: When I do 'git log' in the local repo, I get these commits: D C B A. When I do it in the remote repo, I get these: F E D C B A.	15:31
grawity	that's not a sufficient check, since history can be non-linear; in the default flattened `git log` output, it doesn't mean that E is actually after D	15:31
	they could be in different history lines	15:31
no_gravity	grawity: How can I figure that out?	15:31
grawity	use `git log --graph` at minimum	15:31
Asenar	An text output of git log --graph --all would really be useful	15:31
	← ferdna left	15:31
	← weijin left	15:31
Asenar	`git log --graph --all --decorate`	15:31
no_gravity	Ah! 'git log --graph' shows that in the remote repo, there is a merge commit between D and E.	15:33
	That is not in the local repo.	15:33
grawity	from your description, your local repo is at D, and you're trying to merge E?	15:33
no_gravity	grawity: Yes	15:33
	Now what is that merge commit between D and E?	15:34
	← alezandro left	15:34
	→ alezandro joined	15:34
no_gravity	Looking at it with --stat it contains no files.	15:34
	What does it do?	15:34
grawity	it merges the two history lines	15:34
	→ weijin joined	15:34
Asenar	so it's a merge commit.	15:34
no_gravity	grawity: But both were at D before. What does it merge?	15:35
	→ immune2iocane joined	15:35
grawity	I can't possibly tell without seeing some part of the relevant history graph	15:35
no_gravity	grawity: Shouldn't the merge commit contain some info on what it does?	15:35
Asenar	no_gravity, we can't really help you without seeing logs, just remove the text messages	15:35
grawity	it does, and `git log --graph` shows that information	15:35
Asenar	if you don't want to display them	15:36
grawity	it will probably be clearer if you add --oneline, or use `tig` or `gitk` or other such graphical tools	15:36
no_gravity	grawity: It only says "Merge branch 'master' of <remoteRepo>".	15:36
grawity	the merge commit is marked with *, and has two lines going down to various other commits	15:36
no_gravity	grawity: true.	15:36
	Now how do I merge E?	15:37
Asenar	grawity, all commit are marked by a *	15:37
grawity	each line represents a branch (possibly unintentional, but a branch nevertheless)	15:37
	← johnflux_ left	15:37
Asenar	oups, sorry (your nicknames are too close!)	15:37
	→ RougeR joined	15:37
grawity	and they're basically the reason why fast-forward is not possible	15:37
	→ kingarmadillo joined	15:37
grawity	because D -> E doesn't go "forward"; they're on different roads entirely	15:38
no_gravity	Ok, so local has these commits: D C B A. And remote has these: F E M D C B A. How do I merge up to E now?	15:38
	← jottr left	15:38
Asenar	git log --abbrev-commit can also be a good idea	15:38
	← Thominus left	15:38
	← muricantrump left	15:38
Asenar	git log --abbrev --oneline --graph --all	15:38
grawity	so a fast-forward merge will be impossible in the current state	15:39
Asenar	git log --abbrev --oneline --graph --all --decorate	15:39
	← weijin left	15:39
	→ muricantrump joined	15:39
	→ Thominus joined	15:39
no_gravity	grawity: Should I merge the merge commit too?	15:39
Asenar	With that command, you will understand why it's not possible.	15:39
	I think the best option is to do `git rebase origin/master`	15:39
grawity	no_gravity: I'm guessing it'll be your best option	15:39
	→ tarkus joined	15:40
	→ ZexaronS joined	15:40
	→ jottr joined	15:40
grawity	then again I still can't do much better than guess	15:40
no_gravity	grawity: Like this 'git merge <hash-of-merge-commit>'?	15:42
	→ jelmer joined	15:43
	→ Sonderblade joined	15:43
grawity	before you do that, use `git log <hash-of-D>..<hash-of-merge-commit>` to see what you're bringing in -- it might be more than just E	15:43
	← Thominus left	15:43
no_gravity	grawity: The merge commit will not bring in E. It's before E.	15:44
	← seschwar left	15:44
	← zefferno left	15:44
	→ Thominus joined	15:44
	→ palmtree joined	15:44
grawity	then you don't need to merge it explicitly, but trying to `git merge E` will automatically bring it in	15:44
	because your remote repo's history is a bloody mess	15:44
	→ rajpratik71 joined	15:45
grawity	`git log --graph <hash-of-D>..<hash-of-E>` in that case?	15:45
	← dreiss left	15:45
	← jottr left	15:45
no_gravity	Ok, I will try to simply merge E then.	15:45
	← Es0teric left	15:45
grawity	if you absolutely need just E but not the rest of its history line, the other option is to use `git cherry-pick <hash-of-E>`, which creates a new commit with the same changes as E has	15:45
no_gravity	grawity: But then when I push to the remoteRepo next time, chaos will ensue, right?	15:45
	← ch3pjw left	15:46
	→ alexpainen joined	15:46
	← fairuz left	15:46
Asenar	I'm out of this conversation, blindly, we can't help more.	15:46
no_gravity	grawity: 'git merge E' seems to create another merge commit.	15:46
	← rajpratik71 left	15:46
grawity	I'm of the opinion that chaos has already ensued	15:46
no_gravity	grawity: I wonder how.	15:46
grawity	I'm also of the opinion that you're deliberately trying to waste our time	15:47
no_gravity	?	15:47
	→ weijin joined	15:48
	← ronator left	15:48
	← durham left	15:49
	→ hbautista joined	15:49
	→ cagomez joined	15:49
	→ rajpratik71 joined	15:49
Asenar	no_gravity, we asked you several times to copy the output of some log commands into http://vpaste.net so we can better understand your problem and find a solution, but you ignored us, as we are not (or at least, I m not) seers, we can't help you more	15:49
	← cagomez left	15:49
no_gravity	grawity: Is that what you mean?	15:50
rafasc	yes	15:50
	→ cagomez joined	15:50
no_gravity	Well we did figure out what prevented the fast forward merge. There was a merge commit. And merge commits are not shown by default. That's why I did not see it.	15:51
	→ VibesYuth joined	15:52
rafasc	since when merge commits are not show by default?	15:52
	← weijin left	15:53
	← phluks left	15:53
no_gravity	rafasc: I did not see it in 'git log -p --reverse master..remotRepo/master'	15:54
	→ Circuitsoft joined	15:54
	→ Es0teric joined	15:54
no_gravity	rafasc: So I thought the topmost commit was the oldest new commit.	15:54
	→ dreiss joined	15:55
	→ jottr joined	15:55
nedbat	no_gravity: you should listen when people tell you, "You were hard to help, and we are not helping any more." Do what they say. Why didn't you want to pastebin the result of the commands?	15:56
	→ tvw joined	15:56
rafasc	probably !topsecret	15:57
gitinfo	If your situation is so secret that you can't tell us how to !reproduce it, there's really not much we can do. Perhaps you need to find or buy support you can trust? There are people with clearances even on #git but they may not want to identify themselves. However, you are protected by the biggest secret of all: We just don't care.	15:57
	→ AaronMT joined	15:58
	← rajpratik71 left	15:58
no_gravity	It worked out just fine. My question was what prevents the ff merge and we figured out it was a merge commit.	15:59
	← tarkus left	15:59
	← jottr left	16:00
nedbat	no_gravity: you've frustrated a number of helpers here. I hope your next interaction works out better.	16:01
	← crose left	16:01
no_gravity	Next time I will help somebody.	16:01
	→ jottr joined	16:01
	→ rajpratik71 joined	16:02
	← Oatmeal left	16:02
AndresInSpace	I think he needs a rebase	16:03
	on his brain :O	16:03
	jk	16:03
	→ duckydan joined	16:05
	← Ishtv4n left	16:05
	→ weijin joined	16:06
	← Guest92986 left	16:06
	← jottr left	16:06
	← venmx left	16:06
	← rorro left	16:06
	→ Oatmeal joined	16:07
	→ venmx joined	16:08
	← MurkyLizard left	16:08
	← rajpratik71 left	16:09
	→ Raging_Hog joined	16:10
	← dreiss left	16:10
	→ novas0x2a\|w joined	16:10
	→ synthroid joined	16:10
	← weijin left	16:11
	← Es0teric left	16:11
	→ jottr joined	16:11
	← flaviodesousa left	16:13
	← novas0x2a\|w1 left	16:13
	← alexpainen left	16:13
	← joekeilty left	16:13
	← IanLiu left	16:15
	→ Es0teric joined	16:15
	→ chaosruler joined	16:15
	→ oxymoron93 joined	16:16
	← kurkale6ka left	16:16
	← stutter_ left	16:16
	← jottr left	16:16
	→ kurkale6ka joined	16:17
	→ linuxmodder joined	16:17
	→ weijin joined	16:17
	← j7k6 left	16:17
	← dmone left	16:18
	→ OathMoon joined	16:18
	← jready left	16:18
	→ Acerific joined	16:19
	← novas0x2a\|w left	16:20
	← freimatz left	16:21
	← IndianArya left	16:21
	→ jottr joined	16:21
	← OathMoon left	16:21
	← weijin left	16:21
	→ tarkus joined	16:22
	→ IndianArya joined	16:22
	→ raynold joined	16:23
	← garo left	16:23
	→ joekeilty joined	16:24
	→ hussam joined	16:24
	→ garo joined	16:25
	← tvw left	16:25
	← no_gravity left	16:26
	← jottr left	16:26
	← ringer1 left	16:26
	← eshlox left	16:30
	→ weijin joined	16:31
	← NerdyPepper left	16:31
	→ NerdyPepper joined	16:32
	← tarkus left	16:32
	→ holodoc joined	16:33
	← zeroed left	16:33
	← sleepee left	16:34
	→ sammyg joined	16:34
	→ UTAN_dev joined	16:34
	← weijin left	16:35
	→ jottr joined	16:35
	← floppydh left	16:36
	← thiago left	16:36
	→ stutter_ joined	16:36
	← fission6 left	16:36
	← kurkale6ka left	16:38
	← garo left	16:38
	→ garo joined	16:38
	→ noteness joined	16:40
	→ weijin joined	16:41
	← alwyn left	16:42
	← IndianArya left	16:42
	← jottr left	16:44
	← weijin left	16:45
	→ jottr joined	16:46
jayjo	does anyone know from where in the repo github is pulling public activity? There are many places to get timestamps	16:49
	→ jready joined	16:49
	→ IanLiu joined	16:52
	→ sanscoeur joined	16:52
	→ zeroed joined	16:52
	← RougeR left	16:52
	← Asenar left	16:53
	← tvale left	16:53
	← Raging_Hog left	16:54
	→ durham joined	16:56
	← oprypin left	16:56
	→ oprypin joined	16:57
jayjo	It looks like places like .git/logs/master don't hold all of the history	16:57
	do they (or gitlab, or whomever) aggregate from .git/objects?	16:57
	← noteness left	16:57
	← Shin_Aska left	16:58
	→ abba joined	16:59
	→ tvale joined	17:00
	← khisanth__ left	17:00
_ikke_	mostly packfiles	17:01
	← peacememories left	17:02
	← rominronin left	17:05
	→ rominronin joined	17:05
	← palmtree left	17:05
	← jottr left	17:05
	→ fission6 joined	17:06
	stoopbob → stoopkid	17:07
	→ tarkus joined	17:07
	→ agowa338 joined	17:08
	← staafl_ left	17:08
	← tvale left	17:08
	← joekeilty left	17:09
	← veegee left	17:09
	← rominronin left	17:09
	← skywater left	17:10
	← muricantrump left	17:10
	← oxymoron93 left	17:11
	→ \void joined	17:11
	← Acerific left	17:11
	→ wandering_vagran joined	17:12
	← zeroed left	17:13
	→ energizer joined	17:13
	→ CtrlC joined	17:13
	→ weijin joined	17:14
	→ khisanth__ joined	17:14
	← jready left	17:15
	→ jready joined	17:15
	→ gareppa joined	17:15
	← dviola left	17:15
	← weijin left	17:18
	← durham left	17:19
	→ pfleck joined	17:19
	→ durham joined	17:19
	← jready left	17:20
	← agowa338 left	17:20
	← Mike11 left	17:20
	→ hugdru joined	17:21
	← Franckapik left	17:21
	→ Darcidride_ joined	17:21
	→ navidr joined	17:22
	→ Singmyr joined	17:23
	→ FrostCandy joined	17:23
	→ rexan joined	17:23
	→ skywater joined	17:24
	→ nowhere_man joined	17:24
	→ weijin joined	17:24
	← arecaceae left	17:24
	← Circuitsoft left	17:25
	→ arecaceae joined	17:25
	← cebor left	17:26
	→ Cybergeek joined	17:27
	→ UTAN_dev_ joined	17:27
	→ tunekey joined	17:28
	← linuxmodder left	17:28
	← gareppa left	17:28
	← weijin left	17:29
	← moei left	17:29
	→ cebor joined	17:29
	← rexan left	17:30
	→ muelleme joined	17:30
	← UTAN_dev left	17:30
	→ jottr joined	17:31
	← VibesYuth left	17:34
	→ VibesYuth joined	17:34
	← VibesYuth left	17:35
	→ RougeR joined	17:36
	→ rominronin joined	17:36
	← jottr left	17:36
	← muelleme left	17:36
	← garo left	17:37
	→ Anja joined	17:39
	→ garo joined	17:39
	← Anja left	17:40
	→ IndianArya joined	17:40
	→ jottr joined	17:41
	← rominronin left	17:41
	← stutter_ left	17:41
	→ candle_ joined	17:41
	← mel00010 left	17:42
Random832	i'm confused, ff merges work just fine with merge commits	17:43
_ikke_	?	17:44
	→ cdown joined	17:44
Random832	no_gravity's thing from a couple hours ago doesn't make sense	17:44
	→ peacememories joined	17:45
jayjo	how to git internally package a `git log` ? How would you have to modify a repo to modify the output of git log	17:45
Random832	I don't know what he meant by "there was a merge commit", presumably either "there was a merge commit on the branch being merged into, ahead of the common base" (why is that different from a normal commit) or "there was a merge commit on the branch being merged from" (shouldn't be a problem)	17:45
	→ weijin joined	17:45
	→ dpyro joined	17:46
	→ YuGiOhJCJ joined	17:48
	→ sleepee joined	17:49
	← jottr left	17:50
	→ stutter_ joined	17:50
	← weijin left	17:51
	← capin left	17:51
	→ jready joined	17:51
	→ capin joined	17:52
	← capin left	17:52
	→ capin joined	17:52
	← cdown left	17:53
	← capin left	17:53
	← negaduck left	17:53
	→ linuxmodder joined	17:53
	→ capin joined	17:53
	← capin left	17:53
	← sleepee left	17:54
	→ jungsubk joined	17:55
	→ Mattiaslndstrm joined	17:55
	← kuzyn left	17:55
	← RougeR left	17:56
	→ capin joined	17:56
	← capin left	17:56
	→ capin joined	17:56
	→ synthroi_ joined	17:58
	→ Nizumzen joined	17:58
	← cdg left	17:58
	→ rominronin joined	17:58
	→ mel00010 joined	17:59
	→ sleepee joined	17:59
	→ napping joined	17:59
	→ jottr joined	17:59
	← duckydan left	18:00
	→ l3dx joined	18:00
	← cstratak left	18:01
	← synthroid left	18:02
	← rominronin left	18:03
	→ Sasazuka joined	18:03
	← jottr left	18:04
	→ marianab joined	18:05
	← sleepee left	18:05
	← linuxmodder left	18:05
	→ jottr joined	18:07
	→ noteness joined	18:07
	→ wootehfoot joined	18:09
	← dansan left	18:09
	→ dansan_ joined	18:09
	→ NCS_One joined	18:09
NCS_One	hi	18:09
	is it possible to include filters in a push?	18:10
	→ agowa338 joined	18:10
	← MarioBranco left	18:11
_ikke_	nope	18:12
	→ linuxmodder joined	18:12
_ikke_	filters are executed programs, it would be unwise to allow random code to be executed	18:12
	← jottr left	18:12
	→ nowhereman joined	18:13
	← escproxy left	18:13
	nowhereman → Guest32161	18:13
NCS_One	you are right	18:13
	→ alexpainen joined	18:14
	← nowhere_man left	18:15
	← craftyguy left	18:16
	→ novas0x2a\|w joined	18:17
	← jstimm left	18:17
Hello71	you can install the filter on the remote machine	18:17
	but that doesn't make sense	18:17
	→ MrMojit0 joined	18:18
	← noteness left	18:19
	→ craftyguy joined	18:19
	→ rominronin joined	18:19
	→ weijin joined	18:20
	→ jottr joined	18:20
NCS_One	every time I clone this repo I'll have to remember to create the filters	18:20
	← markus-k left	18:20
	← Gianormagantrous left	18:20
	← bocaneri left	18:22
	→ Oberon4278 joined	18:23
Oberon4278	I deleted a branch, and now when I run 'git status' I see all the files there in the list, and no amount of updating or pushing and whatnot will clear them out.	18:23
	← mel00010 left	18:23
Oberon4278	Also every time I switch branches I get the full list of deleted files. What step did I miss?	18:24
_ikke_	Oberon4278: how did you delete the branch?	18:24
	← weijin left	18:24
	← jottr left	18:24
	→ fahadash joined	18:24
	← fahadash left	18:24
	→ fahadash joined	18:24
	← fahadash left	18:24
	→ fahadash joined	18:24
	← rominronin left	18:24
	→ Gianormagantrous joined	18:25
Oberon4278	git branch -d <branch name>	18:25
	← firegurafiku left	18:25
Oberon4278	while in a separate, non-master branch	18:25
_ikke_	Oberon4278: for the record, master is in no way special	18:26
Oberon4278	ok	18:26
	good to know, thanks	18:26
_ikke_	Just deleting a branch does not cause this	18:27
	What did you do before that? (or after?)	18:27
Oberon4278	honestly I don't remember =\	18:27
	it probably involved one or more commits	18:28
	← Es0teric left	18:28
	→ agowa339 joined	18:28
	← ZexaronS left	18:30
	→ g00s joined	18:30
Oberon4278	Oh wait, I see the problem. It's just a long list of changes not staged for commit. I just have to git add all of them.	18:30
_ikke_	:-)	18:31
	← agowa338 left	18:31
	→ rominronin joined	18:31
	← cebor left	18:32
	→ cebor joined	18:32
	← zarzar left	18:32
Oberon4278	Yep, that did it. So, as a matter of style or best practices, should I include generated files like lex.yy.c?	18:32
	→ zarzar joined	18:32
	← IndianArya left	18:32
moritz	o	18:32
	*no	18:32
Oberon4278	ok thank you	18:33
	→ jottr joined	18:33
moritz	unless you want people to be able to compiler with yacc/bison installed	18:33
	← JanC left	18:33
	→ JanC joined	18:34
	→ fran__ joined	18:34
Oberon4278	Well, I am including the lex.l file, so they could compile it themselves. But lex.yy.c is the file that flex creates; sort of the a.out of flex.	18:34
	→ weijin joined	18:35
codebam	how can I make git read from gpg-agent so I don't have to enter my gpg key?	18:36
	when signing commits	18:36
	← rominronin left	18:36
	→ lempamo_ joined	18:36
grawity	happens by default	18:36
	→ permalink joined	18:36
grawity	which gpg version are you using, and on what OS	18:36
codebam	I can test gpg-agent and it works fine inside the terminal but when I try to use git to sign a commit it still asks for my password	18:36
	→ peterR`` joined	18:37
codebam	grawity: void linux, gpg 2.2.5, gpg-agent 2.2.5	18:38
	→ noteness joined	18:38
codebam	is it because git is using gpg1	18:38
	→ goTAN joined	18:38
_ikke_	codebam: most likely, yes	18:38
codebam	oh hmm, can I make git use gpg2, or will that break things?	18:38
_ikke_	git config gpg.program gpg2	18:38
	← jungsubk left	18:39
_ikke_	No, should work	18:39
codebam	cool, thanks!	18:39
grawity	git uses whatever `gpg` binary is in your path	18:39
	if that's still gpg v1.x in void, well	18:39
_ikke_	(if that works, you probably want to set it globally)	18:39
codebam	cool, that works!	18:39
	and yeah I set it globally	18:39
	← weijin left	18:39
codebam	thanks _ikke_ :)	18:39
	← fran__ left	18:39
	← goTAN left	18:40
grawity	that means Void is in fact behind Debian in terms of software freshness	18:40
	← lempamo left	18:40
	→ LiftLeft joined	18:40
codebam	debian uses gpg too	18:40
grawity	yes, but debian uses gpg 2.x	18:40
codebam	gpg1 that is	18:40
	you sure, I was on debian sid like 5 days ago	18:40
	I just distro jumped	18:40
grawity	I'm on debian stable like 5 seconds ago	18:40
codebam	oh, okay. I believe you	18:40
	maybe they changed it and I didn't notice	18:41
	← pfleck left	18:41
codebam	I think I had gpg inside my path as gpg2	18:41
grawity	they changed it sometime late 2017	18:41
codebam	anyways gotta go, thanks for the help	18:41
	← peacememories left	18:41
codebam	right, I must have missed the change	18:41
napping	Is there a good way to insert an intermediate version of a file? I can reset or pause for amending in a rebase, but I'd like to leave the final version of the file alone	18:41
	← jottr left	18:42
napping	The only thing that comes to mind is copying the final version off to the side before editing, but that's just stupid if I'm using git	18:42
	→ Es0teric joined	18:43
grawity	as in, you want to make certain changes in commit X, but so that they're again not present in X+1?	18:43
napping	Not really, I have commits X and X+1 which I like, but I'd like to stick in a version X+0.5	18:43
	← mixaz left	18:43
	→ rominronin joined	18:44
	→ ahf joined	18:44
napping	maybe write down a hash of commit X+1 and checkout the version from it?	18:45
_ikke_	yes, that works	18:45
	→ m0viefreak joined	18:45
_ikke_	git checkout <hash> <file>	18:45
napping	That's better than copying a backup to the side, at least	18:46
	→ nimomo joined	18:46
	→ jottr joined	18:47
	→ peacememories joined	18:48
	← peacememories left	18:48
	→ muelleme joined	18:48
	← noteness left	18:48
grawity	check out commit X; make a new commit X+0.5; run `git replace --graft X+1 HEAD`; check out master; if satisfied, run `git filter-branch X..` to bake, otherwise `git replace --delete X+1` to undo	18:49
	← rominronin left	18:49
grawity	that's the most Git-est method of inserting a fake commit in the middle	18:49
	→ peacememories joined	18:50
	← nimomo left	18:51
	← tarkus left	18:51
	← peacememories left	18:51
	← jottr left	18:52
	→ lempamo__ joined	18:52
	→ nimomo joined	18:53
	→ rominronin joined	18:54
	← lempamo_ left	18:56
	← fission6 left	18:57
	← immune2iocane left	18:58
	← marianab left	18:59
	→ jottr joined	18:59
	← rominronin left	18:59
	→ markus-k joined	19:01
	← hugdru left	19:01
	→ rominronin joined	19:02
	← cebor left	19:02
	→ tarkus joined	19:03
	→ duckydan joined	19:05
	← jottr left	19:05
	→ noteness joined	19:05
	→ weijin joined	19:06
	→ pfleck joined	19:07
	→ cebor joined	19:07
	← rominronin left	19:07
	← Sonderblade left	19:07
	→ jnavila joined	19:09
	← pfleck left	19:09
	→ pfleck1 joined	19:09
	← weijin left	19:10
mns	how do I setup SSH so I can work with Git, through a proxy at work ?	19:11
_ikke_	what kind of proxy?	19:11
	← kingarmadillo left	19:11
mns	its a http proxy	19:11
	pfleck1 → pfleck	19:12
_ikke_	Would be easier to use http then	19:12
	not ssh	19:12
	→ VibesYuth joined	19:12
	← pfleck left	19:12
	→ pfleck joined	19:13
mns	git server does ssh only	19:13
	→ kingarmadillo joined	19:13
_ikke_	git server?	19:14
	→ rominronin joined	19:15
	← Darcidride_ left	19:16
mns	the server hosting teh remote git repo.	19:16
	← hbautista left	19:16
	← theskillwithin left	19:17
	→ yourfate joined	19:17
	→ theskillwithin joined	19:17
	← noteness left	19:17
	← cagomez left	19:19
	→ cagomez joined	19:19
	← rominronin left	19:20
	→ immune2iocane joined	19:21
_ikke_	You	19:22
	→ jottr joined	19:22
_ikke_	you'd need some kind of http tunnel	19:22
	← cagomez left	19:24
	← jnavila left	19:24
	→ moei joined	19:24
	← Es0teric left	19:25
	→ weijin joined	19:26
	→ jkphaze joined	19:26
	← jottr left	19:27
	→ rorro joined	19:28
	→ rominronin joined	19:28
codebam	could you just change the ssh port to 443?	19:28
	← abba left	19:29
codebam	because it would look just like TLS	19:29
	that's https though, not http	19:29
	→ jottr joined	19:29
	→ duderonomy joined	19:30
	← weijin left	19:30
	→ escproxy joined	19:31
tang^	unless you're in a network that can tell if traffice over port 443 is actually https or not	19:32
bemo	codebam: not sure it works that way (server would need an ssh daemon listening on port 443 for that to work)	19:32
codebam	bemo: oh yeah that's what I'm saying, if he controls the git server couldn't he just do that?	19:33
bemo	codebam: unless that's exactly what you were suggesting (change the server to listen for ssh connections on port 443)	19:33
codebam	but I guess that assumes he CAN do that	19:33
	← rominronin left	19:33
	→ VoradorPT joined	19:33
codebam	bemo: yep that's what I was suggesting	19:33
bemo	I was assuming he didn't have any control over the server	19:34
	← jottr left	19:34
codebam	yeah I guess that's more reasonable of an assumption	19:34
	← alezandro left	19:35
	→ mlopezviedma joined	19:35
	← duderonomy left	19:36
	→ rominronin joined	19:36
	→ Cavallari joined	19:36
	← mborgard left	19:37
	→ g07 joined	19:38
	← wandering_vagran left	19:39
	→ jottr joined	19:40
	← rominronin left	19:40
	← agowa339 left	19:41
napping	grawity: that's pretty gitty. Is there an option to make the new commit object without setting up the replacement?	19:41
	Maybe I need a little script around git-commit-tree ...	19:41
bemo	mns: your mileage may vary, but this looks like it's in the direction you're heading: http://meinit.nl/using-corkscrew-and-an-http-proxy-to-ssh-anywhere-through-firewalls	19:41
	→ cagomez joined	19:42
	→ duderonomy joined	19:43
	→ weijin joined	19:43
	← duderonomy left	19:44
	→ piggah joined	19:44
	← Nizumzen left	19:46
	→ crose joined	19:46
	← weijin left	19:47
	→ jnavila joined	19:48
	→ noteness joined	19:50
mns	bemo: that will work, but when I"m not on the company VPN, it will still try to connect using teh ProxyCommand.	19:50
	tang^: I don't have control over the server.	19:51
	→ ugiti joined	19:52
ugiti	hey, I just committed a bunch of files. One of them should NOT have been commited. How can I get the old version back?	19:53
	that is, the previously committed version o that single file	19:53
_ikke_	git checkout HEAD~ <file>	19:53
ugiti	of*	19:53
	HEAD~ means head - 1 ?	19:54
_ikke_	yes	19:54
ugiti	thanks!	19:54
	← pfleck left	19:54
	→ jstimm joined	19:55
tango_	25	19:55
	ehrm	19:55
	← cagomez left	19:55
	← moei left	19:55
ugiti	one more question, what's the best way to get a list of files changed in the latest commit?	19:55
	file names, that is	19:55
	→ cagomez joined	19:56
	→ moei joined	19:56
_ikke_	git show --name-only	19:56
	→ synthroid joined	19:57
	→ agowa339 joined	19:57
	← napping left	19:58
codebam	that's useful, didn't know about that	19:59
	I usually use git diff and scroll	19:59
kh31d4r	i usually use git show --stat	19:59
	← synthroi_ left	19:59
	← piggah left	19:59
codebam	that's nice	19:59
	← cagomez left	20:00
	← YuGiOhJCJ left	20:01
	← sparr_ left	20:02
	→ sparr_ joined	20:02
	sparr_ → sparr	20:02
	→ mborgard joined	20:03
ugiti	_ikke_: that was a great command!	20:04
	→ cdg joined	20:04
	→ alezandro joined	20:05
	← rokups left	20:06
bemo	mns: maybe you can define two different remotes, with slightly different server names and use the .ssh/config to figure out which proxy (or no proxy) to use... and then just switch to a different remote when you've moved locations? (I'm making this up as I go)	20:06
	→ cdg_ joined	20:06
	→ MACscr joined	20:06
ugiti	when I try your checkout command, I get error: pathspec 'file.txt' did not match any file(s) known to git	20:08
	it's definitely there	20:08
	← cdg left	20:09
kh31d4r	ugiti: did you specify the whole path, or just the filename?	20:10
ugiti	oh, facepalm, thanks kh31d4r	20:11
	← energizer left	20:11
	← kingarmadillo left	20:11
	← ugiti left	20:12
	← noteness left	20:12
	→ hugdru joined	20:13
	← escproxy left	20:15
lupine	so this `git clone` sits for more than 2 hours before receiving any bytes. the server side is busily creating a packfile to end all packfiles, and won't send a single byte of it until the whole packfile is done. is there a way to optimise it so we can start receiving bytes early, rather than late? the repo is, most unfortunately, 50GiB. very few refs	20:16
	← Gurkenglas_ left	20:16
	← candle_ left	20:16
	← jkphaze left	20:16
lupine	we're erring on the side of just tarring up the repository and using https to download the archive for these difficult cases, but I don't want to sob	20:17
	→ weijin joined	20:17
	← paxri01 left	20:18
	→ jkphaze joined	20:18
	← navidr left	20:19
	→ Aelius joined	20:19
Aelius	I want to change autocrlf for a single local repository, is that possible?	20:20
lupine	to1ne``: yo	20:20
_ikke_	Aelius: sure	20:20
	← to1ne`` left	20:20
	← metts left	20:20
lupine	Aelius: pop it in .git/config and all will be well	20:21
	→ cagomez joined	20:21
Aelius	so I did that, but I'm not sure how to... re-pull the files such that they will be processesd?	20:22
	← l3dx left	20:22
	← weijin left	20:22
_ikke_	Aelius: No need to pull again	20:24
	→ Bobdude joined	20:24
	→ to1ne joined	20:24
	→ phluks joined	20:24
	← jottr left	20:24
	→ rominronin joined	20:25
_ikke_	recent versions of git (very recent) have git add --renormalize	20:25
	← jkphaze left	20:25
Aelius	hmm, it turns out that wasn't the problem anyway. Windows just derpy. thanks though!	20:26
	→ tymczenko joined	20:26
	→ jkphaze joined	20:26
	← yeshurun left	20:27
	→ kerrick joined	20:28
kerrick	Can I use .gitignore to ignore all future changes to a file that is already checked in?	20:28
	→ weijin joined	20:28
kerrick	I thought the answer was "yes", but looks like I'm wrong	20:28
	← crose left	20:29
kerrick	I added the path to the file as a line in my root .gitignore but the file still shows up when I `git diff`	20:29
rafasc	.gitignore only ignore untracked files.	20:29
	!gitignore	20:29
gitinfo	[!gitignore_template] Github has compiled a set of good .gitignore templates, and licensed them very liberally. https://github.com/github/gitignore	20:29
rafasc	wrong one	20:29
	→ Nizumzen joined	20:29
kerrick	thanks rafasc	20:30
_ikke_	!ignore_tracked	20:30
gitinfo	Git only applies ignore patterns to untracked files. You can't use ignore patterns to ignore changes to files that are already tracked by git. To remove files only from git, but keeping them on disk, use git rm --cached <file>. Still, see https://gist.github.com/1423106 for ways people have worked around the problem.	20:30
	← rominronin left	20:30
	← novas0x2a\|w left	20:30
	→ cdown joined	20:31
rafasc	thanks _ikke_, was having problems finding the list.	20:31
_ikke_	!triggers	20:31
gitinfo	Please don't spam me! I'm just a poor bot! Here's everything I know: https://gitirc.eu/bot/trigger.php -- that's a list of these nifty keywords like "!bot" that you can use in the channel, in case you were wondering.	20:31
	← borkr left	20:32
rafasc	is there a command that would return matches for triggers?	20:32
	→ mondeydiver joined	20:32
_ikke_	no	20:33
	← weijin left	20:33
rafasc	would be nice to have something like /msg gitinfo !trigger tracked	20:33
gitinfo	[!triggers] Please don't spam me! I'm just a poor bot! Here's everything I know: https://gitirc.eu/bot/trigger.php -- that's a list of these nifty keywords like "!bot" that you can use in the channel, in case you were wondering.	20:33
	→ firegurafiku joined	20:33
rafasc	guess the link works too.	20:33
	← Aelius left	20:34
	→ johnflux_ joined	20:34
	← garo left	20:34
	→ yeshurun joined	20:34
	← MrMojit0 left	20:35
	← VibesYuth left	20:35
	→ garo joined	20:36
	← jnavila left	20:36
	→ jottr joined	20:37
	→ synthroi_ joined	20:38
	← madewokherd left	20:38
	→ rominronin joined	20:38
	← stutter_ left	20:38
lupine	or can I tell `git-remote-https` to send tcp keepalives?	20:38
	i'll take pretty much owt at this point :D	20:38
	→ LionsMane joined	20:39
	→ stutter_ joined	20:40
	→ pfleck joined	20:41
	→ metts joined	20:41
	← synthroid left	20:42
	← rominronin left	20:42
	← garo left	20:45
	→ garo joined	20:46
	← newbie\|8 left	20:49
	← garo left	20:51
	→ rominronin joined	20:51
	← ecuanaso left	20:51
	→ durham_ joined	20:52
	→ fairuz joined	20:52
	→ weijin joined	20:53
	→ garo joined	20:53
	← synthroi_ left	20:54
	← yeshurun left	20:54
	← schleppel left	20:55
	← durham left	20:55
	← Guest73 left	20:56
	← rominronin left	20:56
	← durham_ left	20:56
	← weijin left	20:57
	← Guest32161 left	20:57
	→ Guest32161 joined	20:57
	← IanLiu left	21:00
	← jready left	21:00
	→ jready joined	21:01
	← Cavallari left	21:01
	→ weijin joined	21:02
	← alexpainen left	21:03
	→ yeshurun joined	21:03
	→ noteness joined	21:05
	← garo left	21:05
	→ garo joined	21:05
	← jready left	21:05
	→ rominronin joined	21:06
	→ mlopezviedma_ joined	21:06
	← mlopezviedma left	21:07
	← reprazent left	21:09
	← weijin left	21:09
	← yeshurun left	21:09
	← jottr left	21:09
	→ yeshurun joined	21:10
	→ kuzyn joined	21:10
	← garo left	21:10
	← yeshurun left	21:11
	← rominronin left	21:11
	→ jottr joined	21:11
	→ yeshurun joined	21:11
	→ garo joined	21:12
	→ Anja joined	21:12
	→ rominronin joined	21:14
	→ cahoots_ joined	21:16
	→ kingarmadillo joined	21:17
	← shpoont_ left	21:17
	← wootehfoot left	21:17
	← rominronin left	21:18
	← LionsMane left	21:18
	← Anja left	21:19
	← cahoots__ left	21:19
	← surfist left	21:19
	→ kgrimes joined	21:19
	→ nowhere_man joined	21:20
	← Guest32161 left	21:20
	← stoopkid left	21:21
	← jottr left	21:21
Oberon4278	When I do git branch <new branch> on my local machine, and then do commits while I'm in that branch	21:23
	are those versions / commits / whatever saved locally?	21:23
	or do I have to do a push in order for the incremental updates I'm making to be saved permanently?	21:23
avar	They are saved locally, you don't need to push anywhere	21:24
	← cahoots_ left	21:24
	→ malmalmal joined	21:24
Oberon4278	ok	21:24
	oh my god I just had my mind blown	21:24
	I just looked at a file I made significant changes to, then switched to a different branch and looked at the same file	21:25
	and (obviously) it's the unedited version	21:25
	→ rominronin joined	21:26
Oberon4278	how does that work? is git maintaining simlinks or something, and swapping them out when I do git checkout whatever?	21:26
	symlinks*	21:26
avar	Oberon4278: https://git-scm.com/book/en/v2/Git-Internals-Git-Objects	21:28
	→ alexpainen joined	21:29
	→ Cthalupa joined	21:30
	← rominronin left	21:30
	← Doginal left	21:31
	← mattcen left	21:32
	← immune2iocane left	21:32
Oberon4278	Thank you!	21:32
	→ Doginal joined	21:33
	← chaosruler left	21:33
	→ rominronin joined	21:34
	← jstein left	21:35
	→ jready joined	21:36
	← noteness left	21:36
	→ theology joined	21:37
	← fairuz left	21:37
	→ mattcen joined	21:37
	→ j7k6 joined	21:37
	← Doginal left	21:37
	→ weijin joined	21:38
	← rominronin left	21:39
	← j7k6 left	21:40
	→ j7k6 joined	21:40
	→ stoopkid joined	21:40
	← jready left	21:40
	← mborgard left	21:41
	→ menip joined	21:41
	← menip left	21:41
	→ Doginal joined	21:42
	← weijin left	21:42
	→ IanLiu joined	21:42
	← Dougie187 left	21:43
	→ dreiss joined	21:43
	← AndresInSpace left	21:44
	→ applecrumble joined	21:44
	→ rominronin joined	21:45
	→ atr3y0 joined	21:46
	→ surfist joined	21:46
	→ jottr joined	21:48
	← cdown left	21:49
	→ cdown joined	21:49
	← rominronin left	21:50
	→ Anja joined	21:52
	→ surial joined	21:52
surial	Given: git pull https://github.com/USERNAME/PROJNAME.git master (this is a pull request), when I run that, it tries to merge. I don't want that, I just want what the code was when they checked it in. it's something like git checkout -b someNewBranchname https://github.com/... but that isn't working	21:52
	← greggerz left	21:54
	→ durham joined	21:54
	← muelleme left	21:55
	← dreiss left	21:56
	→ noteness joined	21:57
	← kes left	21:57
avar	surial: If you `git fetch <url> <branch>` then the branch will be in FETCH_HEAD afterwards	21:58
surial	gracias.	21:58
avar	But why not just 'git remote add USERNAME https://.... && git fetch username`	21:58
	→ energizer joined	21:58
	→ durham_ joined	21:58
	← stutter_ left	21:59
	← garo left	21:59
	← jottr left	21:59
	← morenoh149 left	21:59
	← durham left	21:59
	→ kes joined	22:00
	→ garo joined	22:01
	→ jungsubk joined	22:01
	→ rominronin joined	22:01
dalias	avar, i like the FETCH_HEAD approach because you don't accumulate junk remotes	22:01
	→ sat-aton joined	22:02
	← sat-aton left	22:02
	→ sat-aton joined	22:02
	← dege left	22:02
	← IanLiu left	22:02
	← sat-aton left	22:02
dalias	you don't even need to use symbolic FETCH_HEAD if you know the hsh of the remote commit you're interested in	22:02
	→ sat-aton joined	22:02
	← sat-aton left	22:02
	→ sat-aton joined	22:02
	← satifant left	22:04
	← alezandro left	22:06
	→ madewokherd joined	22:06
	← rominronin left	22:06
	→ weijin joined	22:07
	← nimomo left	22:07
	→ nimomo joined	22:07
	← alexpainen left	22:07
	→ rominronin joined	22:08
	← garo left	22:08
	→ newbie\|8 joined	22:08
	← firegurafiku left	22:10
	← weijin left	22:11
	→ miami joined	22:12
	→ habbah joined	22:12
	← miami left	22:12
	→ fairuz joined	22:12
	← rominronin left	22:12
	← nimomo left	22:13
	← UTAN_dev_ left	22:14
	← agowa339 left	22:15
habbah	i was handed several user stories and told to do something about them. different stories involve different repos. several stories involve multiple repos. idea: have a single repo where each sub-directory is another git repo using either git submodules or git subtrees. we’re considering using github project boards and this would give us support for cross repository milestone and user story tracking.	22:15
	is this a good idea?	22:15
	→ stutter_ joined	22:15
	← noteness left	22:16
	← kes left	22:16
	→ durham joined	22:17
	→ garo joined	22:17
	→ rominronin joined	22:17
	→ alezandro joined	22:19
	← applecrumble left	22:20
	→ UTAN_dev joined	22:21
	← durham_ left	22:21
	→ jottr joined	22:21
rafasc	my opinion is no.	22:22
	← rominronin left	22:23
	← fairuz left	22:23
dalias	my opinion is never use subrepos unless you have to	22:23
	or submodules or whateve they're called	22:23
	→ fairuz joined	22:24
habbah	there is also https://github.com/ingydotnet/git-subrepo	22:25
	how do you track multi-repo milestones and user stories which rely on multiple repos?	22:25
	← hugdru left	22:26
dalias	that's a matter of whatever tracker software you're using i guess	22:26
	← Tobbi left	22:26
	→ asphyxia joined	22:26
	← johnflux_ left	22:26
	→ noteness joined	22:28
	← asphyxia left	22:31
	← tarkus left	22:31
	→ rominronin joined	22:33
	← gordonfish left	22:33
	→ gordonfish joined	22:35
	→ weijin joined	22:36
	← rominronin left	22:37
	← \void left	22:37
	← phluks left	22:38
	→ YuGiOhJCJ joined	22:38
	← tango_ left	22:40
	← weijin left	22:41
	← dpyro left	22:41
	← jungsubk left	22:41
	← AaronMT left	22:41
	→ hugdru joined	22:41
	← venmx left	22:42
	← noteness left	22:46
	→ rominronin joined	22:48
	→ dpyro joined	22:48
	← CodeSlingerPaul left	22:49
	← Bobdude left	22:49
	← g00s left	22:49
	→ Silenced joined	22:50
	→ muelleme joined	22:52
	→ thiago joined	22:52
	→ noteness joined	22:52
	← rominronin left	22:53
	→ weijin joined	22:53
	→ jready joined	22:55
	← jottr left	22:55
	← alezandro left	22:55
	← sammyg left	22:55
	← MoziM left	22:55
	← rorro left	22:56
	← capin left	22:57
	← muelleme left	22:57
	← weijin left	22:57
	→ capin joined	22:57
	← capin left	22:58
	→ capin joined	22:58
	→ troulouliou_div2 joined	22:58
	← sanscoeur left	22:59
	← malmalmal left	22:59
	→ sanscoeur joined	22:59
	← jready left	22:59
	← hugdru left	23:01
	← noteness left	23:01
	→ tango_ joined	23:03
	← CheckDavid left	23:03
	→ rominronin joined	23:03
	← finalbeta left	23:04
	← NCS_One left	23:04
	← peterR`` left	23:05
	→ noteness joined	23:06
	→ doug16k joined	23:06
	← _ikke_ left	23:07
	← rominronin left	23:08
	← bolovanos left	23:10
	→ RougeR joined	23:10
	← afuentes left	23:11
	→ rominronin joined	23:11
	← FrostCandy left	23:11
	→ nahtnam joined	23:11
	← YuGiOhJCJ left	23:12
	→ YuGiOhJCJ joined	23:12
	→ weijin joined	23:13
	→ ecuanaso joined	23:14
	→ duderonomy joined	23:14
	→ Guest73 joined	23:14
	→ LichtMacher joined	23:14
	← rominronin left	23:15
	← duderonomy left	23:16
	← weijin left	23:17
	← cdown left	23:18
	→ morenoh149 joined	23:18
	← tango_ left	23:19
	→ _ikke_ joined	23:20
	← troulouliou_div2 left	23:20
	← noteness left	23:20
	→ cdown joined	23:21
	← thiago left	23:21
	← LichtMacher left	23:22
	← tymczenko left	23:22
	→ rominronin joined	23:23
	← bittyx left	23:24
	→ immune2iocane joined	23:24
	← Guest73 left	23:25
	→ weijin joined	23:25
	← cdown left	23:26
	→ shinnya joined	23:26
	→ tango_ joined	23:27
	← ecuanaso left	23:27
	← rominronin left	23:27
	← stutter_ left	23:28
	→ Bobguy joined	23:28
	← weijin left	23:30
	→ kostur86 joined	23:32
	← Phylock left	23:32
	← immune2iocane left	23:32
	← Singmyr left	23:34
	→ rominronin joined	23:34
	→ bittyx joined	23:35
	→ nowhereman joined	23:36
	← fairuz left	23:36
	nowhereman → Guest10775	23:36
	← nowhere_man left	23:36
	→ noteness joined	23:38
	→ alhariel joined	23:38
	← rominronin left	23:39
	← rafasc left	23:40
	→ learning joined	23:41
	→ hugdru joined	23:42
	← linuxmodder left	23:42
	← Bobguy left	23:42
	← _ikke_ left	23:44
	→ ferdna joined	23:45
	← dansan_ left	23:46
	← zlsyx left	23:46
	← kuzyn left	23:47
	← noteness left	23:49
	← durham left	23:49
	→ rominronin joined	23:49
	→ durham joined	23:49
	→ mythicalphoenix joined	23:50
	← capin left	23:50
	→ capin joined	23:50
	← stoopkid left	23:51
	← capin left	23:51
	→ capin joined	23:51
	→ Milos joined	23:51
	→ weijin joined	23:52
	→ linuxmodder joined	23:52
	→ tre99 joined	23:52
	→ Strepsils joined	23:52
tre99	does anybody manually change the date of their git commits so it looks better on your github profile?	23:52
	← linuxmodder left	23:53
	→ linuxmodder joined	23:53
	→ jready joined	23:54
	← rominronin left	23:54
	← durham left	23:54
	← cagomez left	23:55
	→ cagomez joined	23:56
	→ dreiss joined	23:56
	← weijin left	23:56
	→ jottr joined	23:56
	→ durham joined	23:56
	← capin left	23:57
	→ thiago joined	23:58
	→ noteness joined	23:58
	→ capin joined	23:59
	← capin left	23:59
	← jready left	23:59

Logs Search ←Prev date Next date→

Channels Documentation