IRCloggy #git 2020-10-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.

	2020-10-27
	→ justanotheruser joined	00:00
	← Peng left	00:01
	→ Peng joined	00:01
	← tiin57 left	00:02
	← finalbeta left	00:04
	→ tiin57 joined	00:05
Timvde	dodobrain: I had to look this up myself, but you can do: git log --graph --oneline --decorate-refs="remotes/origin"	00:06
	to show only refs from the remote called "origin"	00:06
	← routingsparks left	00:07
	← axisys left	00:08
	→ axisys joined	00:09
	→ KhoN_2 joined	00:10
	→ cdown_ joined	00:12
	→ Amanas joined	00:13
	← KhoN_1 left	00:14
	→ Xenguy joined	00:15
	← cdown left	00:15
	cdown_ → cdown	00:15
	← AllenJB left	00:17
	← linux_dr left	00:17
	→ AllenJB joined	00:19
	→ twb joined	00:23
twb	Can foo.git be a file rather than a dir?	00:23
	← Hey left	00:24
twb	I happened to run "git --git-dir=foo.git" on a file, and it gave an interesting error	00:24
	fatal: too large to be a .git file: '/home/twb/Desktop/busybox-static_1.33.0.git'	00:24
	→ Xenguy_ joined	00:25
	← Xenguy left	00:28
mackerman	twb: git expected such files to contain gitdir in plain text only	00:28
	man gitrepository-layout	00:28
gitinfo	the gitrepository-layout manpage is available at https://gitirc.eu/gitrepository-layout.html	00:28
	→ fahadash joined	00:28
twb	Oh cool	00:29
	← tiin57 left	00:32
	→ tiin57 joined	00:35
	← AnAverageHuman left	00:39
	→ cdown_ joined	00:43
	→ Hey joined	00:44
	← sdwrage left	00:45
	← cdown left	00:45
	cdown_ → cdown	00:45
	← sgn left	00:45
	← notnatebtw left	00:48
	← JanC left	00:50
	→ notnatebtw joined	00:51
	← bambanx left	00:51
	→ JanC joined	00:53
	→ sgn joined	01:01
	← tiin57 left	01:02
	→ tiin57 joined	01:06
dodobrain	Timvde, thats interesting, but i lost decorations of my branches	01:07
	→ servo joined	01:09
	← veegee left	01:15
	→ veegee joined	01:17
	← Hey left	01:19
	← veegee left	01:27
	← yohnnyjoe left	01:28
	→ veegee joined	01:29
	← tiin57 left	01:32
	→ tiin57 joined	01:35
	← veegee left	01:37
	→ veegee joined	01:37
	← PyR3X left	01:37
	← justanotheruser left	01:41
	← deltab left	01:42
	← cbreak left	01:47
	→ Guest65 joined	01:48
	→ cbreak joined	01:48
	→ deltab joined	01:50
	→ davidfetter joined	01:50
	← Guest65 left	01:51
	→ Hey joined	01:52
twb	Aargh. "git log -G" is aborting on an unrelated commit: gzip: /tmp/mlWlgT_email_filtering_chart.dia: not in gzip format	01:57
	← Hey left	01:57
twb	...but I don't have a textconv defined for .dia in ~/.gitconfig	01:57
	Where else should I be looking? It's not in the repo's .git/config either	01:57
	Hrm the problem is definitely in here: http://ix.io/2C9N/ini	01:59
	→ yohnnyjoe joined	01:59
twb	Weird, it's the diff.zcat block. How does that know about .dia files?	02:00
	← archwizard left	02:01
	← tiin57 left	02:02
	→ archwizard joined	02:03
	→ hussam joined	02:04
	← yohnnyjoe left	02:06
	→ tiin57 joined	02:06
	→ blahboybaz joined	02:08
	→ bkuhlmann joined	02:09
	← JTWLUK left	02:09
	← Laxator2 left	02:09
	← tty1 left	02:11
	← Case_Of left	02:13
	← meropyri- left	02:14
	→ meropyri joined	02:14
	← hineios left	02:15
	← yonder left	02:16
	→ meLon joined	02:16
	→ samcmullin joined	02:16
	← Nokurn left	02:17
	← yoh left	02:17
	← howdoi left	02:22
	← F0rTex left	02:23
	→ hineios joined	02:23
	← notnatebtw left	02:23
	→ ayush joined	02:23
	→ F0rTex joined	02:24
ayush	why would "git checkout -t origin/branch" say origin/branch is not a commit after I've successfully done "git fetch origin branch"	02:24
	→ Case_Of joined	02:25
	→ mns_ joined	02:26
	← mns left	02:28
	→ Goplat joined	02:29
	→ mud joined	02:29
	← shush left	02:30
	→ shush joined	02:31
	← tiin57 left	02:32
	← Gurkenglas left	02:33
	→ tiin57 joined	02:35
	← samcmullin left	02:36
	← shush left	02:37
	→ yohnnyjoe joined	02:38
	← lucasb left	02:40
	Xenguy_ → Xenguy	02:41
	→ Hey joined	02:42
	← yohnnyjoe left	02:43
	← teclator left	02:43
	→ Voxel joined	02:44
	← servo left	02:45
	→ g00s joined	02:45
	← Hey left	02:47
	mns_ → mns	02:50
	← Amanas left	02:50
	← austin987 left	02:53
	→ drbean joined	02:53
	→ yohnnyjoe joined	02:54
	→ Jookia joined	02:54
	← yohnnyjoe left	02:59
	← jaziz left	03:00
	→ ayush1 joined	03:00
	→ jaziz joined	03:02
	← tiin57 left	03:02
	← ayush left	03:04
	→ austin987 joined	03:05
	→ justanotheruser joined	03:06
	→ tiin57 joined	03:06
	← Xenguy left	03:10
	← orbyt_ left	03:12
	lagothrix → Guest43873	03:13
	← Guest43873 left	03:13
	→ lagothrix joined	03:14
NeilG	how do I break a commit in the history into two commits?	03:17
	rebase, edit, and then what?	03:17
	nm, I think I got it	03:19
	← bkuhlmann left	03:19
	← relipse left	03:19
	← justHaunted left	03:20
	← gast0n left	03:20
	← ayush1 left	03:25
	← dodobrain left	03:26
twb	NeilG: rebase -i, edit, then when at the commit, git reset HEAD~, then git commit -p twice	03:27
	then rebase --continue to finish off	03:27
	NeilG: beware that whole-file add/remove can behave unintuitively	03:27
	NeilG: I always do a "git diff origin/foo foo" to sanity check that the rebase looks the same afterwards	03:28
NeilG	twb thanks!	03:29
	that sanity check is a great idea	03:29
	I'm goign to start doing that	03:29
	← drbean left	03:30
	← pac1 left	03:31
	← tiin57 left	03:32
	→ ayush joined	03:35
	→ tiin57 joined	03:36
	→ justHaunted joined	03:36
	← justHaunted left	03:39
	→ drbean joined	03:39
	← veegee left	03:45
davidfetter	hi	03:45
	I have a mystery file. I created a branch, created the file, put some stuff in it, and git seems entirely innocent of its existence, either tracked or untracked	03:46
	how might git not be able to see it?	03:47
twb	davidfetter: did you "git add porn.c"	03:47
	davidfetter tries that specifically rather than git add .	03:48
twb	if you ran "git add ." and it didn't "see" it, most likely issue is gitignore	03:48
davidfetter	aha!	03:48
	davidfetter checks around the .gitignore space to find what's going on	03:49
davidfetter	well. that is wacky. I wonder why my predecessor put that rule there.	03:50
	Thanks, twb :)	03:50
twb	what was the rule	03:50
	→ veegee joined	03:50
davidfetter	sql/*.sql	03:50
twb	probably they do something like sql/porn.sql.in	03:50
	it's worth understanding that before you start committing what they think are intermediaries	03:51
davidfetter	hrm. I don't see anything like .in that would suggest preprocessor magic. it's one function that does the heavily lifting, and a few wrapper functions (spittin' rhymes like Big Pun) that do the rest.	03:52
	git blame .gitignore shed some light on this. I think Keith was doing some work on an unstable machine and didn't want to be hassled, so plopped a bunch of stuff in there.	03:54
	→ dodobrain joined	03:54
ayush	damn Keith	03:55
davidfetter	https://dpaste.org/e4jn	03:55
twb	ayush: I have to ask - is your nick a reference to Modi's Ministry of Junk Medicine ?	03:56
davidfetter	he's written some amazing software, and he's always been pleasant to me. those don't always go hand in hand	03:56
ayush	no, he stole the name from me. I came first	03:56
twb	k	03:56
davidfetter	TIL: AYUSHMinistry	03:57
ayush	you should put that in .gitignore	03:58
davidfetter	heh	03:58
	→ yohnnyjoe joined	03:59
twb	davidfetter: he killed a bunch of people by rejecting modern medicine as foreign and therefore bad :/	04:00
davidfetter	the modi over here did a pretty similar thing, only modern medicine is bad because it wasn't first endorsed by someone on Fox News	04:01
	← tiin57 left	04:02
	← crose left	04:06
	→ tiin57 joined	04:06
	← twb left	04:11
dodobrain	with git bash for windows, how do i get rid of the flashing when hitting backspace on a new command line where theres no previous input ?	04:18
	i'm guessing it is doing a visual bell or something similar	04:19
	→ dimi1947 joined	04:20
dimi1947	I want to revert a commit and I get a message that warns me about the impeding merge which I do not understand since I do not do a merge:https://www.dropbox.com/s/ij4d13i30j1t8a6/git_issue.png?dl=0	04:23
	impeding is the wrong word...sorry	04:23
	anyway...git considers a revert commit as a merge	04:24
	← bket left	04:30
	← tiin57 left	04:32
	→ tiin57 joined	04:36
	← ayush left	04:36
	→ ayush joined	04:37
	→ bket joined	04:40
	← Guest66899 left	04:41
	← Betal left	04:42
	← NeilG left	04:42
	→ Hey joined	04:43
	← ojdo left	04:43
	← Hey left	04:48
	← drbean left	04:48
	→ ojdo joined	04:50
	← madewokherd left	04:52
	→ Guest20 joined	04:54
	→ Nokurn joined	04:56
	→ OnkelBlade joined	04:59
	→ servo joined	05:02
	← servo left	05:02
	← tiin57 left	05:02
	→ tiin57 joined	05:05
	← meropyri left	05:06
	← durham left	05:08
	→ durham joined	05:09
	← Goplat left	05:10
	→ meropyri joined	05:14
	→ drbean joined	05:22
	← drbean left	05:23
	→ bocaneri joined	05:25
	← sudoforge left	05:31
	← tiin57 left	05:33
	← blahboybaz left	05:35
	→ tiin57 joined	05:36
	← dodobrain left	05:41
	← g2anj left	05:42
ikke	dimi1947: it says you have uncommitted changes to a file, which would be overwritten by the revert	05:43
	dimi1947: the error message is a bit confusing in this case	05:43
	→ g2anj joined	05:44
	← ayush left	05:51
	→ ayush joined	05:52
dimi1947	ikke:no doubt it is confusing	05:55
	→ Hounddog joined	05:56
ikke	You just need to decide what needs to happen to the file mentioned	05:58
	the changes in there that are not committed	05:58
	"commit your changes or stash them"	05:58
	or discard them	05:58
dimi1947	what will happen in case of discard?	06:01
	are the changes going to be lost?	06:01
	← tiin57 left	06:02
ikke	yes, that's what discarding means	06:04
	But you can choose	06:04
	before doing the revert	06:04
dimi1947	hmmm	06:05
	→ tiin57 joined	06:06
ikke	run git diff to see those changes	06:06
dimi1947	if a file has 5 changes(for example) can I choose to discard just one of them or the discard action applies to the file as a whole?	06:06
	← PacKetSlayer left	06:07
ikke	You can. Some tools have options to discard changes line by line. git has git checkout --patch, which allows you to select per section if you want to discard it or not	06:07
	A safer option is to only stage + commit the things you want, and then discard the rest	06:08
dimi1947	I see...	06:08
ikke	git add --patch allows you to select the things to stage	06:08
	← dqx left	06:09
	→ rcoote joined	06:31
	← tiin57 left	06:32
	← ayush left	06:33
	→ ayush joined	06:34
	→ mat001_ joined	06:36
	→ tiin57 joined	06:36
	← arcatech left	06:38
	← mat001 left	06:40
	← lankanmon left	06:43
	→ Hey joined	06:44
	→ lankanmon joined	06:44
	← Technodrome left	06:47
	← Hey left	06:50
	→ mightyjens joined	06:58
	← tiin57 left	07:02
	← unluckyshrubbery left	07:03
	→ tiin57 joined	07:05
	→ NeilG joined	07:06
	→ KnoP joined	07:10
	→ dodobrain joined	07:10
	→ chele joined	07:12
	← ayush left	07:13
	→ ayush joined	07:13
	← sgn left	07:16
	← g00s left	07:20
	→ FabioP joined	07:22
	→ sgn joined	07:25
	← tiin57 left	07:32
	→ Bach78 joined	07:33
	→ LetoThe2nd joined	07:35
	→ spiri joined	07:35
	→ tiin57 joined	07:35
	← Bach78 left	07:35
	← cd left	07:38
	← F0rTex left	07:38
	→ PacKetSlayer joined	07:39
	→ feriman joined	07:40
	→ ekh joined	07:41
	→ rfuentess joined	07:44
	← ayush left	07:45
	→ Haohmaru joined	07:47
	← nurdie left	07:47
	→ dodobrain_ joined	07:48
	← ThatOtherGuy left	07:51
	← feriman left	07:51
	← dodobrain left	07:51
	→ hgl joined	07:52
	→ mirrorbird joined	07:53
hgl	is there a tool to browse repo at a specific commit?	07:53
	→ feriman joined	07:54
	← mu left	07:55
ikke	git checkout commit + terminal ;-)	07:56
	Otherwise, something like tig	07:56
	→ teclator joined	07:56
ikke	tig show <commit> -> t	07:56
	→ mu joined	07:56
	← thiago left	07:57
	→ Muimi joined	07:59
	← tiin57 left	08:02
hgl	git checkout works, but destroys the working tree. never heard of tig, checking it out	08:03
ikke	tig is a third-party tool, but very nice if you like cli / tui progrmas	08:03
	there is also gitk and git gui	08:03
hgl	ah	08:04
	know any good git gui?	08:04
ikke	Not really, as I don't really use them	08:04
hgl	i used to use GitX, and it has this feature	08:04
FabioP	i like github desktop	08:04
hgl	but its development is stopped	08:04
FabioP	but you can't do all that like from a command line	08:05
hgl	can github desktop browse repo at a specify commit?	08:05
	*specific	08:05
	→ tiin57 joined	08:05
FabioP	no if i'm not mistaken	08:06
	otherwise i use gitlab	08:06
	gitlab can do that	08:06
pandem	github on browser can do that so i would assume desktop can do that as well	08:06
	try clicking the commit hash	08:07
FabioP	where?	08:07
hgl	i wonder why it's not a popular feature. how do you find some content in a file that has changed path though commits?	08:08
	the only knowledge i have is the path at the head commit	08:08
ikke	git can follow renames	08:08
hgl	any way to quickly find such file's history tracing renames?	08:09
ikke	git log --find-renames -- path/to/file	08:09
hgl	thanks. i'll give it a shot	08:09
	← Guest20 left	08:10
ikke	That's where most gui's will lack	08:10
	these kind of logging features	08:11
	→ YuGiOhJCJ joined	08:16
	← hussam left	08:16
	← downunder left	08:20
	→ Guest20 joined	08:21
	→ downunder joined	08:22
	→ ThatOtherGuy joined	08:22
	← dimi1947 left	08:23
	→ dimi1947 joined	08:25
	→ Rashad joined	08:27
Rashad	Hello. There are many options for a self-hosted git service.	08:28
	e.g., gitea, gogs, gitlab, etc	08:28
	What I want is basically 1) something that is very lightweight, 2) something that has branch protection, 3) something that is easy to maintain through a GUI for updates and configuration	08:29
	gitlab has 2 at a price, and 3, but not 1	08:29
	gitea seems to have 1, 2 and 3	08:30
ikke	branch protection is free in gitlab	08:30
	but it's certainly not light weight	08:30
Rashad	ikke Only the master branch	08:30
ikke	Rashad: You can protect any branch you want	08:30
	(I maintain a foss gitlab instance)	08:30
Rashad	Last time I checked you needed to pay to protect other than master.	08:31
	Let me check again.	08:31
Jookia	gitbucket works ok for smaller projects	08:31
Marmotte	2 years ago I already had any branch protected on a free GitLab instance	08:31
Rashad	self hosted?	08:32
Marmotte	yes	08:32
ikke	Yeah, same for me, 2/3 years ago	08:32
	← tiin57 left	08:32
	→ PJBoy joined	08:33
	← ekh left	08:33
dimi1947	is there a way I can discard some changes with git gui???	08:34
	in specific lines of code	08:34
Rashad	Hmm	08:36
ikke	dimi1947: should be possible, but been a long time since I last used git gui	08:36
	→ tiin57 joined	08:36
	← sgn left	08:37
	→ ekh joined	08:37
dimi1947	I found sth in the web...will investigate further	08:38
Rashad	OK then now gitlab is attractive again, since it seems well supported	08:39
	→ unluckyshrubbery joined	08:39
Rashad	But gitea seems much more lightweight	08:39
Jookia	beware that gitlab/gitea have poor accessibility	08:39
Rashad	If I could get away with it, I will just run git+gitolite, but that seems to be a bit more "manual" than having a gui	08:39
	← ekh left	08:40
Rashad	In case some people change in the organization, if the new people have a GUI, they don't need to learn as much to know where we kept certain files on the server, etc	08:40
	→ ekh joined	08:41
Rashad	In otherwords, I wouldn't need to document how the server was setup and how to update the different parts, etc	08:41
	Jookia What do you mean by accessibility?	08:41
	← ThatOtherGuy left	08:41
Rashad	Learning curve?	08:41
Jookia	support for disabilities	08:41
Rashad	Is bare git better?	08:42
	→ sgn joined	08:42
Rashad	Or are you suggesting another git GUI?	08:42
Jookia	github is best, gitbucket is passable i think	08:43
dimi1947	it git desktop you CAN discard specific lines of code but I cannot understand why it is not available always	08:43
	← ekh left	08:43
dimi1947	there is a contex menu item for discarding but somes times is not active	08:44
Rashad	I think I will try gitea and see if it is sufficient, and then if it is missing something essential, I will go with gitlab	08:44
	→ ekh joined	08:44
Rashad	Has anyone tried Gogs or any of the other lightweight alternatives?	08:44
	→ Hey joined	08:46
	← gigasu_shida left	08:48
	→ routingsparks joined	08:50
	← Hey left	08:51
	← hnOsmium0001 left	08:53
	← ferdna left	08:53
ikke	We tried it for our project, but they weren't able to handle our main repo (because it has lots of directories)	08:53
	← routingsparks left	08:53
	→ Tabmow joined	08:54
	← ekh left	08:56
	→ ThatOtherGuy joined	09:00
	← tiin57 left	09:02
	← adder left	09:03
	→ Huligan joined	09:05
	→ tiin57 joined	09:06
	← webmariner left	09:06
Rashad	ikke Just out of curiousity what kind of problem happened? Did it crash or acted weirdly or...?	09:07
	→ ghostshadow001 joined	09:07
ikke	I think it took ages to render pages	09:07
	if it was possible at all	09:07
	That was also about 2 years ago	09:08
Rashad	Yeah it could have changed	09:09
	← sgn left	09:13
	→ kaartic joined	09:14
	→ sgn joined	09:15
	← blaisebool left	09:19
	→ blaisebool joined	09:20
	← luke-jr left	09:23
	→ luke-jr joined	09:25
	→ durham_ joined	09:27
	← durham left	09:27
	→ ayush joined	09:29
	→ muhaha joined	09:31
	← tiin57 left	09:32
	→ tiin57 joined	09:35
	→ fstd_ joined	09:35
	→ john2gb joined	09:36
john2gb	i recieved a git repo from a source i do not trust, would commit hashes help me verify the repo has not been modified since?	09:36
osse	yes	09:39
	sha1 is "broken" in that sense though	09:39
	but in practice yes	09:40
john2gb	so hashes get recalculated everytime i git log?	09:40
	← fstd left	09:40
	fstd_ → fstd	09:40
osse	no	09:40
john2gb	then how am i sure no modification has been made	09:41
osse	maybe I misunderstood what you asked	09:41
	firstly, if you git clone and then never pull/fetch again then obviously no change can be made	09:42
	if you pull/fetch again you will be able to see the old sha1s further down in the history	09:42
	it is impossible to make changes to a git repo without affecting the hashes	09:44
	← kaartic left	09:44
	→ kaartic joined	09:45
osse	(except the attacks I mentioned earlier)	09:45
	← NeilG left	09:45
john2gb	so if only thing i have is this folder, i cannot verify that it has been modified	09:45
	this folder i.e repo	09:45
osse	modified since when?	09:46
john2gb	the repo is not available on a remote. some suspicious guy gave me the repo he recieved from the developer and said trust me. i want to be sure suspicious guy has not made any change the repo sinde.	09:48
	since*	09:48
osse	since WHEN?	09:48
	since he gave it to you?	09:48
	or in between when he got it from the developer and when he gave it to you?	09:48
john2gb	developer gives repo to guy -> guy puts bad stuff in it -> i want to see the bad stuff	09:49
	without additional commits*	09:49
osse	do you have anything to compare it too?	09:49
	*to	09:49
john2gb	say i dont	09:49
osse	then no	09:50
john2gb	thanks!	09:50
osse	no amount of hashes or checksums can help you in that case	09:50
	if you don't know what they're supposed to be	09:50
	if you DO know then it's trivial	09:51
	if you have some dates I suppose you can check that ther are no commits with a newer date than when that guy received the repo from the developer. but those can be faked	09:52
john2gb	yeah, if i had multiple suspicious guys giving me the repo i would cross check the hashes, that would work i guess	09:53
	← nomadicmathmo left	09:53
	→ nomadicmathmo joined	09:54
	← nomadicmathmo left	09:56
	→ nomadicmathmo joined	09:56
john2gb	stupid question #2: if the last commit is signed but none of the rest are, does that provide me a verification? i.e does the commit signature contain a sig for the entire tree or just the diff	09:58
Jookia	yes	09:59
	don't accept repos from sources you don't trust	09:59
john2gb	i would do that if i could lol	09:59
	← ghostshadow001 left	10:00
Jookia	use pgp signing	10:00
	git commit hashing isn't exactly a security measure	10:00
john2gb	very few people know what that is	10:00
	i wish more people used commit signing	10:01
Jookia	it depends on your threat model i guess	10:01
osse	john2gb: any commit hash depends on all commits before it	10:01
	so if a commit is signed then in practice the whole history up to that point is too	10:01
john2gb	great	10:02
	thanks!	10:02
osse	also any commit is a complete tree	10:02
	← tiin57 left	10:02
Jookia	if you don't have a good hash then it's impossible to check	10:02
osse	diffs are recalculated on the fly	10:02
ikke	john2gb: commit signing is useless if you don't have a good way to verify the keys.	10:02
	→ HumanG33k joined	10:02
Jookia	ikke: yeah this is why most cryptography is useless	10:02
	→ ghostshadow001 joined	10:03
john2gb	i know the key id is from the legit developer	10:03
	← ghostshadow001 left	10:03
john2gb	afaik you cant fake key ids	10:03
mgedmin	you can fake short key ids	10:04
	you can't fake fingerprints	10:04
	→ stdedos joined	10:04
ikke	(bar colissions :P)	10:05
stdedos	Hello there! Is it a conscious decision that `git alias -h` writes `'alias' is aliased to '....`, and then also executes it?	10:05
mgedmin	I stopped worrying about probabilistic algorithms returning false results when I read an argument in a book that there's a higher likelihood of a cosmic ray flipping a bit from 0 to 1 in the register that stores the result of the algorithm	10:06
	→ tiin57 joined	10:06
osse	stdedos: "alias" is not an official git subcommand	10:06
stdedos	"alias" as whatever alias	10:07
ikke	mgedmin: that's about accidental colissions	10:07
stdedos	Now, I just wrote `stash-stat`	10:07
ikke	mgedmin: That says nothing about malicious colissions	10:07
	like https://shattered.io/	10:07
mgedmin	that is true	10:08
	→ calcul0n joined	10:08
	→ vdamewood joined	10:08
stdedos	s/ as / as in /	10:08
john2gb	so essentially brute forcing 2 files that will give out the same hash?	10:09
Jookia	no it's more complicated than that	10:09
john2gb	yeah it was	10:12
	→ vinleod joined	10:13
	→ samuelbernardo joined	10:13
	← vdamewood left	10:14
	← sgn left	10:15
	→ sgn joined	10:20
	→ shivam_ joined	10:22
mgedmin	I suppose if I alias ci = commit, then I want git ci -h/--help to do the same as git commit -h/--help	10:24
	→ dionysus69 joined	10:26
	← muhaha left	10:26
	← dimi1947 left	10:31
	← tilpner left	10:31
	← tiin57 left	10:32
	→ tilpner joined	10:32
	→ tiin57 joined	10:35
	← sunri5e left	10:35
	← cebor left	10:36
	→ cebor joined	10:36
	→ sunri5e joined	10:39
	→ mobidrop joined	10:41
	→ Xenguy joined	10:43
stdedos	That is where the difference lies! `--help` will not run the command, whereas `-h` will do	10:43
	→ aliss joined	10:44
stdedos	however, none of the flags (-h/--help) will be autocompleted (and I am kinda lazy to write --help)	10:44
mgedmin	I wonder if that works for shell-based aliases	10:46
osse	git config alias.ci commit && git ci -h just prints the help for me	10:46
	it doesn't try to make a commit	10:46
mgedmin	yes it does	10:46
ikke	what about git config alias.ci '	10:46
	what about git config alias.ci '!git commit'	10:46
	→ Hey joined	10:47
osse	ah i see	10:47
	that prints what the alias is, then runs it	10:47
	weird	10:47
	← averell left	10:47
ikke	osse: can you try git config alias.ci '! f() { echo "$@"; };f'?	10:48
osse	ikke: that also prints the alias value, then runs it	10:49
ikke	Does the output reveal anything?	10:49
osse	I don't understand the question	10:50
	git::a9a60b94ccd	10:50
gitinfo	Git web link: https://github.com/git/git/commit/a9a60b94ccd	10:50
osse	lol	10:50
ikke	Was curious if it would run the alias with some arguments	10:50
osse	yes, it printed "-h" which is what I expected	10:51
ikke	Yes, so it just passes -h to the alias	10:51
osse	I now see that the alias value was also printed for the non-! alias; I just missed it	10:52
	← Hey left	10:52
	→ Technodrome joined	10:52
osse	stdedos: so yes, it is a conscious decision	10:52
stdedos	Okay, I see	10:54
	Bummer, I need to "fix" that myself	10:54
osse	would be nice if it was configurable, like the other advice thingies	10:55
stdedos	Might be. But I think I have stranded on the 'be ignored' side of the git mailing list :-)	10:57
	So I won't bother	10:57
	Thank you for the your triangulation :-)	10:57
	← dodobrain_ left	10:59
	→ averell joined	11:01
	→ clara97 joined	11:02
	← tiin57 left	11:02
	→ is_null joined	11:05
	→ tiin57 joined	11:06
	← stdedos left	11:07
	← tsrt^ left	11:08
	← Guest20 left	11:09
	→ fling joined	11:10
	→ ndbopoi^ joined	11:10
	← Xenguy left	11:11
	vinleod → vdamewood	11:14
	→ Hey joined	11:18
	→ sgn_ joined	11:18
	→ wrobinso1 joined	11:20
	← teclator left	11:22
	→ teclator joined	11:22
	← Hey left	11:23
	← wrobinson left	11:24
	wrobinso1 → wrobinson	11:24
	→ cdown_ joined	11:27
	← cdown left	11:30
	cdown_ → cdown	11:30
	← tiin57 left	11:32
	← Huligan left	11:33
	→ stdedos joined	11:35
	→ tiin57 joined	11:36
	→ nvmd joined	11:38
OnkelBlade	Hi all. For some reason when I do 'git stash apply' I get CONFLICT on just every file	11:43
	What I do wrong?	11:43
ikke	line ending issues?	11:45
	→ drbean joined	11:46
OnkelBlade	ikke: no, huge blocks of code. Like it was edited concurently. And I don't know why really	11:47
	← stdedos left	11:47
OnkelBlade	r+	11:47
	Odd... it happens regularly last week, maybe I misdo something	11:48
	← milkt left	11:59
	← john2gb left	12:00
	← jaziz left	12:01
	← tiin57 left	12:02
	← mobidrop left	12:04
	→ mobidrop joined	12:05
	← mobidrop left	12:05
	→ tiin57 joined	12:05
	→ amahl_ joined	12:07
	→ milkt joined	12:09
	→ dodobrain_ joined	12:14
	← dodobrain_ left	12:20
	← shivam_ left	12:20
	→ Hey joined	12:30
	→ init joined	12:30
	← andytoshi left	12:31
init	I have a fork which I did a revert on, when I rebase on upstream I cannot push to my fork's remote without force	12:31
	is it possible to take the git history of the upstream? such that the revert commit is no longer exists?	12:32
	← tiin57 left	12:32
	→ sdwrage joined	12:34
	→ tiin57 joined	12:35
selckin	do you want to keep other commits?	12:36
	← amahl_ left	12:36
selckin	!backup	12:37
gitinfo	Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups	12:37
init	yes, as they are also on the upstream remote	12:37
	the only commit that isn't is the revert	12:37
selckin	git reset --hard origin/master, to reset to the state of the remote	12:37
init	hm wouldn't it be upstream/master in this case	12:37
selckin	yeah translate to your branch & remote name	12:38
init	thanks!	12:38
	→ Gurkenglas joined	12:39
	→ yoh joined	12:39
	→ otisolsen70 joined	12:40
	→ cdown_ joined	12:45
	← swimmer left	12:47
	← cdown left	12:47
	cdown_ → cdown	12:47
	→ swimmer joined	12:50
nvmd	!help	12:50
gitinfo	What do you need help with? Something with git? Tell us what's going on, and please be specific. For information on how to abuse me (I'm a bot!), see https://gitirc.eu/bot . Please be gentle.	12:50
	← feriman left	12:56
	→ amahl_ joined	12:56
	← maxwilliamson left	12:59
	← Abdullah left	12:59
	← init left	13:00
	← tiin57 left	13:02
	← sweatsuit left	13:03
	← Hello71 left	13:05
	→ tiin57 joined	13:05
	→ CaliSoccerBro joined	13:06
	→ Hello71 joined	13:06
	→ madewokherd joined	13:08
	← rustyshackleford left	13:10
	→ dqx joined	13:10
	→ sweatsuit joined	13:11
	← clara97 left	13:11
	← nvmd left	13:13
	→ maxwilliamson joined	13:13
	← denisse left	13:16
	→ CodeSlingerPaul joined	13:16
	→ denisse joined	13:17
	← denisse left	13:20
	→ denisse joined	13:21
haymawk	Is there a way to setup a branch to track remote1 when I do a pull and remote2 when I do a push?	13:21
ikke	man git config	13:21
gitinfo	the git-config manpage is available at https://gitirc.eu/git-config.html	13:21
ikke	search for pushRemote	13:21
	← rcoote left	13:22
	→ rcoote joined	13:22
	← mirrorbird left	13:24
	→ cdown_ joined	13:25
haymawk	ikke: brilliant! thank you	13:26
	→ Betal joined	13:27
	→ init joined	13:28
	← Rashad left	13:28
	← cdown left	13:28
	cdown_ → cdown	13:28
	→ hussam joined	13:30
	← sgn_ left	13:30
	→ crose joined	13:30
	← tiin57 left	13:32
	← Hey left	13:33
	→ cdown_ joined	13:34
	→ tiin57 joined	13:36
	← cdown left	13:36
	cdown_ → cdown	13:36
rangergord	Let's say I have a legacy monorepo where the root contains /hardware/... and /software/... . I'd like split them in two, for example create a new repo just for software, but import the history related to software. So if commit <abcdef> on the old monorepo added /hardware/file1 and /software/file2, I would expect the new repo to have an equivalent commit (same commit message) which adds /src/file2. Is this feasible?	13:37
ikke	rangergord: subtree split	13:38
	!subtree	13:38
gitinfo	The subtree merge method is great for incorporating a subsidiary git repo into your current one with "unified" history. Read http://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_subtree_merge for more info, see also !git-subtree and !git-stitch-repo.	13:38
	→ nurdie joined	13:38
ikke	(it's talking about integrating, but it can also split)	13:38
	!git-subtree	13:38
gitinfo	git-subtree allows a subproject repository to be incorporated into a subdirectory of a main repository, and for the history of a subdirectory to be (re-)exported with reproducible results, making it possible to synchronise a repository with a subdirectory of another repo, see https://github.com/git/git/blob/master/contrib/subtree/git-subtree.txt for more info.	13:38
	← init left	13:39
	→ Hey joined	13:42
	→ bariscant joined	13:44
	← drbean left	13:44
	← samuelbernardo left	13:44
	→ samuelbernardo joined	13:45
	← bariscant left	13:45
	← fralinsky left	13:46
	→ bariscant joined	13:46
	→ fralinsky joined	13:47
	← bariscant left	13:48
	→ rustyshackleford joined	13:49
rangergord	thanks, checking it out	13:50
	→ sgn1 joined	13:52
	← sgn left	13:53
	→ Amanas joined	13:56
	← rcoote left	13:56
	← justanotheruser left	13:56
	→ init joined	13:57
	→ justanotheruser joined	13:58
	→ kerframil joined	13:58
	← tiin57 left	14:02
	→ tiin57 joined	14:06
	→ wnbeser joined	14:06
	← Amanas left	14:07
	← fralinsky left	14:10
	→ Amanas joined	14:10
imMute	rangergord: definitely subtree split. I have used that many times to do exactly what you want. it's easiest when the part you want to split is entirely contained in a subdirectory, which it sounds like it is.	14:10
	← BSaboia left	14:11
	sgn1 → sgn	14:12
rangergord	it definitely is.	14:17
	→ cdown_ joined	14:21
	→ fralinsky joined	14:21
	← ayush left	14:21
	→ ayush joined	14:22
	→ howdoi joined	14:22
	← cdown left	14:23
	cdown_ → cdown	14:23
	→ HourGate joined	14:25
	← cebor left	14:27
	→ cebor joined	14:28
	← ayush left	14:30
	→ bamdad joined	14:31
	← tiin57 left	14:32
	← kaartic left	14:35
	→ tiin57 joined	14:36
	← fralinsky left	14:37
	→ Atlenohen joined	14:38
	→ fralinsky joined	14:38
	← fralinsky left	14:38
	→ thiago joined	14:38
	← Kaivo left	14:38
	→ fralinsky joined	14:40
	→ Kaivo joined	14:41
	→ clara97 joined	14:44
	→ relipse joined	14:50
	← CaliSoccerBro left	14:51
	→ Maxattax joined	14:54
rangergord	I migrated from svn, and I have a git repo with a commit history, but broken historical builds, due to git submodules not being a 1:1 equivalent of svn externals. This can't be solved. So I modify the tip of my master branch by manually adding a git submodule pointing at dependencies, update the paths of my build scripts (like instead of ./external1includes/somefile.h, it's now ../third_party_submodule1/include/somefile.h),	14:54
	and commit. All good going forward.	14:54
	But in my case I also need the ability to do hotfixes on older commits. That older commit will also be broken, requiring adding the git submodule as well as updated paths. Do I repeat the same steps to make this old commit usable too? Or is there some other approach I can look into?	14:54
	← Spicyfella left	14:55
imMute	repeat the process. if it's identical, you might be able to cherry-pick the commit that you did on master.	14:55
	→ Spicyfella joined	14:55
rangergord	allright, thanks	14:55
imMute	you could also rewrite the history to "properly" import the externals/submodules. but in my experience that's typically more work than repeating the fixup process, so it's usually not worth it.	14:56
	→ Dario37Man joined	14:56
rangergord	yeah	14:57
	→ gast0n joined	14:58
	← Ram-Z left	14:58
	← milkt left	14:58
	→ Ram-Z joined	14:59
	→ arcatech joined	15:00
	→ sudoforge joined	15:01
	→ mirrorbird joined	15:01
	← tiin57 left	15:02
	→ rokups joined	15:04
	← arcatech left	15:05
	→ tiin57 joined	15:06
	→ milkt joined	15:06
	← milkt left	15:07
	← spiri left	15:07
	→ BSaboia joined	15:11
	← Kaivo left	15:13
	→ Kaivo joined	15:14
	→ spiri joined	15:15
	→ finalbeta joined	15:15
	← benfelin left	15:18
	→ ferdna joined	15:20
	→ milkt joined	15:20
	→ cousteau joined	15:22
	← wnbeser left	15:22
	← durham_ left	15:22
	→ durham joined	15:23
cousteau	Hi! If two branches make the exact same change on the exact same place of a file, and I merge the two branches, will git see it as a conflict?	15:23
ikke	cousteau: as far as I know, no	15:24
cousteau	Or will it not, because the changes are identical?	15:24
	Cool!	15:24
	← BSaboia left	15:24
	→ BSaboia joined	15:26
	← Dario37Man left	15:27
	→ raven-au_ joined	15:30
	← raven-au left	15:31
	raven-au_ → raven-au	15:31
	← tiin57 left	15:32
	← BSaboia left	15:32
	→ tiin57 joined	15:35
	→ PriaBrewok joined	15:39
	→ Anticom joined	15:39
	← Amanas left	15:43
	← PriaBrewok left	15:43
	← ghost43_ left	15:45
	→ ghost43 joined	15:47
	→ Petro joined	15:47
	→ BSaboia joined	15:49
	→ hnOsmium0001 joined	15:49
	← spiri left	15:49
	← Petro left	15:55
	→ orbyt_v7 joined	16:02
	← tiin57 left	16:02
	← FabioP left	16:02
	→ tiin57 joined	16:05
	← durham left	16:06
	→ durham_ joined	16:06
	→ p-core joined	16:06
	→ shush joined	16:08
	← durham_ left	16:11
	→ durham joined	16:12
	← BSaboia left	16:12
	← Hey left	16:13
	← nitrix left	16:13
	→ holy joined	16:14
	→ heyitsrama joined	16:15
	→ nitrix joined	16:15
	← YuGiOhJCJ left	16:20
	→ BSaboia joined	16:20
	→ kaartic joined	16:21
	← gxt left	16:21
	→ gxt joined	16:21
	→ herren joined	16:24
	← chele left	16:26
	→ cdown_ joined	16:27
	→ Amanas joined	16:28
	← cdown left	16:29
	cdown_ → cdown	16:29
	← tiin57 left	16:32
	→ cd joined	16:33
	→ bariscant joined	16:34
	→ tiin57 joined	16:36
	← causasui left	16:36
	← bariscant left	16:39
	← Muimi left	16:39
	→ Narrat joined	16:44
	← Haohmaru left	16:49
	← mightyjens left	16:53
	← holy left	16:53
	← BSaboia left	16:56
	→ BSaboia joined	16:57
	← nitrix left	16:58
	← BSaboia left	16:58
	→ nitrix joined	16:58
	← tiin57 left	17:02
	→ regedit joined	17:04
	→ tiin57 joined	17:05
	→ tchan1 joined	17:05
	← tchan left	17:07
	→ BSaboia joined	17:07
	→ feriman joined	17:08
	← BSaboia left	17:08
	→ achilles joined	17:10
	← rfuentess left	17:11
	← hineios left	17:12
	← yohnnyjoe left	17:15
	→ arcatech joined	17:16
	→ Pantysniffer joined	17:16
	← tchan1 left	17:16
	→ tchan joined	17:17
	← tchan left	17:17
	→ tchan joined	17:17
	→ hineios joined	17:20
	← Pantysniffer left	17:23
	→ zumba_addict joined	17:24
	→ tiger joined	17:30
	← tiger left	17:31
	← tiin57 left	17:32
	→ tiin57 joined	17:35
	→ gopper joined	17:37
	← theorangeone_ left	17:40
	→ theorangeone joined	17:40
	← KnoP left	17:43
	← clara97 left	17:44
	→ virgo joined	17:45
virgo	is there a way on github to message all maintainers?	17:45
	Like @maintainers ?	17:45
	→ mat001 joined	17:46
	← mat001_ left	17:48
	→ yohnnyjoe joined	17:50
ikke	Not aware of anything, but maybe you can ask #github	17:51
	→ cambareri joined	17:51
virgo	did not know there was a github channel on here thanks	17:51
	← [twisti] left	17:54
BtbN	It's ##github now	17:55
	Too many people took it as official support line	17:56
virgo	(y)	17:56
	← yohnnyjoe left	17:57
	← lambda left	17:59
	← cambareri left	17:59
	→ lambda joined	18:01
	→ dpflick_ joined	18:02
	← tiin57 left	18:02
	← herren left	18:03
	← lambda left	18:04
	← dflick__ left	18:04
	→ tiin57 joined	18:05
	→ lambda joined	18:06
	→ yonder joined	18:08
	← zumba_addict left	18:08
	← achilles left	18:11
	→ jordy joined	18:13
	← jordy left	18:13
	→ jordy joined	18:13
	→ zumba_addict joined	18:16
	← nomadicmathmo left	18:16
	→ calcul0n_ joined	18:17
	→ Antonx joined	18:17
	← Antonx left	18:18
	← calcul0n left	18:20
	← tgunr left	18:22
	← bocaneri left	18:22
	→ jstein joined	18:24
	→ cousteau_ joined	18:27
	← cousteau left	18:29
	→ yohnnyjoe joined	18:30
	→ tgunr joined	18:30
	→ karmicc joined	18:31
	← astronavt left	18:31
	← tiin57 left	18:32
	→ h3ck joined	18:33
	← yohnnyjoe left	18:34
	← justanotheruser left	18:35
	→ tiin57 joined	18:36
	← shored1 left	18:38
	→ shored joined	18:38
	→ KnoP joined	18:44
	← otisolsen70 left	18:44
	← LetoThe2nd left	18:45
	← zumba_addict left	18:49
	→ zumba_addict joined	18:50
	← bvdw left	18:51
	→ bvdw joined	18:52
	← bvdw left	18:54
	→ bvdw joined	18:54
	← bvdw left	18:56
	→ bvdw joined	18:56
	→ theoceaniscool joined	18:56
	← arcatech left	18:57
	→ dflick__ joined	18:57
	← bvdw left	18:57
	→ bvdw joined	18:58
	← bvdw left	18:59
	← rokups left	18:59
	→ bvdw joined	18:59
	← dpflick_ left	18:59
NightMonkey	Howdy. If I have a .gitignore in a top-level repo directory, and then have a .gitignore in a subdirectory of that, are the patterns of the subdirectory added to the top-level's patterns, or are the set of patterns completely replaced?	19:00
	← shush left	19:01
	← bvdw left	19:01
	→ bvdw joined	19:01
	→ sgn1 joined	19:01
ikke	added	19:01
	← Amanas left	19:02
	← dionysus69 left	19:02
	← tiin57 left	19:02
	→ BSaboia joined	19:02
NightMonkey	ikke: Thanks.	19:02
	← bvdw left	19:02
	→ bvdw joined	19:03
	→ arcatech joined	19:03
	← bvdw left	19:04
	← sgn left	19:05
	← gopper left	19:05
	→ tiin57 joined	19:05
	→ ayush joined	19:10
	← ayush left	19:10
	← Hounddog left	19:13
	← theoceaniscool left	19:15
	← h3ck left	19:15
	→ theoceaniscool joined	19:18
	← mirrorbird left	19:18
	← kaartic left	19:19
	← ferdna left	19:23
	← theoceaniscool left	19:25
	← vdamewood left	19:27
	← kerframil left	19:28
	→ webmariner joined	19:30
	← tiin57 left	19:32
	→ geosmile joined	19:33
	← virgo left	19:34
	← PJBoy left	19:35
	→ tiin57 joined	19:36
	← zumba_addict left	19:36
	← cousteau_ left	19:39
	→ leeN joined	19:43
	→ zumba_addict joined	19:45
	← amahl_ left	19:45
	→ macrover joined	19:45
	← OMGOMG left	19:50
	→ OMGOMG joined	19:52
	→ settermjd joined	19:56
	← Maxattax left	19:59
	← opal left	20:00
	→ yohnnyjoe joined	20:00
	← tiin57 left	20:02
	→ opal joined	20:02
	→ davispuh joined	20:04
	→ tiin57 joined	20:06
	→ g00s joined	20:06
	→ kerframil joined	20:09
	→ vachkiri joined	20:11
	→ PJBoy joined	20:11
	← kerframil left	20:14
	→ diverdude joined	20:14
	→ CCR5-D32 joined	20:16
	← heyitsrama left	20:21
	→ s2013 joined	20:21
diverdude	Hi... i have a repo on machine A which have 2 remotes. the one remote is on a machine here on the local network. If i do git remote -v i can see hh hh@192.168.1.99:/mnt/data/share/reponame.git (fetch) and hh hh@192.168.1.99:/mnt/data/share/reponame.git (push). This all works great for fetching and pushing. However i wanted to now clone that repo to another dir by doing git clone hh@192.168.1.99:/mnt/data/share/reponame.git but the	20:22
	n i get: `fatal: Could not read from remote repository.`. Why can i not clone that repo?	20:22
	→ jimklimov1 joined	20:24
	← jimklimov left	20:25
relipse	is there a way to save git show to a file and then view it somewhere else with nice colors?	20:25
	→ jimklimov joined	20:26
	← jimklimov1 left	20:28
osse	relipse: git show ... > file.html	20:29
ikke	.html?	20:29
	→ heyitsrama joined	20:31
relipse	It seems Sublime Text 3 is sufficient to view a .diff file	20:31
	thanks	20:31
	← milkt left	20:32
	← tiin57 left	20:32
osse	relipse: oooh I thought you meant git show master:some/file.txt	20:32
	not the diff itself	20:32
	→ milkt joined	20:32
osse	yeah most editors handle .diff or .patch	20:32
	← heyitsrama left	20:32
	← BSaboia left	20:34
	→ mirrorbird joined	20:36
	→ tiin57 joined	20:36
	← vachkiri left	20:36
relipse	what editor do you like?	20:36
ikke	vim, emacs	20:37
	→ theoceaniscool joined	20:37
	← karmicc left	20:37
	→ BSaboia joined	20:38
	→ b1ack0p joined	20:38
b1ack0p	hi	20:38
	can i install linux packages on windows via git bash?	20:38
	mingw64	20:39
	→ NeilG joined	20:39
	← NeilG left	20:39
	→ NeilG joined	20:39
BtbN	define "linux packages"	20:40
	Windows cannot run linux binaries outside of WSL/a VM	20:40
b1ack0p	BtbN: some console games for example like "vitetris"	20:40
	command line games	20:40
BtbN	If you manage to compile them for Windows, they'll run	20:41
	← milkt left	20:41
b1ack0p	is git bash same with cygwin?	20:41
	for windows	20:41
	i am looking alternatives for WSL	20:42
Jookia	why?	20:42
	← jordy left	20:42
b1ack0p	wsl seems laggy	20:42
Jookia	are you using wsl2	20:42
b1ack0p	and when i run irssi it disconnects often	20:42
	whatever version is on my windows 10	20:42
	→ hrehf joined	20:42
	→ ThiefMaster joined	20:42
Jookia	you should make sure you're using wsl2	20:43
	→ lucasb joined	20:43
b1ack0p	how will i do that?	20:43
hrehf	how do I print every line of DIFF that contains regex over all revisions?	20:43
b1ack0p	and what is wrong using git bash?	20:43
osse	b1ack0p: MSYS2, which git for windows is based upon	20:43
b1ack0p	osse: i just sshed to my amazon aws using git bash	20:43
Jookia	git bash/msys2/cygwin are slow by design and intended for development	20:43
b1ack0p	to linux instance	20:43
Jookia	if you want real linux, use wsl2 or other VMs	20:44
b1ack0p	and running tmux/irssi at the moment	20:44
Jookia	msys2 and cygwin are otherwise your only real hope for that kind of thing	20:46
osse	msys2 comes with a fork of pacman, which is nice	20:46
	and you can install git within it	20:46
	→ heyitsrama joined	20:47
Jookia	i'm considering moving to msys2 from git for windows since git for windows is broken	20:47
	← heyitsrama left	20:48
	→ heyitsrama joined	20:49
osse	Jookia: don't. msys2 git is slow as hell	20:50
	Jookia: the only reasonable way to use it is to install gfw there	20:50
Jookia	yeah but at least it works	20:50
	unless there's some other git windows implementation?	20:51
diverdude	Hi... i have a repo on machine A which have 2 remotes. the one remote is on a machine here on the local network. If i do git remote -v i can see hh hh@192.168.1.99:/mnt/data/share/reponame.git (fetch) and hh hh@192.168.1.99:/mnt/data/share/reponame.git (push). This all works great for fetching and pushing. However i wanted to now clone that repo to another dir by doing git clone hh@192.168.1.99:/mnt/data/share/reponame.git but the	20:51
	n i get: `fatal: Could not read from remote repository.`. Why can i not clone that repo?	20:51
	← heyitsrama left	20:51
osse	Jookia: what's broken about it?	20:51
	I don't think msys2 git will work any better, but i'm not sure	20:51
Jookia	osse: can't push/fetch from a windows machine	20:51
	basic functionality like that	20:52
	← bket left	20:52
osse	I think perhaps that's your problem and not git's.	20:52
Jookia	it's not. there's a bug open for it	20:52
	→ jnavila joined	20:53
	→ irrgit joined	20:54
osse	link?	20:54
	surely the bug is more specific	20:54
Jookia	https://github.com/git-for-windows/git/issues/2813	20:55
danielb	diverdude, I suggest you test with scp to make sure it really is working: scp [email@hidden.address] ./copy-of-config-file	20:56
	→ heyitsrama joined	20:56
	← heyitsrama left	20:56
	→ heyitsrama joined	20:57
diverdude	danielb: thats working great	20:57
	→ justanotheruser joined	20:57
	← ignapk left	20:58
	← mic4ael left	20:58
	← _W_ left	20:58
	← geirha left	20:58
	← pulec left	20:58
	→ pulec joined	20:58
osse	Jookia: interesting	20:58
	→ ignapk joined	20:58
	→ _W_ joined	20:59
	→ mic4ael joined	20:59
danielb	diverdude, bizarre. Maybe some of the repo somehow got bad permissions or something. scp -r would confirm that you can pull down the whole directory.	20:59
osse	Jookia: i doubt msys2 git will help but you can try...	20:59
	→ geirha joined	20:59
danielb	If scp -r works to get the entire remote directory, then by all rights git clone should work as well.	20:59
Jookia	osse: msys2 provides a working PATH and its own SSH server i think so it bodges around it	20:59
diverdude	danielb: uhhh ok i just managed to clone it...weird....before it did not work	20:59
danielb	I suspect a typo	21:00
	→ kelelawars joined	21:01
	→ notnatebtw joined	21:01
	← tiin57 left	21:02
	→ milkt joined	21:06
	← orbyt_v7 left	21:06
	→ tiin57 joined	21:06
	→ vdamewood joined	21:06
	→ m0viefreak joined	21:07
	→ vinleod joined	21:12
	→ bariscant joined	21:12
osse	Jookia: heh, the reason I didn't understand what you mean is because i didn't have the imagination to think of the server side	21:12
Jookia	osse: well, git is supposedly decentralized	21:13
	→ bket joined	21:13
	← vdamewood left	21:13
	vinleod → vdamewood	21:14
	← kelelawars left	21:14
	→ Amanas joined	21:15
	← settermjd left	21:17
	← justanotheruser left	21:18
	→ Goo joined	21:19
	← bariscant left	21:21
	→ kerframil joined	21:25
	← jnavila left	21:25
	→ dodobrain joined	21:26
	→ orbyt_v7 joined	21:27
	← warthog9 left	21:29
	← tiin57 left	21:32
b1ack0p	finally set wsl2	21:32
	→ warthog9 joined	21:35
	→ tiin57 joined	21:35
	→ justanotheruser joined	21:37
	← hrehf left	21:39
	→ dodobrain_ joined	21:40
	← dodobrain left	21:43
	← KnoP left	21:45
	→ jaziz joined	21:45
	← Amanas left	21:48
	← sdwrage left	21:50
	→ sgn joined	21:50
	← sgn1 left	21:50
	→ nomadicmathmo joined	21:54
	← dodobrain_ left	21:56
	← nomadicmathmo left	21:56
	→ nomadicmathmo joined	21:57
	→ deanman joined	21:57
	→ Geminizer joined	22:01
	← tiin57 left	22:02
	← s2013 left	22:04
	← Goo left	22:04
deanman	I'm trying to understand the difference or workflow for `--fixup` or `--squash` commits. For the first i get its usage as trying to fix a previous commit with a new commit that get this prefix which in turn when running `rebase --autosquash` will melt it into one. But I'm struggling to understand in which scenario i would use the latter.	22:04
	← leeN left	22:05
ikke	I never use --squash	22:05
osse	deanman: squash is like fixup except it combines the commit messages	22:05
	→ tiin57 joined	22:06
deanman	But in the case if `fixup` there is an actual change where if i simply want to merge two commits together with squash there is no new commit needed right?	22:06
osse	hmm?	22:07
	the only different is the commit message that git proposes	22:07
deanman	osse oh so in that case is like trying to edit a commit in history and at the same time make it disappear?	22:08
	← arcatech left	22:09
osse	ehh	22:09
	i'm not sure how to answer that	22:09
	fixup makes git rebase combine two commits into one	22:10
	squash does the same	22:10
	fixup just keeps the message of the first commit	22:10
	squash combines the two messages	22:10
	that's all	22:10
	→ aqpl joined	22:14
	← aqpl left	22:18
	← perrier-jouet left	22:20
deanman	osse Thank you, i now understood it	22:23
	→ john2gb joined	22:27
	← justanotheruser left	22:27
	← Trel left	22:27
deanman	If it's a `--squash` commit which basically gets the message of the commit and prefixes it with `squash!` text is there a case you would might want both? This is what i get when i try to do a git commit --squash https://paste.ubuntu.com/p/T6kYXgTDM8/	22:27
	← deanman left	22:28
	← mirrorbird left	22:28
	→ believer1 joined	22:28
	→ deanman joined	22:30
	→ ShapeShifter499 joined	22:32
	← tiin57 left	22:32
	← Geminizer left	22:32
	← pandem left	22:33
	→ tiin57 joined	22:35
	→ pandem joined	22:36
	→ jaziz1 joined	22:37
	← Trieste left	22:38
	← p-core left	22:39
	← feriman left	22:40
	← deanman left	22:42
	→ justanotheruser joined	22:42
	← m0viefreak left	22:43
	← jaziz1 left	22:43
	← theoceaniscool left	22:44
	→ Hello71_ joined	22:45
	← Hello71 left	22:45
	→ Trieste joined	22:45
	← nomadicmathmo left	22:46
	→ nomadicmathmo joined	22:46
	→ dodobrain joined	22:49
	← believer1 left	22:51
	← aliss left	22:52
	→ Firefox joined	22:55
	← Narrat left	22:56
	← justanotheruser left	22:57
	→ arcatech joined	22:59
	← tiin57 left	23:02
	← gast0n left	23:05
	← tejr left	23:06
	→ tiin57 joined	23:06
	→ tejr joined	23:06
	← Firefox left	23:09
	→ gast0n joined	23:12
	← orbyt_v7 left	23:16
	← heftig left	23:19
	← elibrokeit left	23:19
	→ heftig joined	23:20
	→ elibrokeit joined	23:20
	← Anticom left	23:21
	← jstein left	23:21
	← g00s left	23:26
	← heyitsrama left	23:32
	← tiin57 left	23:32
	→ Trel joined	23:33
	→ tiin57 joined	23:36
	← CodeSlingerPaul left	23:42
	→ sgn1 joined	23:44
	→ causasui joined	23:45
	← sgn left	23:46
	→ perrier-jouet joined	23:50
	← vdamewood left	23:54
	→ orbyt_ joined	23:57
	← calcul0n_ left	23:59

Logs Search ←Prev date Next date→

Channels Documentation