IRCloggy #git 2021-04-13

Provider of IRC logs since 2005.

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

	2021-04-13
	← florekm__ left	00:00
	← fission6 left	00:01
	→ florekm__ joined	00:01
	← jesseTree left	00:03
	← florekm left	00:04
	← fax left	00:08
	→ ikwyl6 joined	00:09
	→ jesseTree joined	00:10
	← tiin57 left	00:10
	← thebope left	00:11
	→ jaziz1 joined	00:11
	→ thebope joined	00:11
	← calcul0n_ left	00:12
	→ tiin57 joined	00:14
	← stats464_ left	00:14
	→ stats4647 joined	00:14
	→ florekm joined	00:14
	← nsc_ left	00:15
	← hexa- left	00:16
	← thebope left	00:16
	→ sinhue joined	00:16
shailangsa	does anybody know if it's possible to search a git repo using a regular expression?	00:16
tang^	!git-grep maybe?	00:17
	bah... try man git-grep	00:17
gitinfo	the git-grep manpage is available at https://gitirc.eu/git-grep.html	00:17
	← florekm__ left	00:17
shailangsa	how about github?	00:18
tang^	you'd have to ask in #github about that	00:18
	→ hexa- joined	00:19
	← florekm left	00:19
	← ephemer0l left	00:21
	→ fission6 joined	00:28
	← mobidrop left	00:28
	→ florekm joined	00:30
	→ mobidrop joined	00:31
	→ florekm__ joined	00:32
	← duderonomy left	00:32
	← sinhue left	00:33
	← florekm left	00:35
	→ vicfred joined	00:38
	← vicfred left	00:40
	← tiin57 left	00:40
	→ thebope joined	00:41
	← FFY00_ left	00:42
	→ FFY00_ joined	00:43
	→ tiin57 joined	00:44
	← thebope left	00:46
	→ florekm joined	00:46
	→ vicfred joined	00:47
	← florekm__ left	00:49
	→ florekm__ joined	00:50
	← florekm left	00:53
	← ikwyl6 left	00:55
	→ florekm joined	00:56
	← florekm__ left	01:00
	→ thebope joined	01:00
	→ florekm__ joined	01:00
	← florekm left	01:03
	→ sinhue joined	01:03
	→ DevAntoi_ joined	01:05
	← jesseTree left	01:05
	← thebope left	01:05
	→ ikwyl6 joined	01:06
	← florekm__ left	01:06
	← DevAntoine left	01:06
	← computeiro left	01:08
	→ Codaraxis_ joined	01:08
	← crose left	01:09
	← krofe left	01:09
	← tiin57 left	01:11
	← shush left	01:12
	← Codaraxis__ left	01:13
	→ shush joined	01:13
	→ florekm joined	01:14
	→ tiin57 joined	01:14
	→ ephemer0l joined	01:17
	← sinhue left	01:17
	← tang^ left	01:18
	← shush left	01:18
	→ florekm__ joined	01:21
	→ ferdna joined	01:21
	← florekm left	01:24
	← krkini left	01:25
	← mud left	01:26
	→ kini joined	01:26
	→ Benzi-Junior joined	01:28
	→ florekm joined	01:28
	← florekm__ left	01:31
	← hanneso left	01:32
	→ stats464_ joined	01:32
	→ mud joined	01:33
	→ APic joined	01:33
	← stats4647 left	01:35
	→ thebope joined	01:35
	← ferdna left	01:35
	→ florekm__ joined	01:39
	← tiin57 left	01:40
	→ sinhue joined	01:41
	← florekm left	01:41
	← florekm__ left	01:44
	→ shush joined	01:44
	→ tiin57 joined	01:44
	← gearnode left	01:44
	← fission6 left	01:45
	← PJBoy left	01:48
	→ drbean_ joined	01:50
	← zebrag left	01:52
	→ zebrag joined	01:52
	← ikwyl6 left	01:52
	← thebope left	01:53
	→ florekm joined	01:53
	→ florekm__ joined	01:56
	← sinhue left	01:57
	→ sinhue joined	01:58
	← florekm left	01:59
	← shush left	02:00
	→ shush joined	02:00
	← florekm__ left	02:01
	← raven-au left	02:03
	← arcatech left	02:04
	→ hanneso joined	02:04
	← lawid left	02:05
	← tiin57 left	02:10
	→ raven-au joined	02:11
	→ lawid joined	02:11
	→ florekm joined	02:11
	→ ikwyl6 joined	02:12
	→ florekm__ joined	02:12
	← sinhue left	02:14
	→ tiin57 joined	02:14
	→ grimpeux joined	02:15
	← florekm left	02:16
	← lawid left	02:16
	→ thebope joined	02:16
	→ duderonomy joined	02:21
	← grimpeux left	02:25
	→ florekm joined	02:26
	→ jesseTree joined	02:27
	← causasui left	02:29
	← florekm__ left	02:29
	→ sinhue joined	02:29
	← florekm left	02:32
	← wgrant left	02:34
	← jesseTree left	02:34
	→ wgrant joined	02:34
	← random_yanek left	02:36
	← CryptoClub left	02:36
	→ Goplat joined	02:37
	→ CryptoClub joined	02:40
	→ florekm joined	02:40
	← tiin57 left	02:41
	← DevAntoi_ left	02:41
	→ random_yanek joined	02:41
	→ DevAntoine joined	02:42
	→ florekm__ joined	02:43
	← sinhue left	02:43
	→ tiin57 joined	02:44
	→ Xenguy joined	02:44
	← florekm left	02:46
	→ z8z joined	02:47
	← devslash left	02:48
	→ FinnElija joined	02:51
	finn_elija → Guest41868	02:51
	FinnElija → finn_elija	02:51
	← cbreak left	02:53
	← mindCrime left	02:54
	← Guest41868 left	02:55
	→ cbreak joined	02:55
	→ ferdna joined	02:57
	→ florekm joined	02:58
	← xlei left	02:58
	← howdoi left	02:58
	← AlpineLlama left	03:00
	→ sinhue joined	03:00
	← florekm__ left	03:00
	→ AlpineLlama joined	03:01
	← florekm left	03:03
	← mowcat left	03:04
	→ nsc joined	03:04
	← CodeSlingerPaul left	03:06
	← blahdodo left	03:08
	← justan0theruser left	03:08
	← tiin57 left	03:10
	→ Guest20 joined	03:12
	→ florekm joined	03:12
	← Guest20 left	03:13
	→ tiin57 joined	03:14
	→ Guest20_ joined	03:15
	← sinhue left	03:15
	→ florekm__ joined	03:18
	← thebope left	03:19
	→ justanotheruser joined	03:20
	← zebrag left	03:21
	← florekm left	03:22
	→ Muimi joined	03:24
	→ florekm joined	03:26
	← palooka_jock left	03:29
	← florekm__ left	03:30
	← haritz left	03:32
	→ haritz joined	03:32
	← haritz left	03:32
	→ haritz joined	03:32
	→ palooka-jock joined	03:32
	← ikwyl6 left	03:36
	← Guest20_ left	03:38
	← raven-au left	03:40
	→ florekm__ joined	03:40
	← tiin57 left	03:40
	→ raven-au joined	03:41
	→ sinhue joined	03:42
	→ ikwyl6 joined	03:43
	← florekm left	03:43
	→ tiin57 joined	03:44
	← florekm__ left	03:44
	← skered left	03:48
	→ blahdodo joined	03:49
	→ skered joined	03:49
	← fulsiram_ left	03:51
	← z8z left	03:51
	← kini left	03:52
	← Codaraxis_ left	03:52
	→ kini joined	03:53
	→ florekm joined	03:56
	→ xlei joined	03:57
	→ florekm__ joined	03:57
	← sinhue left	03:59
	← cd left	04:00
	← bdeshi left	04:00
	→ fulsiram_ joined	04:00
	← florekm left	04:01
	→ bdeshi joined	04:01
	← tejr left	04:02
	→ florekm joined	04:03
	→ tejr joined	04:03
	→ arcatech joined	04:04
	← ikwyl6 left	04:06
	← florekm__ left	04:06
	← arcatech left	04:06
	← tiin57 left	04:11
	← kiweun left	04:11
	→ ikwyl6 joined	04:11
	→ florekm__ joined	04:12
	→ jetchisel joined	04:13
	← OnkelBlade left	04:14
	→ tiin57 joined	04:14
	← florekm left	04:15
	→ OnkelBlade joined	04:15
	→ sinhue joined	04:15
	← florekm__ left	04:17
	← xissburg left	04:20
	← stats464_ left	04:21
	← hussam left	04:21
	→ stats4647 joined	04:22
	→ florekm joined	04:26
	← Xenguy left	04:27
	← sinhue left	04:29
	← Furai left	04:29
	→ toolbox joined	04:30
	→ florekm__ joined	04:31
	→ Wetmelon joined	04:34
	← ferdna left	04:34
	→ konsolebox joined	04:35
	← florekm left	04:35
	← tiin57 left	04:40
	→ florekm joined	04:41
	→ tiin57 joined	04:44
	← florekm__ left	04:44
	← thad_the_man left	04:47
	→ florekm__ joined	04:48
	→ Furai joined	04:49
	← florekm left	04:51
	→ florekm joined	04:55
	← florekm__ left	04:58
	← gast0n left	04:59
	→ Dotz0cat_ joined	05:00
	← stats4647 left	05:01
	← madewokherd left	05:01
	← fulsiram_ left	05:01
	← Dotz0cat left	05:02
	← snits left	05:03
	→ fulsiram_ joined	05:03
	→ ferdna joined	05:04
	→ florekm__ joined	05:06
	← thiago left	05:06
	→ snits joined	05:06
	→ krofe joined	05:07
	→ sinhue joined	05:08
	← florekm left	05:09
	→ florekm joined	05:10
	← tiin57 left	05:10
	← florekm__ left	05:11
	← ikwyl6 left	05:12
	← shush left	05:12
	← sinhue left	05:14
	→ tiin57 joined	05:14
	→ ikwyl6 joined	05:21
	→ mike11 joined	05:23
	→ florekm__ joined	05:24
	→ sinhue joined	05:25
mike11	hello all, a while ago, I learned about a git command that changes a commit contents, and makes the old hash somehow "refer" to the new modified commit. I don't remember the exact terminology, and I have been searching for this for a while and I couldn't find it.	05:27
	← florekm left	05:27
mike11	does my description ring a bell to any of you? or is my memory corrupted?	05:27
	← florekm__ left	05:28
	← ikwyl6 left	05:30
	→ stats4647 joined	05:31
ikke	mike11: (interactive) rebase?	05:32
mike11	not really, because this changes the hashes of the edited commits and all its descendants...	05:33
	iirc, after doing it, git log displayed the same old hash with a special message between brackets indicating that the commit is just a "reference" (I don't remember the exact word) to another commit...	05:34
ikke	man git replace	05:35
gitinfo	the git-replace manpage is available at https://gitirc.eu/git-replace.html	05:35
ikke	I guess	05:35
mike11	ahh, exactly, thank you very much!	05:35
	← veegee left	05:35
	→ Hounddog joined	05:36
	← edlou left	05:36
	← mike11 left	05:38
	← fulsiram_ left	05:38
	→ florekm joined	05:41
	← tiin57 left	05:41
	← ferdna left	05:41
	→ blue__penquin joined	05:41
	→ florekm__ joined	05:42
	← blue__penquin left	05:42
	→ ikwyl6 joined	05:43
	→ tiin57 joined	05:43
	← sinhue left	05:44
	← Furai left	05:44
	← sudoforge left	05:45
	← florekm left	05:45
ikke	cliluw: seems like a bug, I'm bisecting it	05:46
	→ Furai joined	05:46
	← APic left	05:47
	→ shush joined	05:47
	← skered left	05:49
	← stats4647 left	05:52
	← Furai left	05:54
	← AnAverageHuman left	05:54
	→ florekm joined	05:56
	→ Furai joined	05:57
	→ sinhue joined	05:58
	← florekm__ left	05:59
	→ fulsiram_ joined	06:00
	← florekm left	06:01
	→ florekm joined	06:09
	← tiin57 left	06:10
	→ florekm__ joined	06:11
	→ vorona joined	06:11
	← sinhue left	06:12
	→ kiweun joined	06:12
	← florekm left	06:13
	→ tiin57 joined	06:14
	← Wetmelon left	06:14
	→ florekm joined	06:15
	← Goplat left	06:16
	← kiweun left	06:17
	← florekm__ left	06:18
	← andy25225 left	06:18
	→ LetoThe2nd joined	06:21
	→ florekm__ joined	06:25
	→ APic joined	06:26
osse	TIL --output. Where's that documented?	06:26
	ah, in git log	06:26
	← florekm left	06:28
	← lemonade` left	06:28
	→ florekm joined	06:29
	→ andy25225 joined	06:31
	← florekm__ left	06:32
	→ xrisovalantis joined	06:35
	→ florekm__ joined	06:40
	← tiin57 left	06:40
	← Lord_of_Life left	06:41
	→ Lord_of_Life joined	06:42
	← florekm left	06:43
	→ tiin57 joined	06:44
	→ florekm joined	06:45
	← fulsiram_ left	06:46
	→ fulsiram_ joined	06:46
	← shush left	06:47
	→ sinhue joined	06:48
	← florekm__ left	06:48
	← CryptoClub left	06:50
	← florekm left	06:50
	← fulsiram_ left	06:51
	→ fulsiram_ joined	06:52
	→ CryptoClub joined	06:54
	← cbreak left	06:55
	→ cbreak joined	06:56
	← Betal left	06:57
	→ florekm joined	06:57
	← fulsiram_ left	06:59
	← sinhue left	07:00
	→ fulsiram_ joined	07:01
	← thebiffman left	07:01
	→ jimmiehansson joined	07:02
	← fulsiram_ left	07:03
	← unluckyshrubbery left	07:03
	→ fulsiram_ joined	07:04
	← durham_ left	07:06
	→ rcoote joined	07:08
	→ thebiffman joined	07:10
	← tiin57 left	07:11
	→ Haohmaru joined	07:12
	→ selckin joined	07:12
	→ noidea joined	07:13
	→ dqx_ joined	07:14
	→ rsx joined	07:14
	→ tiin57 joined	07:14
	← ikwyl6 left	07:15
	→ thebope joined	07:16
	→ florekm__ joined	07:16
	← Hounddog left	07:16
	← florekm left	07:19
	→ sord937 joined	07:19
	← thebope left	07:20
	→ ikwyl6 joined	07:22
	→ flying_sausages joined	07:23
	→ veegee joined	07:23
	→ theoceaniscool joined	07:29
	→ florekm joined	07:32
	→ accesspoint joined	07:33
	← accesspoint left	07:34
	← florekm__ left	07:36
	← led_belly left	07:36
	→ shush joined	07:37
	→ accesspoint joined	07:38
	→ Metalsutton joined	07:39
	→ bolovanos_ joined	07:40
	← tiin57 left	07:40
	→ KeyJoo joined	07:43
	← vorona left	07:43
	→ tiin57 joined	07:44
	→ gearnode joined	07:48
	→ stats4647 joined	07:50
	← accesspoint left	07:51
	← kristijonas left	07:52
	→ florekm__ joined	07:55
	← wrobinson_ left	07:58
	← florekm left	07:59
	→ wrobinson joined	08:00
	← DevAntoine left	08:00
	→ amahl joined	08:01
	→ DevAntoine joined	08:01
	← sord937 left	08:02
	→ pncl joined	08:06
	→ pncl_ joined	08:06
	← pncl left	08:06
	← pncl_ left	08:06
	← thomas_25 left	08:09
	← archpc- left	08:09
	→ thomas_25 joined	08:10
	← tiin57 left	08:10
	→ archpc joined	08:11
	→ tolot joined	08:11
	← ikwyl6 left	08:12
	→ chele joined	08:13
	→ kiweun joined	08:13
	→ tiin57 joined	08:14
	→ ikwyl6 joined	08:15
	→ amcsi_ joined	08:16
	← kiweun left	08:17
	← KeyJoo left	08:19
	← kini left	08:21
	→ kini joined	08:22
	← drbean_ left	08:24
	← DevAntoine left	08:24
	→ DevAntoine joined	08:24
	→ florekm joined	08:27
	← dslegend1 left	08:28
	→ angular_mike joined	08:29
angular_mike	is there a command to list files that were deleted on a branch (but not moved/renamed)?	08:29
	← florekm__ left	08:30
	→ sinhue joined	08:31
	← mat001_ left	08:32
	← Mat001 left	08:32
	← florekm left	08:33
	← ikwyl6 left	08:33
	→ leixy joined	08:35
	← leixy left	08:37
	← stats4647 left	08:38
nkuttler	angular_mike: i think you can get that from diff --name-status	08:38
	→ ikwyl6 joined	08:40
	→ Amol__ joined	08:40
	← tiin57 left	08:40
	← Amol__ left	08:41
	→ Heisenberg joined	08:41
	→ AL13N_lappy joined	08:41
AL13N_lappy	if i do "git branch -d foo" on branches being something like "original -> foo -> master" , do i lose the commit of foo? (ancestor of master)? i kinda just want to branch(name) to go away without losing any commits on master	08:43
osse	AL13N_lappy: you will not lose any commits	08:43
	→ tiin57 joined	08:44
AL13N_lappy	osse: thanks	08:44
angular_mike	nkuttler: wouldnt that count files that werent present on the branch during commits as deleted?	08:45
osse	angular_mike: git log --name-only --diff-filter=D master..branch	08:45
	something like that	08:45
	can be made easier to parse	08:45
	oh, of course: git diff --name-only --diff-filter=D master...branch	08:45
angular_mike	osse: wouldn't that count moved/renamed files as deleted?	08:45
	← jelmer left	08:46
osse	angular_mike: by default no	08:46
	→ jelmer joined	08:46
osse	rename detection is enabled by default since Git version {insert correct version here}	08:46
	→ calcul0n_ joined	08:48
	→ ARoxdale joined	08:50
	→ unluckyshrubbery joined	08:50
	→ john_johnk2 joined	08:51
	→ PJBoy joined	08:51
	→ florekm joined	08:53
	← calcul0n_ left	08:53
	→ mozgalom joined	08:54
	→ calcul0n joined	08:56
	← sinhue left	08:56
	→ florekm__ joined	08:56
	← mozgalom left	08:56
	→ Guest1 joined	08:57
ikke	osse: man git-show also lists it	08:58
gitinfo	osse: the git-show manpage is available at https://gitirc.eu/git-show.html	08:58
	← Guest1 left	08:58
	← florekm left	08:58
	→ mozgalom joined	08:59
	← Fan[m] left	09:00
osse	Indeed, I didn't search far enough	09:01
	ikke: did you find the culprit? My guess is there is a split between "log-like" logic and "cat-file-like" logic somewhere in show and that screws it up	09:02
	But if that's right then I would guess that bug has always been there	09:02
	→ metnel joined	09:06
	→ YoungFrog joined	09:09
	← metnel left	09:10
	← tiin57 left	09:10
	← gigasu_shida left	09:12
	→ accesspoint joined	09:13
	→ tiin57 joined	09:14
	← accesspoint left	09:15
	← hololeap left	09:16
	→ thebope joined	09:17
	← R2robot left	09:18
AL13N_lappy	when doing rebase -i; and i'm doing a fixup of 2 commits, one of them has a tag and then loses the tag... i get why... but is there a way to keep the existing tag, since it's a fixup and not something else?	09:18
	← vicfred left	09:19
ikke	osse: not yet	09:19
AL13N_lappy	oh? "yet"?	09:19
ikke	osse: at least v2.20.5 is working	09:19
	AL13N_lappy: not responding to you	09:20
AL13N_lappy	ikke: sorry	09:21
osse	Not everything is about you! GOSH!	09:21
	← thebope left	09:21
osse	(tee hee)	09:22
ikke	AL13N_lappy: AFAIK, there's no builtin option for rebase	09:22
AL13N_lappy	i'm sorry, it's just that "ikke" in my language means "myself" and so i got confused	09:22
	ikke: ok, thx	09:22
ikke	AL13N_lappy: in my language as well ;-)	09:23
AL13N_lappy	myeah, i figured	09:23
apo	and in mine! Almost! :p	09:23
	and my axe.	09:23
ikke	It could also have been Norwegian	09:23
Haohmaru	what an unbelievable coincidence	09:23
	← shicks255 left	09:23
AL13N_lappy	i'm guessing this is not such a coincidence :-)	09:24
	→ shicks255 joined	09:24
Haohmaru	it's not, most h4x0rz are from scandinavia	09:24
osse	and Danish'	09:24
Haohmaru	<close_enough.jpg>	09:24
	← calcul0n left	09:25
AL13N_lappy	so, i guess a belgian, dutch, german, norwegian, danish, (and some others) walk into a #git IRC channel,... etc...	09:25
osse	ikke: is that the basis for your nickname?	09:25
	just "myself" ?	09:25
ikke	Yes, not very original	09:26
Haohmaru	very selfish	09:26
AL13N_lappy	he must be dutch :-)	09:26
osse	hmm	09:26
	→ dimi1947 joined	09:26
osse	that never even occured to me	09:26
	I knew that ik means I. And I even lived there for five months	09:27
AL13N_lappy	ikke is a dialect form	09:27
	→ calcul0n joined	09:27
osse	oh	09:27
ikke	Yes, ikke is more colloquial	09:27
	→ florekm joined	09:28
osse	If ik(ke) means "I", then what's dutch for "me" ?	09:28
	→ flying_sausages_ joined	09:28
ikke	Mij	09:28
AL13N_lappy	"mij" or even "me"	09:28
osse	ah	09:28
	← snits left	09:29
AL13N_lappy	"me, myself and I" => "mij, mezelf en ik"	09:29
	← flying_sausages left	09:29
AL13N_lappy	or even "me, mezelf en ikke" :-)	09:29
	← florekm__ left	09:31
AL13N_lappy	anyway, thanks all for the tangent and answer to my question :-) ; sorry to have interrupted the conversation	09:31
osse	Me Myself I is the title of a song by Joan Armatrading, and the main riff from that song is sampled by The Prodigy on their song Full Throttle	09:31
	hmm, not a sample. more like jsut the same melody	09:32
	Might be a coincidence, but I doubt it	09:32
	← shush left	09:40
	← tiin57 left	09:40
	→ tiin57 joined	09:44
	→ florekm__ joined	09:44
	← florekm left	09:47
	→ snits joined	09:48
	Heisenberg → CIAZ	09:49
	→ eblip joined	09:51
	→ eb0t_ joined	09:51
	→ florekm joined	09:52
	← eb0t left	09:52
	← zrhoffman left	09:52
	→ krumelmonster joined	09:52
	← def_jam left	09:52
	→ sinhue joined	09:53
	→ kristijonas joined	09:54
	→ cousteau joined	09:54
	← florekm__ left	09:55
cousteau	Hi! Is it possible to rename an annotated tag?	09:55
	→ florekm__ joined	09:55
cousteau	I created a tag v0.2_tentative which I intend to rename as v0.2 once I'm sure that's the definitive version	09:56
	← Metalsutton left	09:56
Habbie	cousteau, a commit can have multiple tags; you can delete tags; i'm not sure you can rename them	09:56
	← florekm left	09:57
	→ Rashad joined	09:58
cousteau	OK, option 2 is to create a new annotated tag, copy-paste the description of the old tag, and delete the old tag	09:58
krumelmonster	Hi. Is there a way to configure a tracked file to not be updated on add -u?	09:58
	← sinhue left	09:58
cousteau	But that's, like, too much work... (not really, but it feels awkward)	09:58
	← ikwyl6 left	09:59
	→ zrhoffman joined	09:59
	← amcsi_ left	09:59
krumelmonster	Documentation says that already tracked files are not affected by .gitignore (which I think is somewhat counterintuitive in this regard)	10:00
	← KeithAdams left	10:01
	m1dnight_ → sometesttempnick	10:01
	sometesttempnick → m1dnight_	10:02
	← hnOsmium0001 left	10:03
	→ KeithAdams joined	10:05
osse	hmm, seems git tag doesn't have the same niceness for specifying the message as git commit doesa	10:08
	stfn1 → stfn	10:09
	→ florekm joined	10:10
	← raven-au left	10:10
	← tiin57 left	10:10
	→ raven-au joined	10:11
Habbie	krumelmonster, no	10:12
	← florekm__ left	10:13
	→ kiweun joined	10:13
	→ tiin57 joined	10:14
	→ ikwyl6 joined	10:14
	→ computeiro joined	10:15
	← mozgalom left	10:16
	← Benzi-Junior left	10:16
	→ wender joined	10:17
	→ zebrag joined	10:17
	← kiweun left	10:18
	→ cody joined	10:18
	→ R2robot joined	10:19
	← computeiro left	10:20
	→ florekm__ joined	10:21
	← goodburner left	10:21
	→ goodburner joined	10:22
	→ Sc0tty- joined	10:24
	← florekm left	10:25
	→ computeiro joined	10:25
	← wender left	10:27
	→ liefer joined	10:27
	← kini left	10:31
	→ kini joined	10:32
	→ mozgalom joined	10:35
	→ stats4647 joined	10:36
	← Rashad left	10:38
	← tiin57 left	10:40
	mozgalom → bomb-on	10:44
	← john_johnk2 left	10:44
	→ tiin57 joined	10:44
ikke	osse: I fail to reproduce the issue when I build git myself	10:45
	oh, maybe you need to specify something from the index	10:45
	→ rapiz joined	10:52
ikke	osse: seems like you're right, it's not working on old versions either	10:53
	← liefer left	10:55
	→ florekm joined	10:55
	← krofe left	10:56
	→ liefer joined	10:57
	← florekm__ left	10:58
	→ sinhue joined	10:59
	← florekm left	11:01
	← igemnace left	11:02
	← CryptoClub left	11:04
ikke	cliluw: So seems like this might have never worked. The file is created, but the output is not redirected	11:04
	→ grimpeux joined	11:04
	→ CryptoClub joined	11:06
	← dimi1947 left	11:08
	→ amcsi joined	11:09
	← tiin57 left	11:10
	← ikwyl6 left	11:12
	→ tiin57 joined	11:13
	→ thebope joined	11:19
	→ accesspoint joined	11:20
	→ ikwyl6 joined	11:20
	← rustyshackleford left	11:23
	→ _noblegas joined	11:24
	← grimpeux left	11:25
	→ john_johnk2 joined	11:26
	→ lbracher joined	11:26
	→ florekm joined	11:28
	← thebope left	11:28
	→ grimpeux joined	11:29
	← grimpeux left	11:30
	← sinhue left	11:31
	← accesspoint left	11:33
	← dviola left	11:33
	→ amcsi_ joined	11:33
	→ Rh0nda joined	11:35
	← cousteau left	11:36
	← amcsi left	11:36
	→ dslegends joined	11:36
	← Rhonda left	11:37
	← blahdodo left	11:37
	← tiin57 left	11:40
	← ikwyl6 left	11:42
	→ drbean_ joined	11:44
	→ tiin57 joined	11:44
	→ thblt joined	11:46
	← krumelmonster left	11:47
	→ ikwyl6 joined	11:48
thblt	Is there a way to hook on clone to transform the remote URL? I use a lot of publicly-readable repos for which I fetch over HTTPS but push over SSH. I have a stupid script [1] to set the --push url, but I wonder if I can automate this directly with git directly. [1]: https://github.com/thblt/dotfiles/blob/master/.local/bin/git-fix-remotes	11:49
	→ florekm__ joined	11:49
	→ sweatsuit_ joined	11:49
	→ linuxguru joined	11:49
	← sweatsuit left	11:51
	sweatsuit_ → sweatsuit	11:51
	← florekm left	11:52
	→ hololeap joined	11:55
	→ florekm joined	11:55
	→ hololeap_ joined	11:58
osse	thblt: take a look at url.<base>.insteadOf and url.<base>.pushInsteadOf man git-config	11:58
gitinfo	thblt: the git-config manpage is available at https://gitirc.eu/git-config.html	11:58
	← florekm__ left	11:58
osse	not sure if it'll work for all your cases though	11:58
	← hololeap left	11:59
	→ crose joined	12:01
	← ikwyl6 left	12:02
	→ florekm__ joined	12:03
	→ Amol__ joined	12:03
	→ richbridger joined	12:03
	← kini left	12:04
	→ kini joined	12:05
	← florekm left	12:06
	← john_johnk2 left	12:06
	← CIAZ left	12:06
	→ ikwyl6 joined	12:06
thblt	osse: thanks, reading that!	12:06
	→ fission6 joined	12:09
	→ dimi1947 joined	12:09
	Rh0nda → Rhonda	12:09
	← tiin57 left	12:10
	← andreas303 left	12:13
	→ Rh0nda joined	12:13
	→ ph0b0s_ joined	12:13
	→ andreas303 joined	12:13
	→ tiin57 joined	12:13
	→ Heisenberg joined	12:14
thblt	I think [url "ssh://git@github.com/"]\n pushInsteadOf = "https://github.com/" should work, just need to actually get it to work :)	12:15
	← Rhonda left	12:16
osse	shouldn't ssh and https be the other way around ?	12:16
	← Amol__ left	12:16
	← ph0b0s left	12:16
	← dimi1947 left	12:17
	→ Amol__ joined	12:18
thblt	osse: no. It's a bit weird, but if you read the doc, url.<base>.pushInsteadOf=<prefix> means push to <prefix> insteadOf <base>.	12:18
osse	yes, and you said "for which I fetch over HTTPS but push over SSH." so you want to push over SSH, meaning that the prefix thing should be ssh	12:19
	← Heisenberg left	12:19
thblt	No. It's very unnatural, but it means that when creating a push url, git will enumerate all <prefix> and if one matches, replace it by <base>. That's what I want: when pushing, use SSH.	12:21
	← lbracher left	12:21
thblt	Let me doublecheck	12:22
ws2k3	i have a question. i have a file in my repo but i wish to ignore local changes so i added it to the .gitignore but git is not ignoring my file. is there anything i can do? or do i misunderstand how the .gitignore is supposed to work?	12:22
thblt	osse: it works like this.	12:23
osse	ahh	12:23
Habbie	ws2k3, .gitignore does not apply to files git is already tracking	12:23
ws2k3	Habbie: so. i cannot have a local file ignored And have the same file already in git?	12:24
Habbie	ws2k3, correct	12:24
thblt	ws2k3: a common approach is to either not track such files, or track them with a different name (eg localconfig.template instead of localconfig)	12:24
Habbie	^ that	12:24
ws2k3	Habbie: that makes sense thanks and then another question. can i just delete the file from the repo. commit push. add it to .gitignore? and then it Should be ignored?	12:26
	→ Muimi_ joined	12:27
	← Muimi_ left	12:27
thblt	Yes.	12:27
	← Amol__ left	12:27
	→ blahdodo joined	12:27
	→ Heisenberg joined	12:27
thblt	out of my head, git tracks paths that are in the checked out revision + staged paths + not-ignored paths	12:28
osse	thblt: btw, why do you want two different URLs in the first place?	12:28
	→ kiweun joined	12:29
	← Muimi left	12:30
thblt	osse: because I can authenticate on SSH using a hardware token, so I don't need to save/access my github credentials. But I don't want to have to plug said token just to fetch.	12:30
	(Especially since it's on my keyring with my house keys and I keep forgetting where I left it)	12:31
osse	oh cool	12:31
	→ florekm joined	12:32
	← kiweun left	12:34
	→ cd joined	12:34
thblt	(A Yubikey through gnupg working as ssh-agent)	12:35
	← dslegends left	12:35
	→ dslegends joined	12:35
	← florekm__ left	12:35
	→ CodeSlingerPaul joined	12:35
	→ lbracher joined	12:38
thblt	Is it "polite" to rename master to main on existing repos? People tracking `master` will have to update manually to the new name, right?	12:39
Habbie	thblt, where is the repo hosted?	12:39
osse	Second question: Yes. First question: ehhh...	12:39
	→ florekm__ joined	12:40
	← tiin57 left	12:40
thblt	Habbie: depends, but most are on github	12:41
	← sebito91 left	12:41
Habbie	thblt, i believe github has some special handling - but you should check the docs	12:41
	→ skered joined	12:41
thblt	Habbie: ha, thank you.	12:41
	→ klonn joined	12:42
osse	i would be very surprised if github could do something serverside that would automatically update the tracking info in a local repo	12:42
	→ sebito91 joined	12:42
Habbie	https://github.com/github/renaming	12:42
	apparently it provides a helpful message on 'git push'	12:42
	but yes, that's all it can do for actual git clients	12:42
	← florekm left	12:43
	→ sinhue joined	12:43
	← dslegends left	12:43
	→ accesspoint joined	12:44
	→ jimklimov1 joined	12:44
	→ tiin57 joined	12:44
	→ dslegends joined	12:45
	← florekm__ left	12:45
	← jimklimov left	12:47
	← linuxguru left	12:47
	→ juhwad__ joined	12:48
AL13N_lappy	so, git tag -l shows the tags; but i'm interesting in sorting this on the order they appear in the current branch	12:48
	is there a way to get the tags of the history of the current branch in order?	12:48
	→ SerialSmile joined	12:48
	← jaziz1 left	12:51
	→ krumelmonster joined	12:51
thblt	AL13N_lappy: ugly but works: git log --format="%d" \| grep -v "^$" :)	12:52
	also tag objects have a date	12:52
osse	--merged HEAD combined with --sort creatordate	12:53
thblt	Don't listen to me listen to osse :)	12:55
	→ florekm joined	12:55
	← stats4647 left	12:57
	← juhwad__ left	12:58
	← sinhue left	12:58
AL13N_lappy	yeah, i was reading that, but i'm not certain we could guarantee creatordate to be in the correct order? what about cherrypicked branches?	13:00
	→ florekm__ joined	13:00
osse	what order do you want?	13:01
	← florekm left	13:03
osse	if you cherry-pick commits tags won't follow	13:03
	← lbracher left	13:04
	← ikwyl6 left	13:05
AL13N_lappy	right, and then you fix tags , and thus creatordate is moved with it	13:05
	so, it should still match	13:06
	what if you add a tag later?	13:06
	hmm	13:06
	so, i need to pay attention and fix tags chronologically in a branch and then it still works	13:07
	← justanotheruser left	13:07
osse	so you want the tags in the commit order?	13:07
AL13N_lappy	i donno, i would've thought there was a special sort key that would be there only if you use things like merged so it would get the merged order, i guess?	13:08
	osse: yeah	13:08
osse	then perhaps git log is best after all	13:09
thblt	This is probably better than the firs version git log --format="%D" \| grep "^tag:"	13:09
	→ john_johnk2 joined	13:09
AL13N_lappy	but, internally in git, how does it do the sorting like in the logging? i figured there would be an internal sort key that matches that, but maybe it's handled differently	13:10
osse	git log just follows the chain of commits backwards	13:10
	each commit points to its previous commit(s)	13:10
	← tiin57 left	13:10
AL13N_lappy	right	13:10
osse	git tag starts off with the list of all tags that exist	13:10
thblt	AL13N_lappy: Tags don't necessary point to commits, I think, so you can't treat them as such.	13:11
osse	that too	13:11
	← accesspoint left	13:11
AL13N_lappy	i understand, i was just hoping that internally, the way to follow the chain would be a pseudo sort function internally, and then if you have git tag --merged, it could use that as --sort	13:11
	because, if you have --merged, then those tags point to commits, right?	13:12
osse	I assume so, yes	13:12
thblt	But it's way more efficient to start with the commit history and find tags from there.	13:13
AL13N_lappy	so, in the man page, i was looking for "merged" or "merged:commit-chain" or something, but no dice	13:13
	yeah, thanks thblt	13:13
osse	what would that mean?	13:13
	→ fahadash joined	13:13
	← deltab left	13:14
AL13N_lappy	osse: it would be something only available on --merged, so then the --merged would be getting tags like that, by following the commit chain on the --merged=thing	13:14
	→ florekm joined	13:14
AL13N_lappy	anyway	13:14
	→ tiin57 joined	13:14
AL13N_lappy	i guess this is kinda of a niche-case	13:15
osse	--merged already implies that	13:15
	if a tag is merged into a prior commit then that counts as being merged into the current	13:15
AL13N_lappy	myeah	13:15
osse	what is the actual use case?	13:16
	→ sinhue joined	13:16
	→ deltab joined	13:16
	← krumelmonster left	13:16
AL13N_lappy	i'm using it for per branch having an ordered list of tags, which i use in deployment for building specific tarballs, i which differences in feature- tags are created into feature-tarballs	13:17
	anyway	13:18
	← florekm__ left	13:18
	→ ikwyl6 joined	13:18
	← florekm left	13:18
	← rapiz left	13:21
	→ krumelmonster joined	13:23
	← krumelmonster left	13:23
	→ xgfvc joined	13:29
	→ Mat001 joined	13:30
	→ mat001_ joined	13:30
	→ thebope joined	13:32
	→ blyat-73 joined	13:33
	← canadev left	13:33
	← Mattiaslndstrm left	13:35
	← dino82 left	13:36
	→ antoine joined	13:36
	→ hussam joined	13:36
	Rh0nda → Rhonda	13:38
	← xlei left	13:38
	← tiin57 left	13:40
	→ LionsMane joined	13:42
	→ Amol__ joined	13:42
	← PJBoy left	13:42
	← SirD_P left	13:43
	← Heisenberg left	13:43
	← kini left	13:43
	→ tiin57 joined	13:44
	→ kini joined	13:45
	→ xlei joined	13:45
	→ PJBoy joined	13:46
	→ SirD_P joined	13:51
	← ikwyl6 left	13:53
	→ lbracher joined	13:53
	→ calcul0n_ joined	13:55
	→ florekm joined	13:55
	← rigid left	13:56
	← Ragnor left	13:56
	← drbean_ left	13:56
	→ rapiz joined	13:57
	← nuala left	13:57
	← calcul0n left	13:57
	← sinhue left	13:59
	→ thiago joined	14:00
	← ghoti left	14:00
	← rawtaz left	14:00
	→ rigid joined	14:01
	← klonn left	14:02
	→ ghoti joined	14:02
	← rapiz left	14:03
	→ TomyWork joined	14:04
	→ Ragnor joined	14:05
	→ howdoi joined	14:06
	→ vit100 joined	14:09
	→ ikwyl6 joined	14:09
	← tiin57 left	14:10
	→ nuala joined	14:11
	→ cdown joined	14:11
	→ otisolsen70 joined	14:12
CrtxReavr	Why does git need to "resolve deltas" as part of a fresh repo clone?	14:13
	← john_johnk2 left	14:13
ronny	i would guess to get the blobs of the last commit which may be packed in the pack as delta to other blobs	14:14
	→ tiin57 joined	14:14
	→ jesseTree joined	14:14
	→ madewokherd joined	14:15
CrtxReavr	https://bpa.st/6XFA	14:15
	→ jupart_ joined	14:16
	→ Mattiaslndstrm joined	14:20
	→ arcatech joined	14:21
winny	I'd like to find all merge commits that had manually resolved conflicts for a specific file, I know how to get all merge commits with: git rev-list --min-parents=2 --all . Is there a way to filter down to just commits that have a manual resolution for a specific file?	14:21
	→ florekm__ joined	14:22
	→ modlin joined	14:23
	→ justanotheruser joined	14:24
	→ Nodn[m] joined	14:25
	← florekm left	14:25
	→ krumelmonster joined	14:26
	→ rawtaz joined	14:27
	→ gast0n joined	14:27
	→ jas4711 joined	14:27
	← rawtaz left	14:27
	→ rawtaz joined	14:27
thblt	winny: I'd guess you'd need to replay all the merges and see if the default algorithm fails on that file, and when it succeds if the result is the same.	14:28
	→ tsdh joined	14:29
	← tsdh left	14:30
	← cody left	14:31
	→ tsdh joined	14:32
	→ amerigo joined	14:33
henk	in which manpage are things like @ and HEAD and HEAD^ and such explained?	14:35
osse	henk: man gitrevisions	14:35
gitinfo	henk: the gitrevisions manpage is available at https://gitirc.eu/gitrevisions.html	14:35
henk	argh, I was only looking at tab completion for 'man git-' m(	14:36
	thanks osse	14:36
osse	the gitfoo manpages (as opposed to git-foo) are much overlooked	14:36
	or maybe they aren't and I just think they are	14:36
	who knows	14:36
	→ florekm joined	14:37
	→ sudoforge joined	14:37
	← ikwyl6 left	14:37
osse	henk: git help -g lists all the "non-dash" guides, btw.	14:40
tsdh	osse: Probably, I just wanted to answer the question and looked through the "man git-<TAB>" listing. :-)	14:40
	← tiin57 left	14:40
	← florekm__ left	14:40
henk	hm, I have push.default=upstream in one repository and need to repeatedly push the current branch (with name someprefix-ab123) to different remotes and want to set up tracking. I tried 'git push --set-upstream myremote @:ab123' and 'git push --set-upstream myremote @:refs/heads/ab123'. The latter works but doesn’t set up tracking. Am I doing anything wrong or are my expectations wrong?	14:42
	→ cody joined	14:43
	← ghoti left	14:43
henk	osse: oh, good to know, thanks	14:43
	→ tuskkk____ joined	14:43
	← SerialSmile left	14:43
osse	henk: does it work if you use the branch name instead of @ ?	14:43
	← _noblegas left	14:43
osse	also, does it work if you remove refs/heads where it occurs?	14:43
	→ ram19890 joined	14:43
	→ ghoti joined	14:43
	→ stats4647 joined	14:44
henk	osse: yes, it does, but that’s what I want to avoid because the 'someprefix' part changes.	14:44
	→ tiin57 joined	14:44
osse	henk: try with HEAD instead of @	14:44
henk	ah, but the remote changes too, so I can’t reuse the exact same command anyway …	14:45
	and now it probably gets too complicated to still be worth trying to optimize it, it’s just a handful anyway	14:45
	→ srinidhi joined	14:47
	→ nomicon joined	14:48
	← veegee left	14:50
	→ clarkk joined	14:51
	← zebrag left	14:52
	← waveclaw left	14:52
	→ zebrag joined	14:52
	→ klonn joined	14:52
	→ grimpeux joined	14:52
henk	osse: nope, also doesn’t set the upstream	14:53
	→ ikwyl6 joined	14:53
	→ waveclaw joined	14:53
	→ AnAverageHuman joined	14:53
clarkk	I have folder that I checked out from github and a zip of the same project, but with no git data. The github project is no longer available. My two folders are different. I'm trying to work out which is the most recent version. Can anyone think of how I can do this, please?	14:54
	← vit100 left	14:54
	→ florekm__ joined	14:55
rawtaz	i mean..	14:56
	if only one part has version control, i guess the best you can do is to either see if you can find instances of the other part somewhere in the history of the first part, to see where in history that other part might be in terms of age	14:57
	otherwise check the files' modification dates i suppose, but that can hardly be trusted entirely	14:57
	→ Wetmelon joined	14:57
	← waveclaw left	14:58
	← florekm left	14:58
tsdh	clarkk: You could "git checkout HEAD^" and run "diff -r checkout-dir/ tarball-unpacked-dir/" until there are no changes in non-git files listed anymore. Of course, that will only work if the tarball is not more recent than your clone.	14:59
	← KnoP left	14:59
	→ waveclaw joined	15:00
	← xrisovalantis left	15:00
	→ malmalmal joined	15:01
clarkk	tsdh, there are lots of commits, so that may not be feasible. Is it possible to find the commits where a specific file existed, even if it doesn't exist in the latest commit?	15:01
	→ mitigate joined	15:02
	→ john_johnk2 joined	15:02
	→ dimi1947 joined	15:02
mitigate	with my last version of git, i'm not able to commit if there are whitespace errors	15:02
	← ikwyl6 left	15:02
mitigate	i get a bunch of whitespace errors and git-commit exits with -1	15:03
	i cant figure out how to force it	15:03
	← dimi1947 left	15:03
osse	--no-verify	15:03
mitigate	errors like "new blank line at EOF."	15:03
	thx	15:03
	but there arent supposed to be any commit msg hooks	15:04
	ah i see there are. i wonder where they came from	15:05
	→ krofe joined	15:05
	→ jgoutz21 joined	15:07
	→ ikwyl6 joined	15:07
	← malmalmal left	15:08
	→ xissburg joined	15:08
mitigate	i'm still confused. how come this didnt trigger when i did the same thing a few months ago	15:09
	i cant see anything in relnotes	15:10
	← jgoutz21 left	15:10
	← tiin57 left	15:10
mitigate	filemode=false interacts with this?	15:10
tsdh	clarkk: "git log -- path/to/file" will list all commits affecting that file at least...	15:12
	← thomas_25 left	15:13
	← Joel left	15:13
	← arcatech left	15:13
	→ thomas_25 joined	15:13
	→ tiin57 joined	15:13
	→ Joel joined	15:14
	← CryptoClub left	15:16
	→ CryptoClub joined	15:18
	← gearnode left	15:19
	← AnAverageHuman left	15:20
	→ gearnode joined	15:21
	→ lemonade` joined	15:21
	→ dhollinger joined	15:22
	→ AnAverageHuman joined	15:22
	thebope → veam	15:23
	→ edlou joined	15:24
	veam → thebope	15:25
	← nvmd left	15:25
	← ikwyl6 left	15:25
	← kini left	15:26
	→ durham joined	15:28
	→ mindCrime joined	15:28
	→ kini joined	15:28
	→ blue__penquin joined	15:29
	← long4mud left	15:29
	← modlin left	15:30
	→ modlin joined	15:30
	→ ikwyl6 joined	15:32
	← modlin left	15:35
	← krofe left	15:35
	→ modlin joined	15:36
	→ arcatech joined	15:36
	→ kiweun joined	15:36
	→ linuxguru joined	15:38
	← heyitsrama left	15:38
	→ heyitsrama joined	15:39
	← blyat-73 left	15:39
	→ blyat-73 joined	15:39
	← tiin57 left	15:40
	← kiweun left	15:41
	→ led_belly joined	15:41
	→ malmalmal joined	15:41
	→ tiin57 joined	15:43
	← ikwyl6 left	15:44
	hololeap_ → hololeap	15:44
	→ shush joined	15:47
	→ tang^ joined	15:49
	← hussam left	15:49
	→ KeyJoo joined	15:50
	← txtsd left	15:51
	← zebrag left	15:52
	→ zebrag joined	15:52
davve	hi there, i need to do a git bisect, but i dont want all the changes just pertaining to a single file	15:52
	any ideas?	15:52
osse	bisect can filter to a file	15:53
davve	basically the HEAD and checking out a single file to a specific commit	15:53
	oh	15:53
	yay	15:53
osse	scratch that	15:53
	I misunderstood. it won't do what you want	15:53
	← klonn left	15:54
osse	but you can do it by hand using git rev-list --bisect good..bad -- file	15:54
	or use bisect --no-checkout	15:54
	→ dviola joined	15:55
davve	git bisect --no-checkout start	15:55
	then just checkout the file manually, then git bisect good/bad ?	15:55
	→ florekm joined	15:56
osse	yes, git checkout BISECT_HEAD -- file	15:56
	← Sc0tty- left	15:56
	← shush left	15:56
davve	thanks, ill give it a try	15:57
	← grimpeux left	15:58
	← chele left	15:58
	← florekm__ left	15:59
	← finn_elija left	15:59
	← j7k6 left	15:59
	→ testq7[m] joined	16:00
	← dviola left	16:00
	→ dviola joined	16:00
	← deltab left	16:01
	→ finn_elija joined	16:01
	← noidea left	16:02
	→ blue__penquin_ joined	16:02
	← blue__penquin left	16:04
	blue__penquin_ → blue__penquin	16:04
	← john_johnk2 left	16:05
	→ txtsd joined	16:05
	→ hussam joined	16:05
	← mitigate left	16:06
	← txtsd left	16:06
	← amcsi_ left	16:06
	→ j7k6 joined	16:06
	← blue__penquin left	16:08
	← malmalmal left	16:08
	→ blue__penquin joined	16:09
	← tiin57 left	16:10
	→ txtsd joined	16:11
	→ deltab joined	16:12
	→ tiin57 joined	16:14
	← bomb-on left	16:15
	→ long4mud joined	16:16
	→ Benzi-Junior joined	16:16
	← modlin left	16:17
	→ causasui joined	16:17
	→ accesspoint joined	16:19
	→ jottr joined	16:20
	→ rond_ joined	16:21
	→ ikwyl6 joined	16:21
	→ supercoven joined	16:24
	← supercoven left	16:24
	→ supercoven joined	16:24
	← Haohmaru left	16:25
	← causasui left	16:27
	← kini left	16:28
	→ kini joined	16:29
	← accesspoint left	16:31
	← DevAntoine left	16:31
	→ DevAntoine joined	16:32
	← DevAntoine left	16:36
	← tiin57 left	16:40
	← ikwyl6 left	16:40
	→ lechner joined	16:40
lechner	Hi, is there a way to check out the commit from 'git describe' when the hash portion is missing? I have the most recent tag and the offset count (plus, I know the branch).	16:42
	→ grimpeux joined	16:42
	← fflam left	16:42
	→ shush joined	16:43
	→ fflam joined	16:44
	→ tiin57 joined	16:44
	→ DevAntoine joined	16:44
	→ ikwyl6 joined	16:44
	→ AckSynAck joined	16:45
	→ rustyshackleford joined	16:45
	← grimpeux left	16:47
	← DevAntoine left	16:49
	← zebrag left	16:52
	→ zebrag joined	16:52
	← ikwyl6 left	16:54
	← gast0n left	16:54
	← stats4647 left	16:56
	→ florekm__ joined	16:56
	→ DevAntoine joined	16:56
	→ stats4647 joined	16:56
	← bket left	16:58
	→ ikwyl6 joined	16:59
	← florekm left	16:59
	← DevAntoine left	17:01
	← stats4647 left	17:04
	→ stats4647 joined	17:05
	→ Betal joined	17:05
	← durham left	17:06
	← rond_ left	17:07
	→ rafasc joined	17:07
	← ikwyl6 left	17:09
	← tiin57 left	17:10
	← tuskkk____ left	17:12
	→ tiin57 joined	17:14
	← rsx left	17:15
	← Jck_true left	17:16
	→ klonn joined	17:16
	→ Jck_true joined	17:16
	→ durham joined	17:18
	→ ikwyl6 joined	17:20
	→ DevAntoine joined	17:21
	→ justmondris joined	17:22
	→ kristijonas_ joined	17:24
	← kristijonas left	17:26
	← DevAntoine left	17:26
	← blue__penquin left	17:26
	← stats4647 left	17:28
	← hussam left	17:29
	← LetoThe2nd left	17:29
	→ hussam joined	17:29
	→ stats4647 joined	17:29
	← AckSynAck left	17:29
	← kini left	17:29
	← ikwyl6 left	17:30
	→ kini joined	17:31
	→ mowcat joined	17:32
	← xgfvc left	17:33
	→ DevAntoine joined	17:33
	→ gigasu_shida joined	17:36
thblt	lechner: you want the Nth commit after a given commit in a given branch?	17:36
lechner	thblt: yes, please!	17:36
	← ram19890 left	17:37
thblt	lechner: is this a one-time thing or is this something you need to automate? I mean, if the latter, I'd use git log.	17:37
lechner	automated	17:38
	← DevAntoine left	17:38
	→ justan0theruser joined	17:38
	← justanotheruser left	17:38
	→ ikwyl6 joined	17:38
	→ grimpeux joined	17:38
	→ john_johnk2 joined	17:39
thblt	So IIUC you'll have a partial git describe output?	17:39
	→ hnOsmium0001 joined	17:40
	← tiin57 left	17:40
lechner	i do https://salsa.debian.org/lintian/lintian/-/commit/bbfa926cb78fa87c55f43493a86c6f38a15bbcaa	17:41
	have the last tag and the count	17:41
osse	w	17:41
	I wonder how that simplifies anything	17:41
thblt	lechner: `git log --reverse` will help, but I'm not sure the output is unambiguous without the hash.	17:42
	← justmondris left	17:42
	→ veegee joined	17:43
	→ dimi1947 joined	17:43
osse	I think I'd use bisect	17:43
lechner	osse: I have to keep track of two versions later https://salsa.debian.org/lintian/detagtive/-/commit/03254e769d5629b7ce81e8a055b6f85e875369f9	17:43
	→ tiin57 joined	17:44
osse	you know the part before the count is older, and you know the current commit is never. do git rev-list --bisect this..that and try to git describe that. pick one sine and retry	17:44
	*side	17:44
	← grimpeux left	17:45
lechner	thblt: i read that everywhere online, but i have no issue doing it by scrolling the outgut of git log	17:45
	→ modlin joined	17:45
thblt	lechner: I don't understand. You said you wanted to automate it.	17:45
osse	also git bisect --no-checkout with a script can automate this. I learned about --no-checkout today and has already recommended it twice. Nice.	17:45
	← stats4647 left	17:46
	→ DevAntoine joined	17:46
	→ stats4647 joined	17:46
lechner	thblt: yeah, i need it here: https://salsa.debian.org/lintian/taxiv/-/blob/master/add-lintian-tags#L87	17:46
thblt	ha, bisect is a good idea. But again, I'm really not sure that the output of describe without the hash is unambiguous.	17:47
lechner	our gitlab cannot do shallow clones there	17:47
	what if all our merges are fast-forward	17:48
	→ FH_thecat joined	17:48
	→ vorona joined	17:48
osse	thblt: it won't be unless you can guarantee a linear history	17:48
	bisect is the best I can think of	17:49
	← ikwyl6 left	17:49
	← dimi1947 left	17:49
lechner	we have a liner history, i think	17:49
thblt	lechner: not even merge commits?	17:49
	→ grimpeux joined	17:49
thblt	lechner: this is the issue you may hit https://paste.thb.lt/1618336170.html (most recent is down)	17:50
	← DevAntoine left	17:50
lechner	i have never understood merge commits, but would like to learn	17:50
thblt	merge commits have two parents.	17:51
	now you understand them :)	17:51
	two or more	17:51
	← zebrag left	17:52
	← Dotz0cat_ left	17:52
	→ zebrag joined	17:52
	← Amol__ left	17:52
lechner	i don't think so. my runners always pull HEAD when running Lintian	17:52
	← amerigo left	17:52
	→ sozuba joined	17:53
	← vorona left	17:53
	→ ikwyl6 joined	17:53
lechner	in SQL terms, I would be happy with LIMIT 1	17:53
osse	easy enough to check: git rev-list --min-parents=2 range-here	17:54
	if you're happy with that then do the bisect thing	17:54
	do it by hand, and if it makes sense then script ti	17:55
	→ florekm joined	17:56
	→ vicfred joined	17:58
	→ DevAntoine joined	17:58
	→ Guest20 joined	17:59
	← florekm__ left	17:59
	← DevAntoine left	18:03
	← ikwyl6 left	18:04
	→ Chex joined	18:07
	→ ram19890 joined	18:08
	← juvenal left	18:09
	→ TomyLobo joined	18:10
	← tiin57 left	18:10
	← TomyWork left	18:10
	→ DevAntoine joined	18:11
	← arcatech left	18:11
	→ tiin57 joined	18:14
	→ ikwyl6 joined	18:15
	← DevAntoine left	18:15
	→ juvenal joined	18:15
	← finalbeta left	18:16
	← sozuba left	18:17
	← Gustavo6046 left	18:18
	← crose left	18:21
	← Tobbi_ left	18:22
	← linuxguru left	18:23
	← ikwyl6 left	18:23
	→ DevAntoine joined	18:23
	→ dpflick joined	18:27
	← DevAntoine left	18:28
	→ accesspoint joined	18:30
	← xissburg left	18:31
	→ ikwyl6 joined	18:34
	→ DevAntoine joined	18:35
	← hussam left	18:35
	← toolbox left	18:36
	← jas4711 left	18:39
	← grimpeux left	18:40
	← tiin57 left	18:40
	← DevAntoine left	18:40
	← ikwyl6 left	18:41
	→ ecool joined	18:44
	→ tiin57 joined	18:44
	← iffraff left	18:45
	→ arcatech joined	18:45
	→ ikwyl6 joined	18:46
	→ jas4711 joined	18:47
	→ bket joined	18:49
	← zebrag left	18:52
	→ zebrag joined	18:52
	← ecool left	18:53
	← juvenal left	18:53
	← ikwyl6 left	18:56
	→ florekm__ joined	18:56
	← kini left	18:58
	← florekm left	18:59
	→ kini joined	19:00
	→ DevAntoine joined	19:00
	→ gast0n joined	19:01
	← Hello71 left	19:02
	→ Hello71 joined	19:03
	→ ikwyl6 joined	19:04
	← DevAntoine left	19:04
	← tiin57 left	19:10
	← Guest20 left	19:11
	→ DevAntoine joined	19:13
	→ tiin57 joined	19:14
	→ p0a joined	19:14
	← ikwyl6 left	19:14
p0a	Hello, I have a project with many subprojects (say, libraries) that I am keeping track of. Is there a proper way of having individual 'versions' for these projects? branches for everything?	19:15
Noisytoot	p0a, you can have separate repositories and use git submodules	19:15
p0a	interesting, thank you	19:16
	← DevAntoine left	19:17
	← lbracher left	19:19
	→ hussam joined	19:19
	→ cyrus_mc_ joined	19:20
	← splud left	19:25
	→ ikwyl6 joined	19:25
	→ splud joined	19:25
	← CryptoClub left	19:28
	← splud left	19:28
	→ splud joined	19:29
	→ juvenal joined	19:29
	→ krofe joined	19:30
	→ Gustavo6046 joined	19:30
	← shush left	19:30
	→ CryptoClub joined	19:31
	→ shush joined	19:31
	← ikwyl6 left	19:32
	← dviola left	19:33
	→ dviola joined	19:35
	→ ikwyl6 joined	19:36
	→ kiweun joined	19:37
	→ DevAntoine joined	19:37
	← tiin57 left	19:40
	← kiweun left	19:41
	← DevAntoine left	19:42
	→ cdown_ joined	19:42
	→ Iarfen joined	19:43
	→ tiin57 joined	19:44
	→ grimpeux joined	19:45
	← cdown left	19:45
	cdown_ → cdown	19:45
	→ DevAntoine joined	19:50
	→ Lord_of_Life_ joined	19:51
	→ Reiko2 joined	19:51
	← grimpeux left	19:52
	← zebrag left	19:52
	→ zebrag joined	19:52
	← Lord_of_Life left	19:54
	← DevAntoine left	19:54
	Lord_of_Life_ → Lord_of_Life	19:54
	→ mellernoia joined	19:54
	← ikwyl6 left	19:56
	→ florekm joined	19:57
	← Gustavo6046 left	19:57
	→ grimpeux joined	19:59
	→ Gustavo6046 joined	19:59
	← laj__ left	20:00
	← florekm__ left	20:00
	← klonn left	20:02
	→ DevAntoine joined	20:02
	← txtsd left	20:03
	← shailangsa left	20:03
	→ dsjdk joined	20:04
	→ ikwyl6 joined	20:04
	← Reiko2 left	20:05
	← DevAntoine left	20:07
	← KeyJoo left	20:07
	← hussam left	20:09
	← tiin57 left	20:10
	← rcoote left	20:10
	→ hussam joined	20:11
	→ tiin57 joined	20:13
	→ NightStrike joined	20:14
	→ DevAntoine joined	20:14
	← DevAntoine left	20:19
	← ikwyl6 left	20:22
	← thiago left	20:24
	← grimpeux left	20:24
	→ thiago joined	20:26
	→ DevAntoine joined	20:27
	← krumelmonster left	20:30
	→ ikwyl6 joined	20:30
Hello71	!subproject	20:31
gitinfo	[!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding.	20:31
Hello71	p0a: ^	20:31
	← DevAntoine left	20:31
	→ grimpeux joined	20:31
	← grimpeux left	20:34
p0a	thank you	20:37
	← PJBoy left	20:38
	→ DevAntoine joined	20:39
	← hnOsmium0001 left	20:39
	→ NeilG joined	20:39
NeilG	can I make a branch that doesn't branch off master?	20:40
	← tiin57 left	20:40
bremner	git switch -c new-branch thing-not-maaster	20:40
	→ PJBoy joined	20:43
	← DevAntoine left	20:43
	← ikwyl6 left	20:44
	→ tiin57 joined	20:44
	← clarkk left	20:45
imMute	NeilG: by default it'll branch off whatever commit you're on at the moment.	20:45
NeilG	imMute, so I can git checkout in the past, then git switch -c "some_branch", and I'll be good from there?	20:46
	can I also go into the future? git checkout upstream/master, then switch?	20:46
	bremner, oh, just syour comment, okay, so the second parameter can be upstream/master?	20:47
imMute	git checkout -b new_branch really_old_commit_or_branch (will create and switch to new_branch)	20:47
	no, you cannot branch from future commits. that's impossible.	20:47
NeilG	imMute, okay, that's slightly annoying beacuse I made the mistake of using master for my pull request, and I want to make another one	20:47
imMute	yes, the 2nd argument in bremner's command, the place to branch from, can be any commit sha or reference	20:47
	→ grimpeux joined	20:48
	→ ikwyl6 joined	20:48
NeilG	imMute, okay, so I guess I should rebase my existing pull request to upstream/master, then branch off upstream/master for my second pull request?	20:48
imMute	I dunno what you did already. it sounds like you used your master branch to do work that should have been on a feature branch?	20:49
	← grimpeux left	20:49
	← otisolsen70 left	20:51
	← m0viefreak left	20:51
	→ DevAntoine joined	20:52
	← zebrag left	20:52
	→ zebrag joined	20:52
	← amosbird left	20:52
	→ amosbird joined	20:53
	← DevAntoine left	20:56
	← ikwyl6 left	20:56
	← mellernoia left	20:56
	→ florekm__ joined	20:57
Hello71	what do you mean "future"	21:00
	master is not special	21:00
	← florekm left	21:00
	← jas4711 left	21:01
	→ ikwyl6 joined	21:01
NeilG	Hello71, I just meant upstream/master was ahead of my master, so it's "in the future"	21:03
Hello71	git doesn't care about any of that	21:03
NeilG	Hello71, I wasn't sure if I could branch off it, but I guess that doesn't make sense	21:03
	← foul_owl left	21:03
Hello71	you can forgo branches and use entirely commit hashes for everything	21:03
	← accesspoint left	21:03
NeilG	imMute, exactly, I used my master branch	21:03
	Hello71, that's fine, but I have no idea how to make Github pull requests using a commit hash instead of a branch	21:04
Hello71	git checkout -b newbranch otherbranch is equivalent to git checkout -b newbranch $(git rev-parse otherbranch)	21:04
	i mean you shouldn't	21:04
NeilG	okay then I won't :)	21:04
Hello71	my point is that branches are just aliases for commit hashes	21:04
	there's nothing special about the "master" name	21:04
	← calcul0n_ left	21:06
NeilG	Hello71, sure, but I wasn't saying that there was. I was just wondering whether I could make a branch that splits off from something I haven't pulled yet	21:07
Hello71	!pull	21:07
gitinfo	pull=fetch+merge (or with flags/config also fetch+rebase). It is thus not the opposite of push in any sense. A good article that explains the difference between fetch and pull: http://longair.net/blog/2009/04/16/git-fetch-and-merge/	21:07
NeilG	which now that I think about it doesn't make sense I guess	21:07
Hello71	you can delete your local master if you want and never use pull	21:07
	run git merge origin/master manually	21:07
NeilG	Hello71, okay, I don't think you've spent the time understanding what I've written, friend ;)	21:07
Hello71	ok	21:08
	→ calcul0n joined	21:08
	← duderonomy left	21:08
dsjdk	what commands should I use to sync my repository with remote storages?	21:10
	← tiin57 left	21:10
dsjdk	also, if I fucked my branch up, is it possible to store my commits somewhere and start again?	21:12
	→ duderonomy joined	21:12
	→ tiin57 joined	21:14
	→ foul_owl joined	21:16
	→ DevAntoine joined	21:17
rawtaz	you always have `git reflog` to dig into to find oyur commits as long as they havent been GCd	21:18
	← duderonomy left	21:18
	← ikwyl6 left	21:19
osse	dsjdk: the only commands you'll use daily to sync is fetch for downloading (pull does fetch under the hood), and push.	21:19
	→ duderonomy joined	21:19
	← krofe left	21:20
	← DevAntoine left	21:21
	→ ikwyl6 joined	21:23
dsjdk	do I need each branch separately if they are from the same repository?	21:24
	*to pull	21:24
	→ specing joined	21:25
	→ krofe joined	21:25
	→ modlin_ joined	21:25
specing	Hello. Is there a way to do a checkout with rebase? I want to move forward in history, but keep my local commits	21:27
	← modlin_ left	21:28
	← modlin left	21:28
	→ jstein joined	21:28
imMute	dsjdk: "what commands should I use to sync my repository with remote storages" -> git fetch	21:28
	dsjdk: a fetch will pull all the state from the remote that you don't already have (any commits or branches. tags are separate though)	21:30
	specing: that doesn't really make sense. how is it different from a regular rebase?	21:30
	→ shailangsa joined	21:31
	← ikwyl6 left	21:32
specing	imMute: oh, Im dumb	21:33
	I've always been doing a git pull --rebase, but this time Im moving back and forth in history due to a problem, so it's not "pulling", and it didn't click that pull was just a shorthand for fetch&rebase	21:34
	→ ikwyl6 joined	21:36
	→ kjartan joined	21:37
	← kini left	21:38
	→ kini joined	21:39
	← tiin57 left	21:40
	→ DevAntoine joined	21:41
	← fission6 left	21:42
	→ tiin57 joined	21:44
	← DevAntoine left	21:46
	← cyrus_mc_ left	21:46
	← ram19890 left	21:47
	← calcul0n left	21:48
	← zebrag left	21:52
	→ zebrag joined	21:52
	→ calcul0n joined	21:52
	← dsjdk left	21:53
	→ DevAntoine joined	21:54
	← p4trix left	21:55
	→ florekm joined	21:57
	← mindCrime left	21:57
	← DevAntoine left	21:58
	→ newton joined	22:00
	← florekm__ left	22:00
	← arcatech left	22:01
newton	is there a quick way to stage a change and amend it into a commit before the last commit? or just the rebase route	22:01
	dermoth_ → dermoth	22:01
thblt	newton: I know of nothing faster than !fixup then autosquash.	22:01
gitinfo	newton: So you lost or broke something or need to otherwise find, fix, or delete commits? Look at https://sukima.github.io/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!	22:01
thblt	fixup! sorry	22:02
newton	oooh, thank you :)	22:03
	→ DevAntoine joined	22:06
	← irrgit left	22:06
	→ john_johnk3 joined	22:07
	→ lbracher joined	22:08
newton	yeah that's a huge improvement on what I've been doing	22:08
	← john_johnk2 left	22:10
	← tiin57 left	22:10
	← DevAntoine left	22:10
	→ tiin57 joined	22:14
	← john_johnk3 left	22:15
	← gschanuel left	22:15
	→ gschanuel joined	22:16
	← ikwyl6 left	22:17
	→ Dotz0cat joined	22:18
	→ DevAntoine joined	22:18
	← minsec left	22:20
	→ minsec joined	22:20
	← CodeSlingerPaul left	22:22
	← DevAntoine left	22:22
	← imMute left	22:24
	→ imMute joined	22:25
	← thansen left	22:26
	→ thansen joined	22:27
	→ dpl joined	22:29
	← minsec left	22:30
	→ minsec joined	22:30
	→ DevAntoine joined	22:31
	→ crose joined	22:31
	→ ikwyl6 joined	22:31
	← tang^ left	22:33
	← gschanuel left	22:33
	→ gschanuel joined	22:34
	← DevAntoine left	22:35
	← lbracher left	22:36
	← gast0n left	22:38
	← jimmiehansson left	22:39
	← tiin57 left	22:40
	→ grimpeux joined	22:42
	→ DevAntoine joined	22:43
	→ tiin57 joined	22:44
	→ gast0n joined	22:45
	← Xiti left	22:46
	→ hololeap_ joined	22:46
	← DevAntoine left	22:48
	← hololeap left	22:50
	← ikwyl6 left	22:51
	← zebrag left	22:53
	← viko left	22:53
	→ lbracher joined	22:54
	→ impermanence joined	22:55
	← jetchisel left	22:56
impermanence	my feature branch is 1 commit ahead, 1 commit behind of master; my teammate's branch is 38 commits ahead of master; I need to get both these branches back to master sanely. What is the best approach for doing so?	22:56
	→ ferdna joined	22:57
	→ florekm__ joined	22:57
	→ ikwyl6 joined	22:58
	← florekm left	23:00
	→ arcatech joined	23:04
	→ Xiti joined	23:05
	← grimpeux left	23:06
	← gschanuel left	23:06
	→ grimpeux joined	23:07
	→ gschanuel joined	23:07
	← tiin57 left	23:10
	← impermanence left	23:10
	← arcatech left	23:10
	← gschanuel left	23:11
	→ tiin57 joined	23:14
	→ gschanuel joined	23:17
	← grimpeux left	23:19
	← lbracher left	23:20
	LordRyan → Daddy	23:20
	← ikwyl6 left	23:20
	→ jetchisel joined	23:21
	→ dpl_ joined	23:21
	← Cerise left	23:22
	← ghoti left	23:23
	→ Cerise joined	23:23
	← Cerise left	23:23
	→ Cerise joined	23:23
	← Gustavo6046 left	23:24
	← gschanuel left	23:24
	← dpl left	23:25
	→ gschanuel joined	23:26
	→ grimpeux joined	23:27
	← grimpeux left	23:27
	← shailangsa left	23:27
	← amahl left	23:28
	← kini left	23:29
	→ ikwyl6 joined	23:30
	→ kini joined	23:31
	→ AngryOwl4 joined	23:32
	← LionsMane left	23:32
	← AngryOwl left	23:34
	AngryOwl4 → AngryOwl	23:34
	→ vdamewood joined	23:34
	← ikwyl6 left	23:37
	→ kiweun joined	23:38
	→ Gustavo6046 joined	23:38
	→ shailangsa joined	23:39
	← tiin57 left	23:40
	← kiweun left	23:42
	→ tiin57 joined	23:43
	→ ikwyl6 joined	23:44
	Daddy → LordRyan	23:46
	→ mindCrime joined	23:57
	→ florekm joined	23:57
	← calcul0n left	23:58

Logs Search ←Prev date Next date→

Channels Documentation