IRCloggy #git 2019-03-05

Provider of IRC logs since 2005.

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

	2019-03-05
	← Cabanossi left	00:02
	← finalbeta left	00:04
	→ akushner joined	00:06
	→ dansan joined	00:07
	← Phylock left	00:08
	← Maple left	00:09
	← flying_sausages_ left	00:10
	← db` left	00:10
	→ igemnace joined	00:11
	→ flying_sausages joined	00:11
	← demize left	00:11
	→ Cabanossi joined	00:12
	→ Guest99016 joined	00:12
	→ bittyx joined	00:12
	← iam730 left	00:12
	→ demize joined	00:12
	Guest99016 → Maple	00:13
	→ db` joined	00:15
	← Olipro left	00:15
	→ haasn joined	00:17
	← manuelschneid3r left	00:21
	→ Olipro joined	00:22
	← bluezone left	00:25
	→ iam730 joined	00:28
	← akushner left	00:30
	← orbyt_ left	00:31
	→ akushner joined	00:31
	→ taelore joined	00:33
	→ adder` joined	00:36
	← adder left	00:36
	→ taylorrr joined	00:37
	← taelore left	00:37
	→ orbyt_ joined	00:38
	→ ThiefMaster joined	00:38
	← strudla left	00:38
	→ strudla joined	00:38
	← computerquip left	00:38
	→ computerquip joined	00:39
	→ mescalin_ joined	00:40
	← nic-hartley left	00:41
	← mat001 left	00:42
	← mescalinum left	00:42
	→ Bobdude joined	00:42
	→ fstd_ joined	00:45
	← RoriconKnight left	00:45
	← fstd left	00:45
	fstd_ → fstd	00:45
	← Olipro left	00:46
	→ Olipro_ joined	00:46
	Olipro_ → Olipro	00:46
	→ hofmann3900 joined	00:47
	← karoshii left	00:50
	← orbyt_ left	00:50
	→ karoshii joined	00:51
	→ parallel21 joined	00:52
	→ jimInDevNull joined	00:53
	→ tachoknight_ joined	00:53
	← nikivi left	00:53
	→ nikivi joined	00:54
	← yyy- left	00:57
	→ BenderRodriguez joined	00:57
	← de-facto left	01:01
	→ de-facto joined	01:01
	→ orbyt_ joined	01:05
	→ in1t3r_ joined	01:07
	→ CCDelivery joined	01:09
	← in1t3r left	01:09
	← wildlander left	01:10
	→ assemblyman joined	01:12
	→ wildlander joined	01:15
causasui	how can I force a merge commit with a distinct message even if the merge can fast-forward?	01:21
mud	causasui: --no-ff	01:22
causasui	thanks	01:23
mud	Anytime	01:23
	→ dpyro_ joined	01:25
	← dpyro left	01:25
	← Essadon left	01:26
	→ meejah joined	01:27
	← Olipro left	01:29
	← veegee left	01:29
	← invisbl left	01:29
	→ invisbl joined	01:30
	← causasui left	01:30
	← oojacoboo left	01:32
	→ black_13 joined	01:33
black_13	is this correct placed to ask about git hub or git only	01:34
	← lacrymology left	01:34
	→ APK joined	01:35
	← AKPWD left	01:35
	← m0viefreak left	01:36
black_13	i try to do a git clone and this fails with "black_13@github.com: Permission denied (publickey)."	01:36
	it should use my company email	01:36
	→ lacrymology joined	01:37
	← victorqueiroz left	01:42
	← kneeki left	01:43
	← iNs left	01:43
	→ iNs joined	01:44
	← quizzi left	01:46
	→ quizzi joined	01:47
	← quizzi left	01:48
	→ quizzi joined	01:49
	← black_13 left	01:50
	← YuGiOhJCJ left	01:53
	→ prakashdanish joined	01:55
	→ Goplat joined	01:57
	→ causasui joined	02:00
	← prakashdanish left	02:01
	→ prakashdanish joined	02:02
	← Sasazuka left	02:02
	← gxt left	02:03
	→ mat001 joined	02:06
	← wildlander left	02:07
	← causasui left	02:09
	← mat001 left	02:10
	← F0rTex left	02:18
	→ F0rTex joined	02:19
	→ learningc joined	02:19
	← steven left	02:22
	← akushner left	02:22
	→ z8z joined	02:23
	→ finalbeta joined	02:25
	← kjartan left	02:31
	→ User_ joined	02:31
	← lacrymology left	02:32
	→ kjartan joined	02:35
	← learningc left	02:35
	← yonder left	02:35
	→ scapegoatee joined	02:38
scapegoatee	Can I simply concatenate a -m flag and my message after git revert, instead of going to vim and typing a message?	02:40
	← JanC left	02:43
	← gambl0r3 left	02:47
	→ JanC joined	02:48
	← scapegoatee left	02:50
	→ kerframil joined	02:51
	← boombatower left	02:52
	← inkbottle left	02:54
	→ nic-hartley joined	02:55
	→ thiago joined	02:57
	← cbreak left	02:57
	← iNs left	03:00
	→ iNs joined	03:01
	→ Spacew00t joined	03:10
	← xcm left	03:16
	→ xcm joined	03:17
	← jakogut left	03:20
	← invisbl left	03:24
	← prakashdanish left	03:25
	→ Dirak_ joined	03:27
	→ prakashdanish joined	03:27
	← nic-hartley left	03:29
	← Dirak left	03:29
	← Dirak_ left	03:32
	→ learningc joined	03:33
	← de-facto left	03:35
	← User_ left	03:35
	→ de-facto joined	03:36
	→ User_ joined	03:39
	← fassl left	03:41
	← learningc left	03:42
	→ invisbl joined	03:45
	← Anthaas left	03:48
	→ Anthaas joined	03:48
	← null1337 left	03:49
	← invisbl left	03:49
	← z8z left	03:50
	← prakashdanish left	03:53
	→ kyan joined	03:54
	← lagothrix left	03:58
	→ lagothrix joined	03:58
	→ stitched_unicorn joined	04:02
	→ McBride36 joined	04:07
McBride36	i initialized a repo. staged files, clicked unstage and now all my files are gone. am i boned?	04:07
	← mven left	04:10
mud	McBride36: what gui? Are the files actually gone or just not shown in the gui?	04:11
McBride36	atom, git	04:12
	and if i ls the dir, it's gone, toast	04:12
	except for .git and my directories	04:12
kadoban	If it actually staged them in git, it should be possible to get them back	04:13
McBride36	wasn't pushed	04:13
	and it was initializing a fresh repo	04:13
kadoban	McBride36: How many files we talking? The only way I know is kind of tedious	04:13
McBride36	uh, it's like 15-20 files? It's my infrastructure as code	04:14
kadoban	But the tedious way is ... first make a copy of the directory, this is important because I don't do this much and you want to have a backup in case something of this screws something up.	04:14
McBride36	done	04:15
	→ mven joined	04:15
kadoban	Then do: git fsck --lost-found and look for all of the dangling blob entries, if you do 'git show <whatevershaid>' for each one, most of them should be your files	04:15
	Actually, you might be able to look for uhm I think it'd be dangling commit and just checkout that shaid: git checkout <whatever> it's possible that'll just bring them all back	04:15
McBride36	how do i find dangling commit	04:16
kadoban	Should be in the same list. Or maybe staging files doesn't actually make a commit, just a blob.	04:16
McBride36	well i've got the list of blobs	04:16
	and a missing tree	04:17
kadoban	You could try 'git checkout' on each blob, one of them might be the uhm treeish thing that stands for the whole directory. I dunno if that works though	04:17
	Oh try 'git checkout' on the tree, might save some time	04:17
	→ Dirak joined	04:17
McBride36	cannot switch branch to a non-commit	04:18
	← Ori_B left	04:18
kadoban	Hm, too bad	04:18
	→ din0 joined	04:18
McBride36	it's not that many files, should be doable, writing a script to do this p quick	04:19
kadoban	Tedious it is then. Most of the blobs should be your files though, hopefully that works. If it does, just do 'git show whatever' and when you figure out what file it was, do 'git show whatever > the_filename.txt' Looks like https://github.com/ethomson/git-recover exists as well, though I'm pretty sure it's just a very transparent wrapper on doing exactly this anyway	04:19
McBride36	either way, it's a big help, thanks	04:21
	← kyan left	04:21
kadoban	Yeah no problem, good luck	04:21
	← noonien left	04:23
	→ ferdna joined	04:30
	→ cfoch joined	04:30
	→ User__ joined	04:31
	← navidr left	04:32
	← User_ left	04:35
	← mescalin_ left	04:37
	→ v01d4lph4 joined	04:37
McBride36	it's tedious but significantly better than the alternative	04:38
	→ edrx joined	04:39
	← mven left	04:40
	→ spacesuitdiver joined	04:41
	← SpeakerToMeat left	04:45
	← CCDelivery left	04:46
	→ steven joined	04:46
edrx	hi - help, I'm feeling brain-dead... by running "git log --oneline" I can see that the two last revisions of my repository are 92702c7 and b0f124e, and I know that the file "ChangeLog" has changed between these two revisions... how do I output the file ChangeLog in revision b0f124e to stdout?	04:47
	→ invisbl joined	04:51
	→ howdoi joined	04:52
	→ MACscr joined	04:55
	→ gdibass joined	04:58
	← Inline left	04:58
	→ pks_ joined	05:01
	← Cabanossi left	05:02
	→ kapil____ joined	05:02
	← Xiti left	05:02
	← pks left	05:03
	pks_ → pks	05:03
	→ Xiti joined	05:03
	→ dviola joined	05:05
	→ Cabanossi joined	05:06
	→ mven joined	05:07
	← mven left	05:07
	← tsdh left	05:07
McBride36	kadoban: back to situation normal. you're a lifesaver. thanks a lot	05:09
	← orbyt_ left	05:09
edrx	aha - git show b0f124e:ChangeLog =)	05:15
	→ klow joined	05:20
	→ prakashdanish joined	05:23
	→ mat001 joined	05:30
	→ User_ joined	05:32
	← grawity left	05:34
	← User__ left	05:35
	← mat001 left	05:35
	← invisbl left	05:42
	← dpyro_ left	05:47
	← wyre left	05:49
	→ wyre joined	05:49
	→ dpyro joined	05:49
	← Dirak left	05:50
	→ Dirak joined	05:51
	← govg left	05:56
	→ tsdh joined	05:57
	← kerframil left	05:59
	← irqq left	06:00
	→ rsrx joined	06:02
	→ invisbl joined	06:03
zalt	i wonder does git apply behave like git am?, i have a series of patches created using format-patch and i want to apply them with their metadata	06:07
	zalt uses ancient features of git	06:07
	← invisbl left	06:08
	← rsrx left	06:10
	→ rsrx joined	06:10
thiago	no	06:12
	git apply applies a patch to your tree	06:12
	git am applies a commit to your history	06:13
	one commit or more, actually	06:13
	am = "apply mail(box)"	06:13
zalt	yes, but i don't have mail!, and i'm trying to use it, i have a bunch of patch00number--message.patch	06:14
thiago	that's a mail	06:14
	when you store your email in a mailbox or especially in a maildir, git am can consume them directly	06:14
	← xcm left	06:15
zalt	technically it was sent over unencrypted ftp, but yeah, i assume it is equivilent	06:15
thiago	anyway, you don't need that. All you need are those files.	06:15
	just git am the files (in order)	06:15
	→ xcm joined	06:15
zalt	sorry i have no experience with unix mail, what makes a dir a maildir?	06:15
	zalt tries that	06:15
thiago	the dir structure. A maildir has three subdirs (cur, tmp and new) and each file in them is an email	06:16
	a mailbox is a single file, containing many emails	06:16
	brb	06:18
	← thiago left	06:19
	← edrx left	06:20
	→ thiago joined	06:20
zalt	thiago, thanks!, that worked	06:23
thiago	I'm glad	06:23
zalt	i see the commit hashes are different from the source pc, is that normal? (it suffocated on some files but i fixed that)	06:23
thiago	yes, it's normal	06:24
zalt	hmm, i wonder what proves the integrity of a certain commit then? is that what signing is for	06:25
	zalt wonders whether git commit hashes are deterministic	06:25
thiago	they are deterministic	06:25
	they differ for you because at least one source of the data changed	06:26
	git am recreates the commit, using your name and the current date as the committer information	06:26
zalt	hmm, that's not a problem in my use case, it's just interesting that this provides an alternative way of the push/pull way	06:26
thiago	you also don't have to apply the commits on top of the base that the submitter used, so the parent would also be different	06:27
	if you pull (merge) instead, then the commit hashes are preserved and you can cryptograhically guarantee no tampering happened	06:27
zalt	i assume in a certain point in the future i can bring the whole repo from the other pc and sync them somehow to make sure the two are synced :D	06:27
	← hofmann3900 left	06:27
thiago	signature is something on top, something that says that a given person stands by that particular commit hash	06:28
zalt	(iirc git supports pulling even from directories)	06:28
thiago	yes, you can	06:28
zalt	that's cool, thanks :D	06:28
	← rsrx left	06:29
	zalt will use git format-patch as his primary way of communicating changes around	06:29
zalt	i just need a script that applies them automatically sorted according to the patch numbers, i had to apply 5 manually :D	06:30
thiago	like you said, you can just directly pull from one machine's directory to the other	06:31
	git pull username@othermachine:/path/to/repo	06:31
	another not well known trick is to use bundles	06:31
	git bundle create will package a bunch of commits into a single file. To apply them... git pull	06:32
	→ hofmann3900 joined	06:32
	→ learningc joined	06:32
	← User_ left	06:35
	← thiago left	06:37
	← assemblyman left	06:39
	→ sQVe joined	06:43
	← Bobdude left	06:45
	← random_yanek left	06:45
	→ mat001 joined	06:50
	→ random_yanek joined	06:53
	← stitched_unicorn left	06:59
	← mat001 left	06:59
	→ lowbro joined	07:01
	→ theoceaniscool joined	07:02
	→ Noti joined	07:09
	← ferdna left	07:10
	→ sgen joined	07:11
	← spacesuitdiver left	07:12
	→ SuperKaramba joined	07:14
	→ mat001 joined	07:14
	← BenderRodriguez left	07:15
	→ yuriii joined	07:17
	← prakashdanish left	07:18
	← mat001 left	07:19
	← Noti left	07:22
	→ mat001 joined	07:28
	→ rsrx joined	07:29
	→ Makaveli7 joined	07:30
	← mat001 left	07:31
	→ User_ joined	07:32
	← learningc left	07:35
	← Goplat left	07:38
	← Dirak left	07:42
	← lightstalker left	07:43
	→ oxymoron93 joined	07:43
	→ dege joined	07:44
	→ lightstalker joined	07:45
	← Novae left	07:52
	→ Novae joined	07:52
	→ Silenced joined	07:56
	← ATON left	07:57
	→ zalt_ joined	07:59
	← lankanmon left	08:00
	→ causasui joined	08:00
	← cfoch left	08:00
	← renich left	08:01
	→ lankanmon joined	08:01
	← zalt left	08:02
	→ SkarmoutsosV joined	08:02
	→ mirazi_heket joined	08:03
	→ Noti joined	08:04
	← causasui left	08:04
	→ tarkus joined	08:05
mirazi_heket	hello, can you please help me configure visual studio code to push changes to gerrit (not bypassing review)? normally im using "git push origin HEAD:refs/for/master" for that AND i have also tested using "git config remote.origin.push HEAD:refs/for/master" and doing git push in vscode, but it does not go to review - what config command should i use so i could use git push from vscode?	08:09
	→ prakashdanish joined	08:09
	→ Kakky joined	08:09
	→ enoq joined	08:15
	← Mattiaslndstrm left	08:24
	→ Mattiaslndstrm joined	08:25
mirazi_heket	note that vscode does "git push origin master:master"	08:25
	→ gloomy joined	08:28
	→ pks_ joined	08:29
	← gloomy left	08:32
	← pks left	08:32
	pks_ → pks	08:32
	→ learningc joined	08:32
osse	mirazi_heket: if that's what vscode does then you must change it	08:34
	→ zalt__ joined	08:35
	← User_ left	08:35
	→ gloomy joined	08:36
	← zalt_ left	08:37
	→ dhanush joined	08:37
	← Mattiaslndstrm left	08:39
	→ Mattiaslndstrm joined	08:44
	← kadoban left	08:45
	→ cbreak joined	08:46
	← hussam left	08:46
	← Noti left	08:52
	← bashfulshell left	08:55
	← SlashLife left	08:58
	→ yyy- joined	09:03
mirazi_heket	anyone did that?	09:04
	→ pks_ joined	09:06
	→ floppydh joined	09:07
	← gdibass left	09:08
	← Mattiaslndstrm left	09:08
	← pks left	09:09
	pks_ → pks	09:09
	→ in1t3r joined	09:09
	← in1t3r_ left	09:10
	← in1t3r left	09:12
	→ in1t3r joined	09:12
	→ gthm joined	09:15
	→ nabil_ joined	09:20
	← SkarmoutsosV left	09:20
	← yyy- left	09:22
	← nabil__ left	09:23
	→ mohabaks joined	09:29
	← mohabaks left	09:31
	← rsrx left	09:31
	→ User__ joined	09:32
	← bachler left	09:32
	← learningc left	09:35
	→ basteh joined	09:37
	← kjartan left	09:38
	← crmne left	09:41
	→ crmne joined	09:41
	→ kjartan joined	09:43
	← sgen left	09:45
	→ sgen joined	09:45
	→ pks_ joined	09:48
	← pks left	09:50
	pks_ → pks	09:50
	→ learningc joined	09:54
	← User__ left	09:56
	← sgen left	09:58
	→ sgen joined	09:58
	→ mase-tech joined	10:06
	← dpyro left	10:09
	← mase-tech left	10:09
	→ mase-tech joined	10:10
	← Silenced left	10:11
	→ Noti joined	10:15
	→ Silenced joined	10:15
	← catsup left	10:17
	→ catsup joined	10:17
	← catsup left	10:18
	→ catsup joined	10:18
	→ yyy- joined	10:19
	→ sentriz joined	10:21
	→ pks_ joined	10:23
	← sQVe left	10:25
	→ Anticom joined	10:25
	→ sQVe joined	10:25
	← pks left	10:26
	pks_ → pks	10:26
	→ User__ joined	10:32
	← learningc left	10:35
mase-tech	hi	10:41
	→ cousteau joined	10:42
cousteau	Hi!	10:42
mase-tech	I have the number of a commit in my case 15991. I think I need the corresponding commit id to "jump" there. Because I need to "jump" there because I know that the source I want to compile is working.	10:44
cousteau	How hard is it to "annex" a project that is currently a Git submodule?	10:45
mase-tech	If I use git log it shows only the commit ID so I do not know which one is the right one	10:45
_ikke_	cousteau: git annex and git submodules have different purposes	10:45
	← in1t3r left	10:45
cousteau	Ah, I meant "annex" in a political way, didn't kniw it was a thing in git	10:46
	→ in1t3r joined	10:46
_ikke_	ah	10:46
	!subtree	10:46
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.	10:46
	→ OtakuSenpai joined	10:48
mase-tech	what did I wrong to don t get help ?	10:48
_ikke_	mase-tech: what do you mean with commit number?	10:50
cousteau	mase-tech: isn't the commit number just part of the commit hash?	10:50
_ikke_	Git does not support them, so there is no direct way to know what commit nummber corresponds with what commit hash	10:51
	← cdown left	10:52
mase-tech	_ikke if you look at https://github.com/FreeCAD/FreeCAD you will see 16,051 commit. I did call commit number = number of commits.	10:52
	cousteau, I do not know	10:53
_ikke_	mase-tech: that's not a unique way to number commits	10:53
mase-tech	I want to jump to commit number 15991	10:53
osse	mase-tech: where did you get the number 15991 from?	10:53
_ikke_	to reference commits I mean	10:53
mase-tech	because I know the source is working	10:53
cousteau	I mean if a commit hash is 135795200ba3d4ffe... its shortened form will be 1357952 and it will look like some sort of version number but it's actually a hex hash	10:53
	→ irqq joined	10:54
mase-tech	nice let me verify it	10:54
	→ bachler joined	10:54
mase-tech	so I need to put 15991 to hex and then look at git log	10:54
	then I can search for it	10:55
	← WhiskerBiscuit left	10:55
cousteau	Alternatively, it might be a tag with the version number	10:55
_ikke_	mase-tech: that number might already be hex	10:55
osse	mase-tech: where did you get that number from?	10:55
cousteau	_ikke_: do you recommend me to learn subtree in detail?	10:56
mase-tech	https://github.com/FreeCAD/FreeCAD	10:56
	the master is on 16051	10:56
	16051 commits	10:56
cousteau	mase-tech: yes I meant 15991 is either hex or a version number	10:56
mase-tech	either not	10:57
	→ pks_ joined	10:57
osse	why won't you answer me :(	10:57
mase-tech	15991 is the number of commit where i compiled the source	10:58
	osse, 16051 or 16991	10:58
	sorry typo	10:58
osse	the repo doesn't look very branch heavy, so you should be able to do git rev-list --count master	10:58
mase-tech	osse, 16051 or 15991	10:58
osse	and then git rev-list --count master~1000 or something. adjust the number until it's correct, and that's probably the commit you want	10:59
	so you can git checkout master~765 for example	10:59
cousteau	mase-tech: that's about as useful as saying the ad you were seeing when you downloaded the git	10:59
	It's just information about the whole project, not about a specific commit	10:59
	← lankanmon left	11:00
	← pks left	11:00
	pks_ → pks	11:00
osse	if you change to a tag in the github page the number changes	11:01
mase-tech	problem not solved I am looking plz wait	11:01
osse	so my guess is it's just rev-list --colunt	11:01
	count	11:01
cousteau	It says the number of commits there are... then again it seems to be only the ones on a certain branch so osse's solution might work	11:01
osse	i think that will get him pretty close	11:02
	doesn't appear to be a very "parallel history" so to speak	11:02
mase-tech	I think I have it	11:02
cousteau	If nothing else works, try using the date, and/or git bisect	11:02
mase-tech	the commit I want is 16051-15991	11:02
cousteau	Huh? So, like, 60?	11:03
mase-tech	yes, form there the commit it	11:03
cousteau	But yeah that sounds like a job for git bisect	11:04
mase-tech	so I need info about 60 commits befor master	11:05
cousteau	I'd clone the repo and use gitk or similar to visualize the tree	11:06
	← Makaveli7 left	11:07
	→ SkarmoutsosV joined	11:08
mase-tech	git log -60 --pretty="%H"	11:08
	b0d83f3c5e150362d1c95579068af41bde7d6640	11:08
	this should be the winner	11:09
osse	https://github.com/FreeCAD/FreeCAD/tree/b0d83f3c5e150362d1c95579068af41bde7d6640	11:10
	says 15992 there now	11:10
	One more!	11:10
mase-tech	but 16051-15991 =60	11:11
	ok	11:11
	than +1	11:11
	← enoq left	11:12
	→ AtumT joined	11:13
cousteau	If what you're looking for is which commit added/removed something, git bisect might be what you're after	11:13
osse	mase-tech: that git log lists 60 commits. so the last it lists is 59 before master	11:14
	master itself is the first it lists	11:14
	→ enoq joined	11:14
cousteau	It can let you pinpoint the commit where things broke in only 6 attempts instead of 60	11:14
mase-tech	ok make sense	11:14
	← in1t3r left	11:15
cousteau	(maybe more if merges are involved)	11:16
	→ in1t3r joined	11:16
mase-tech	git rev-list HEAD --count	11:18
	gives the actual commit number = 16051	11:19
	Is it possible to in commit id 10c745175f8a121b594ee6b0612cc487ebf43ba1 and get the cummitnumber	11:20
	← nabil_ left	11:22
	→ nabil_ joined	11:23
mase-tech	git rev-list 10c745175f8a121b594ee6b0612cc487ebf43ba1 --count	11:23
	this is the winner	11:23
	thanks for your all support, I am new at git and will need more support	11:24
	so thanks all <3	11:24
	→ cswl joined	11:25
	→ gareppa joined	11:28
	← mowcat left	11:31
	← gareppa left	11:31
	← in1t3r left	11:31
	→ pks_ joined	11:32
	→ learningc joined	11:32
	← pks left	11:33
	pks_ → pks	11:33
	→ in1t3r joined	11:33
	← User__ left	11:35
	→ paraxial joined	11:42
	← in1t3r left	11:43
	← TimWolla left	11:43
	→ lankanmon joined	11:46
	→ mescalinum joined	11:50
	→ TimWolla joined	11:53
	← learningc left	11:55
	← SkarmoutsosV left	11:55
	→ n3wborn joined	11:59
	← xcm left	12:00
	→ emsjessec joined	12:00
	→ Fernando-Basso joined	12:00
	→ cdown joined	12:01
	→ yonder joined	12:02
	→ tmm88 joined	12:03
	→ xcm joined	12:04
	← emsjessec left	12:04
	→ SkarmoutsosV joined	12:05
	→ SlashLife joined	12:07
	→ pks_ joined	12:08
	→ lucasb joined	12:08
	← pks left	12:11
	pks_ → pks	12:11
	← mona_x left	12:11
	← tarkus left	12:11
	→ emsjessec joined	12:17
	→ tarkus joined	12:19
	→ Essadon joined	12:21
	→ mowcat joined	12:21
	← Essadon left	12:21
	← emsjessec left	12:22
	→ Essadon joined	12:22
	← tmm88 left	12:22
	→ emsjessec joined	12:22
	→ estodiMania joined	12:24
	← emsjessec left	12:26
	← dustinm left	12:26
	→ dustinm joined	12:28
	→ emsjessec joined	12:29
	→ goTAN joined	12:29
	← estodiMania left	12:29
	→ estodiMania joined	12:30
	← gloomy left	12:30
	← estodiMania left	12:30
	→ estodiMania joined	12:31
mase-tech	I checkout to older commit	12:32
	← sQVe left	12:33
mase-tech	I search the command for the current commit id I am working with	12:33
	← emsjessec left	12:33
j416	commits don't have commit numbers	12:34
	you can have two commits made at the same time in parallel with an equal number of commits before them	12:35
	→ rick8024 joined	12:35
	← KnoP left	12:37
	rick8024 → KnoP	12:37
	← hofmann3900 left	12:39
	← tarkus left	12:40
	← estodiMania left	12:43
	→ zalt joined	12:44
	← SkarmoutsosV left	12:46
	← zalt__ left	12:46
	→ pks_ joined	12:46
	→ Makaveli7 joined	12:47
	→ estodiMania joined	12:48
	→ MrMojit0 joined	12:48
	← pks left	12:49
	pks_ → pks	12:49
	← estodiMania left	12:49
	← MrMojit0 left	12:53
	→ Xatenev joined	12:56
Xatenev	hi	12:56
	← michael_mbp left	12:56
Xatenev	what might be the cause that git shows a file modified if it isnt?	12:56
	i compared via git show HEAD:myfile\|md5sum	12:56
	md5sum myfile	12:56
	its equivalent	12:56
osse	well what does git diff say?	12:57
_ikke_	Xatenev: Line ending normalization?	12:57
Xatenev	all lines modified	12:57
osse	then that's it	12:57
Xatenev	i tried to set filemode and line endings	12:57
_ikke_	what does git ls-files --eol <filename> say?	12:57
	← mase-tech left	12:58
	→ Mattiaslndstrm joined	12:59
Xatenev	i/crlf w/crlf attr/text eol=lf	13:01
	sorry for late response	13:01
	_ikke_, osse ^	13:01
osse	Xatenev: that explains it.	13:01
Xatenev	can you explain for me?	13:01
	i /crlf and w/crlf sounds weird as im under linux	13:01
	but im not sure how to itnerpret the output	13:01
	interpret	13:01
	→ chele joined	13:01
osse	it's checked in as crlf, but you've explicitly said the file is supposed to be lf	13:01
Xatenev	via some config you mean?	13:02
	whjat does /i and w/ stand for?	13:02
oxymoron93	in search through triggers, for good articles to read about line endings I found this :D !use_lf (not related to the issue)	13:02
gitinfo	To eliminate all issues with line-endings in a repo it is recommended to change all files to use LF, and then convince all contributors to use LF-aware editors (Notepad++ works well for Windows), by force if necessary. !crlf has some tips if this is not feasible.	13:02
osse	Xatenev: Index and Working tree	13:02
Xatenev	ah	13:02
	makes sense	13:02
	thank oyu	13:02
osse	basically what you should do is commit the change	13:02
_ikke_	git add --renormalize <file>	13:02
osse	either that or change your .gitattributes file	13:02
_ikke_	with line ending normalization, the index should contain LF, not CRLF	13:03
Xatenev	_ikke_, thank you!	13:04
	← prakashdanish left	13:06
Xatenev	_ikke_, osse how can i configure MY line ending to be crlf?	13:07
osse	Xatenev: change the .giattributes file	13:07
_ikke_	Xatenev: don't put eol=lf in gitattributes	13:07
	→ CodeSlingerPaul joined	13:07
_ikke_	that forces everyone to use the same line endings	13:07
	→ michael_mbp joined	13:08
	→ tarkus joined	13:08
Xatenev	thank you	13:10
	← treehug88 left	13:12
	→ treehug88 joined	13:13
Xatenev	osse, "working tree" is basically remote right?	13:13
_ikke_	no	13:14
	← Mattiaslndstrm left	13:14
_ikke_	Those are your local files you are working on	13:14
Xatenev	oh	13:14
	so the remote is on the right?	13:14
	in the output?	13:14
	or what is rmeote	13:14
	remote	13:14
osse	remotes are irrelevant here	13:15
Xatenev	in the output of git ls--files	13:15
_ikke_	what osse said	13:15
Xatenev	yea then i have no idea how to interpet the output	13:15
	lmao	13:15
osse	"i/crlf": in the index (in git's db, if you will. checked in) the file has crlf endings	13:16
Xatenev	yes	13:16
osse	"w/crlf": the actual physical file on disk has crlf endings	13:16
Xatenev	"checked in" === remote to me	13:16
	i dont know what checked in means otherwise	13:16
_ikke_	Xatenev: git is distributed	13:16
osse	Think of it as "unmodified"	13:16
_ikke_	Xatenev: It can work completely without any remote	13:16
Xatenev	yes	13:16
osse	Xatenev: as the file is in the current commit	13:16
Xatenev	yeah thats what i meant with remote	13:16
	the HEAD basically	13:16
_ikke_	Ok, that's not what git calls remote	13:17
Xatenev	ok i got it then	13:17
_ikke_	if you run git commit, that's a local operation	13:17
osse	and finally "attr/text eol=lf" means that git is configured to convert the file to LF on checkout	13:18
Xatenev	_ikke_, yeah i know that :P	13:18
	osse, understood	13:18
osse	and that's why git says it's modified	13:19
	because it is	13:19
	git modified it, the silly thiong	13:19
Xatenev	yeah its just a bit weird, a friend of mine had this issue and he just cloned it again	13:19
osse	or something, I dunno. it's confusing as hell	13:19
Xatenev	and now it seems to work just fine and git ls--files --eol now says i/lf	13:19
	i dont see how this is possible without anyone having pushed a change, no?	13:19
	I mean the files can't just magically change their line endings	13:20
osse	git can change them, your editor can change them.	13:20
Xatenev	yeah but the statement was ntohing has changed	13:20
	no editor settings, no gitattributes settings or config	13:20
	→ OtakuSen1ai joined	13:20
Xatenev	but i dont think thats possible, whatever	13:20
	thanks for the help	13:20
	← n3wborn left	13:21
	OtakuSen1ai → dx_ob	13:21
osse	Xatenev: git check-attr -- path/to/file	13:22
_ikke_	Xatenev: _something_ did change :)	13:22
osse	Xatenev: git check-attr -a -- path/to/file	13:22
Xatenev	_ikke_, ikr	13:22
	→ kneeki joined	13:23
	← parsnip left	13:23
osse	what does that command print?	13:24
	hmm, i was hoping check-attr could tell what file it came from	13:26
	→ Silenced_v2 joined	13:27
	← Silenced left	13:28
Xatenev	my friend is gone it seems	13:28
	lol	13:28
	← cousteau left	13:29
	→ pks_ joined	13:32
	→ Forlorn_ joined	13:32
	← pks left	13:34
	pks_ → pks	13:34
	← Forlorn_ left	13:38
	→ learningc joined	13:43
	← Makaveli7 left	13:43
	← R2robot left	13:44
	→ User__ joined	13:46
	← learningc left	13:50
	→ learningc joined	13:51
	→ R2robot joined	13:53
	← v01d4lph4 left	13:53
	← User__ left	13:54
	→ boombatower joined	13:54
	→ User__ joined	13:55
	→ bashfulshell joined	13:56
	→ horribleprogram joined	13:57
	← learningc left	13:59
	→ in1t3r joined	13:59
	← swalladge left	14:00
	← User__ left	14:00
	→ learningc joined	14:00
	← dviola left	14:02
	← OtakuSenpai left	14:06
	→ User__ joined	14:08
	← TrentonDAdams left	14:09
	← kjartan left	14:10
	→ OtakuSenpai joined	14:10
	← learningc left	14:11
	← mirazi_heket left	14:12
	→ prakashdanish joined	14:12
	→ howell joined	14:13
	← User__ left	14:14
	← enoq left	14:15
	→ kjartan joined	14:15
	→ emsjessec joined	14:16
	→ Nawab joined	14:16
	← Nawab left	14:17
	← OtakuSenpai left	14:18
	→ Achylles joined	14:22
	← thomasross left	14:23
	→ thomasross_ joined	14:23
	thomasross_ → thomasross	14:23
	← zalt left	14:28
	← horribleprogram left	14:28
	← qsx left	14:28
	→ zalt joined	14:28
	← zalt left	14:29
	→ zalt joined	14:29
	← zalt left	14:30
	→ qsx joined	14:30
	→ zalt joined	14:30
	→ Makaveli7 joined	14:35
	← mowcat left	14:35
	→ SpeakerToMeat joined	14:36
	→ inkbottle joined	14:37
	→ bluezone joined	14:40
	→ learningc joined	14:41
	→ User__ joined	14:46
	← jkt left	14:47
	← zalt left	14:48
	← mescalinum left	14:48
	← learningc left	14:50
	← tsdh left	14:51
	→ learningc joined	14:52
	→ stkirk joined	14:54
	← User__ left	14:55
	→ Darcidride joined	14:55
	→ renich joined	14:56
	→ Inline joined	14:57
	→ YuGiOhJCJ joined	14:58
	→ lacrymology joined	14:59
	→ horribleprogram joined	15:00
	→ User__ joined	15:03
	← learningc left	15:07
	→ learningc joined	15:07
	→ Keytap joined	15:08
	← niko left	15:08
	← User__ left	15:10
	→ czart joined	15:12
	← floppydh left	15:12
	← lowbro left	15:12
	→ bast3h joined	15:12
	← basteh left	15:16
	← renich left	15:21
Luyin	I have a patch created by running "git diff > foo.patch". I now want to compare this patch with the current HEAD. is there an easy way to do that? something like "git diff < foo.patch"?	15:23
	adder` → adder	15:26
	← McBride36 left	15:27
	→ Mattiaslndstrm joined	15:28
	← kini left	15:29
	← Darcidride left	15:29
	← prakashdanish left	15:30
	horribleprogram → Guest24432	15:30
	← Guest24432 left	15:32
	← nikivi left	15:33
_ikke_	Luyin: What diff exactly do you want to see?	15:33
	Can't you just apply the patch and then diff that?	15:33
	(a patch is already a diff)	15:33
	→ prakashdanish joined	15:34
	→ nikivi joined	15:34
Luyin	_ikke_: no, my working tree is dirty	15:35
_ikke_	Then my question remains, what is it that you expect to see?	15:35
Luyin	the differences between the changes in that patch against what my working directory contains	15:36
	→ manuelschneid3r joined	15:36
theoceaniscool	Luyin, Isn't that, you know, the patch itself?	15:36
Luyin	no, I'm not sure of that	15:37
_ikke_	The patch itself is a diff between that commit and it's parent	15:37
	→ renich joined	15:38
osse	Luyin: Generate a different patch for yourself by the same method and diff the two patches.	15:38
_ikke_	Luyin: Don't you want to see the diff between that commit and the working tree (rather than the diff of that comit)?	15:38
bremner	Luyin: stash your dirty tree, apply the patch on a new branch, change back, pop the stash, then diff	15:38
	or, as _ikke_ says, use interdiff	15:39
	→ kini joined	15:39
	← oxymoron93 left	15:39
Luyin	hmmm. ok maybe a bit more context helps: I made some changes in my "IDE" (it's not an IDE, it's a project GUI, but it writes a text file which is tracked by git), but it crashed before I could save. now I have something I've already added to the index, and something that I lost. I created the patch somewhere in between, but I can't be sure when. So I don't know what exactly it contains - only what's already	15:40
	staged, or more than that. I'm hoping for more, because that would enable me to get back some work I lost when the GUI crashed.	15:40
	← benjwadams left	15:41
	← renich left	15:43
	← prakashdanish left	15:46
	→ thiago joined	15:48
	→ gableroux joined	15:50
	← gableroux left	15:50
	→ assemblyman joined	15:50
	→ SkarmoutsosV joined	15:51
	→ OtakuSenpai joined	15:52
	→ spacesuitdiver joined	15:56
	→ prakashdanish joined	15:56
	← Xatenev left	15:58
	← logithack left	16:01
	→ logithack joined	16:04
	← tarkus left	16:05
	→ mescalinum joined	16:06
	← kent\n left	16:08
	← mescalinum left	16:08
	← igemnace left	16:09
	→ noonien joined	16:09
	→ kent\n joined	16:09
	← SkarmoutsosV left	16:14
	→ oojacoboo joined	16:15
	→ mescalinum joined	16:19
	→ orbyt_ joined	16:19
	→ nic-hartley joined	16:19
	→ tang^ joined	16:20
	→ Nawab joined	16:23
	← OtakuSenpai left	16:25
	← Rovanion left	16:27
	← learningc left	16:29
	→ dpyro joined	16:29
	← Kakky left	16:30
	→ cousteau joined	16:31
	← nic-hartley left	16:33
	→ nic-hartley joined	16:33
	→ Envil joined	16:33
	← nic-hartley left	16:34
	← mescalinum left	16:34
	← prakashdanish left	16:35
cousteau	OK so I'm using git subtree (is this part of git, or a third-party addition?) but I cannot use it directly because of a couple of conflicts (specifically, I need to remove a placeholder .gitignore and also I want to remove the submodule I'm about to add as a subtree)	16:35
	But I cannot just do that without committing, or else ˋgit subtree addˋ complains	16:36
	But if I commit -- oh no! -- there'll be an extra commit in the history I'd rather just avoid having	16:37
	is there a way to git subtree add --amend (to squash the git-subtree commit with the previous one), or git subtree add --force / --add (to remove the need for an extra commit)?	16:38
	← wyre left	16:38
	→ wyre joined	16:41
	→ tmm88 joined	16:41
	→ Rovanion joined	16:41
	← spacesuitdiver left	16:43
	→ spacesuitdiver joined	16:43
	→ learningc joined	16:45
	→ jungsubk joined	16:46
	← chele left	16:46
	→ mescalinum joined	16:46
	← Mattiaslndstrm left	16:47
	← wyre left	16:47
	← thiago left	16:48
cousteau	meh, I guess I'll make one of those "commit loops" I make to group multiple commits together and just go with that	16:49
	← tmm88 left	16:49
cousteau	(basically I force a --no-ff so that the git tree has a weird "loop" on it which allows me to visually group multiple commits together)	16:49
	→ __rohit joined	16:50
	← orbyt_ left	16:50
	→ tarkus joined	16:53
	→ renich joined	16:53
	← BlessJah left	16:53
	← cdown left	16:53
	→ kezimo joined	16:54
	→ swalladge joined	16:54
	→ igemnace joined	16:54
	→ BlessJah joined	16:54
_ikke_	cousteau: there are two parts, the subtree merge strategy, which is built-in, and a third-party tool to provide a workflow around them	16:57
	→ edd_lc joined	17:00
bremner	at least debian and derivatives ship it as part of the git core	17:01
	shrug	17:01
edd_lc	if i want to git push the current local branch to a new remote branch, should i do `git push origin HEAD:newbranch`?	17:01
	← __rohit left	17:01
	→ __rohit joined	17:02
	APK → AKPWD	17:06
	→ Dirak joined	17:07
	← Nawab left	17:07
	→ wyre joined	17:08
	← jungsubk left	17:12
	← alyptik left	17:13
cousteau	bremner: don't look at me Marge, I'm using Windows	17:13
bremner	condolences	17:13
	cousteau gets whipped by cr-lf line endings	17:14
cousteau	bremner: it forges a character	17:16
	but hey, at least this git thing provides a bash console	17:17
	→ matsaman joined	17:17
	← kapil____ left	17:21
	→ CCDelivery joined	17:23
	→ vavkamil joined	17:25
sparr	j416: I've discovered that ~/.gitconfig overrides ~/.config/git/config so I'm going to recommend people clone/link the dotfiles config to the latter and put their personal overrides in the former, which will also play nice with `git config --global`	17:25
	← czart left	17:25
	→ orbyt_ joined	17:32
	→ akushner joined	17:32
	← __rohit left	17:33
	← nikivi left	17:36
	← orbyt_ left	17:36
	→ nikivi joined	17:36
	→ thiago joined	17:38
	← igemnace left	17:39
	→ mat001 joined	17:39
	→ jungsubk joined	17:41
	→ prakashdanish joined	17:41
	→ cd joined	17:42
	← goTAN left	17:47
	← cousteau left	17:47
	→ orbyt_ joined	17:47
	→ causasui joined	17:48
j416	¯\_(ツ)_/¯	17:48
	sparr: you know my view on it. :)	17:48
	← Anticom left	17:49
	← irqq left	17:50
	→ Mattiaslndstrm joined	17:50
	← Mattiaslndstrm left	17:52
	← tarkus left	17:53
	← prakashdanish left	17:53
	→ mstrommenHD joined	17:55
	→ prakashdanish joined	17:58
	← cbreak left	17:58
	→ cbreak joined	17:59
	→ n3wborn joined	18:01
	→ Mattiaslndstrm joined	18:01
	← akushner left	18:01
	→ akushner joined	18:03
	← renich left	18:04
	← akushner left	18:04
	← zampano left	18:04
	← learningc left	18:05
	← Dirak left	18:06
	→ akushner joined	18:09
	← Keytap left	18:10
	← akushner left	18:11
	→ sat-aton joined	18:13
	← Envil left	18:14
	→ envil_ joined	18:14
	← satifant left	18:15
	← mat001 left	18:15
	← shabius left	18:16
	→ learningc joined	18:17
	→ mat001 joined	18:17
	→ alyptik joined	18:18
	→ Dirak joined	18:21
	→ millerti joined	18:21
	→ vejetaryenvampir joined	18:22
	← kjartan left	18:23
vejetaryenvampir	I use ST (Suckless/Simple Terminal) and I can't use ctrl+h backspace in git prompt. Do you geeks know how to fix it?	18:23
	→ akushner joined	18:23
	→ OtakuSenpai joined	18:23
vejetaryenvampir	I cant' use ctrl+h to backspace*	18:24
	← jungsubk left	18:24
	← bashfulshell left	18:26
	← akushner left	18:26
	→ kapil____ joined	18:26
	→ kjartan joined	18:28
	← prakashdanish left	18:29
	← OtakuSenpai left	18:29
	→ Keytap joined	18:35
	← daurnimator left	18:35
sparr	vejetaryenvampir: git prompt?	18:35
vejetaryenvampir	I mean promt like thing that require your password for private repos.	18:36
	prompt*	18:36
	→ shabius joined	18:36
	← edd_lc left	18:38
	← learningc left	18:38
	← manuelschneid3r left	18:39
_ikke_	vejetaryenvampir: username/password prompt	18:39
vejetaryenvampir	Yeah.	18:39
_ikke_	no clue myself	18:40
	→ kadoban joined	18:40
	→ renich joined	18:41
	→ daurnimator joined	18:41
sparr	when you press it does anything or nothing happen?	18:43
	← renich left	18:43
sparr	possibly relevant: https://stackoverflow.com/questions/37094553/git-add-p-doesnt-work-with-ctrlh	18:43
	→ renich joined	18:44
	← yyy- left	18:47
vejetaryenvampir	Yeah, just printing ^H	18:49
	→ akushner joined	18:53
	→ nic-hartley joined	18:54
	→ nowhereman joined	19:00
causasui	is there a recognized best practice for making merge conflict resolution easier? e.g. i wish I could use my difftool	19:03
	→ Sasazuka joined	19:03
	→ SkarmoutsosV joined	19:04
osse	causasui: You can	19:05
	git mergetool --tool-help	19:05
	← Dirak left	19:05
causasui	mind blown	19:06
osse	By default it will try to use your configured difftool if no mergetool is configured	19:06
	← CCDelivery left	19:07
	→ gloomy joined	19:07
causasui	omfg	19:08
	this is better than when I learned about add -p	19:08
	how have I lived without this	19:08
	→ veegee joined	19:11
	← Mattiaslndstrm left	19:12
	→ irqq joined	19:13
	← irqq left	19:14
	→ irqq joined	19:14
	← irqq left	19:15
	← tang^ left	19:17
	→ yyy- joined	19:17
	→ cfoch joined	19:18
	→ chaosruler_ joined	19:19
	→ hussam joined	19:19
	← Globe_Bloater8 left	19:20
	← d^sh left	19:22
	→ d^sh joined	19:23
	← orbyt_ left	19:24
	← chaosruler_ left	19:25
	← mescalinum left	19:25
	→ chaosruler_ joined	19:25
	→ MrMojit0 joined	19:26
	→ orbyt_ joined	19:27
	→ Mattiaslndstrm joined	19:28
	→ mescalinum joined	19:32
	← akushner left	19:32
	→ m0viefreak joined	19:35
	→ Dirak joined	19:37
	→ bashfulshell joined	19:38
	← Silenced_v2 left	19:46
	← lacrymology left	19:47
	→ manuelschneid3r joined	19:48
	← daurnimator left	19:54
	← hydrajump left	19:59
	→ daurnimator joined	20:02
	→ mowcat joined	20:03
	← orbyt_ left	20:03
	← mstrommenHD left	20:03
	→ akushner joined	20:07
	→ tang^ joined	20:07
	→ orbyt_ joined	20:09
	← matsaman left	20:10
	← gloomy left	20:11
	→ WhiskerBiscuit joined	20:13
	← daurnimator left	20:15
	← orbyt_ left	20:15
	← mescalinum left	20:23
	→ gloomy joined	20:30
	← envil_ left	20:31
	→ Phylock joined	20:31
	← emsjessec left	20:35
	← Fernando-Basso left	20:37
	← Mattiaslndstrm left	20:38
	← assemblyman left	20:38
	→ daurnimator joined	20:41
	← kapil____ left	20:44
	← Achylles left	20:47
	→ orbyt_ joined	20:48
	← orbyt_ left	20:48
	→ lacrymology joined	20:50
	→ cdown joined	20:50
	← cswl left	20:51
	→ xrexeon joined	21:09
	← nic-hartley left	21:11
	← WhiskerBiscuit left	21:12
	← chaosruler_ left	21:13
	← MrMojit0 left	21:15
	← lucasb left	21:28
	← SkarmoutsosV left	21:33
	→ __Myst__ joined	21:34
__Myst__	Hi. Performance of `git status` is slow	21:34
	It takes ~100ms to complete even when not in a git directory at all.	21:34
	I am running Ubuntu WSL	21:34
kadoban	__Myst__: AFAIK WSL is known for pretty poor filesystem performance. Maybe it's just that?	21:35
GreenJello	programs usually need to specifically optimize for WSL, and git might not be either successful or trying yet	21:37
	→ barteks2x joined	21:37
__Myst__	hmm	21:37
	disabling windows defender realtime protection makes it take 11ms	21:37
	i guess i should've tried that first	21:37
kadoban	That's a long time for a virus scanner, oof.	21:37
__Myst__	still, why does window defender multiply by 10x?	21:37
barteks2x	Is there some quick way to remove a file from specific commit? I already have a few (unpublished) commits on top of it and accidentally commited file I didn't want in the first one	21:37
GreenJello	barteks2x, you have to do an interactive rebase and modify the commit	21:38
kadoban	I guess it's git trying to read a bunch of .git/ that don't exist through a few parent levels?	21:38
	Maybe you could set the thing where it doesn't go too far up the tree looking for .git/ or something	21:38
barteks2x	it gives me option to do git commit --amend then	21:38
	but I have no idea how would I them remove the file without actually deleting it	21:38
GreenJello	I think you `git reset to-remove.txt`, and then do the amend	21:39
	→ jstimm joined	21:39
barteks2x	but at the point I start git rebase -i, it's already commited...	21:39
	so reset will just reset it to the already commited state	21:39
GreenJello	oh, right	21:39
	try: git rm --cached to-remove.txt	21:40
kadoban	filter-branch with uhm index-filter and 'git rm --cached' maybe?	21:40
GreenJello	of course, you should back up the file if you don't want to accidentally remove it	21:40
barteks2x	that seems to work	21:41
	(rm --cached)	21:41
	also I never understood how index-filter works	21:41
	← gloomy left	21:41
barteks2x	one of the few git commands that I would find useful, but don't understand them	21:42
__Myst__	Update: MalwareBytes was my antivirus service provider	21:44
	apparently disinstalling it and using straight-up defender makes it go as fast as if i have nothing at all	21:44
	(insert flanders)	21:45
kadoban	barteks2x: You understand filter-branch --tree-filter ?	21:45
barteks2x	no, as I said, one of the few parts of git I see people use but don't understand	21:45
kadoban	Oh. Well it just rewrites every commit. It's the same as going through every commit in order (oldest first) and running some command in each	21:46
	So you can remove files, rename stuff, add stuff, do fun sed stuff	21:46
	--index-filter is the same thing except you can't actually work on the files, you can only tell git to do stuff. It's just an optimization over --tree-filter (it doesn't checkout the files)	21:47
	The usual example is if you want to delete a file from history, usually one with like a secret API key in it that you commited by accident. Which would be: git filter-branch --tree-filter --all 'rm secret.txt'	21:51
	← alyptik left	21:57
	→ hofmann3900 joined	21:58
	← Cabanossi left	22:03
	← n3wborn left	22:04
	→ shakalaka joined	22:07
	yyy- → yyy	22:10
	→ scarcry joined	22:10
	→ alyptik joined	22:10
	← nabil_ left	22:11
	→ nabil_ joined	22:12
	← nabil_ left	22:12
	→ Cabanossi joined	22:12
	← Makaveli7 left	22:12
	→ nabil_ joined	22:12
	← mat001 left	22:12
	→ mat001 joined	22:13
	← nabil_ left	22:13
	→ justanotherbody joined	22:13
	→ nabil_ joined	22:13
justanotherbody	if i do `git rebase --interactive VALID_HASH`, keep "pick" on all the commits, and then proceed is it unexpected that i get a conflict?	22:14
	the conflict happens on a commit with CRLF issues (non-CR file effectively replaced with CRLF endings) and i'm on a linux box, so maybe that's the cause?	22:17
	← nabil_ left	22:17
	→ nic-hartley joined	22:17
	← duderonomy left	22:17
	→ nabil_ joined	22:17
	← mowcat left	22:18
	← akushner left	22:19
	← AtumT left	22:21
	← Noti left	22:21
	← xrexeon left	22:22
	← Phylock left	22:27
	← thiago left	22:33
	← kjartan left	22:35
	→ greatgatsby joined	22:36
	← howell left	22:36
	← __Myst__ left	22:40
	→ kjartan joined	22:40
	← CodeSlingerPaul left	22:46
	→ thiago joined	22:47
	← dege left	22:49
	← nabil_ left	22:49
	→ nabil joined	22:50
	← johnny56_ left	22:56
	← sgen left	22:58
	← tang^ left	23:00
	← mra90 left	23:02
	← Keytap left	23:07
	→ Keytap joined	23:08
	→ johnny56_ joined	23:11
	→ Bobdude joined	23:12
	← Keytap left	23:13
	← theoceaniscool left	23:16
	→ CodeSlingerPaul joined	23:24
	← greatgatsby left	23:29
	→ assemblyman joined	23:30
	→ duderonomy joined	23:34
	← spacesuitdiver left	23:34
	← Dirak left	23:35
	← nic-hartley left	23:36
	→ Keytap joined	23:41
	→ Dirak joined	23:43
	← thiago left	23:48
	→ sgen joined	23:50
	← snits left	23:55
	← alyptik left	23:55

Logs Search ←Prev date Next date→

Channels Documentation