IRCloggy #git 2024-10-10

Logs Search ←Prev date Next date→ Channels Documentation

Provider of IRC logs since 2005.
WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

2024-10-10

→ ash_worksi joined00:00
← peirik__ left00:03
← Turn_Left left00:11
→ konsolebox joined00:14
→ peirik__ joined00:16
← techtruth left00:16
← peirik__ left00:21
← ferdna left00:21
→ techtruth joined00:22
← monkfish left00:28
← sentriz left00:28
→ sentriz joined00:33
← gsi left00:35
→ gsi joined00:37
→ cation joined00:38
→ peirik__ joined00:54
← peirik__ left00:59
← tomboy64 left01:02
→ tomboy64 joined01:05
→ Turn_Left joined01:08
← Turn_Left left01:13
← YuGiOhJCJ left01:23
← FreeBDSM left01:29
← x_x left01:32
← konsolebox left01:35
← Pixi left02:02
→ Gary_Sinise joined02:03
← skered left02:12
← agrmohit15 left02:12
← TomyLobo2 left02:15
→ skered joined02:16
→ martylake joined02:16
→ dermoth_ joined02:16
← dermoth left02:17
← pks left02:18
← techtruth left02:19
→ pks joined02:19
dermoth_ → dermoth02:21
→ Pixi joined02:23
→ techtruth joined02:24
← techtruth left02:24
→ techtruth joined02:24
→ agrmohit15 joined02:27
→ makidoll joined02:35
→ daddy joined02:40
→ konsolebox joined02:49
← skapata left02:50
→ JupiterBig joined02:51
→ hwpplayer1 joined02:55
← Oxymoron left02:57
← pedahzur left02:57
← gnoo left03:07
→ pedahzur joined03:17
← uco left03:23
← pedahzur left03:23
→ pedahzur joined03:24
→ uco joined03:26
← techtruth left03:28
← hdh left03:31
→ techtruth joined03:32
← techtruth left03:32
→ techtruth joined03:32
← pedahzur left03:36
← Betal left03:39
← thiago left03:44
← dlh404 left03:44
← bket left03:45
→ bket joined03:48
← Lord_of_Life left03:48
← chexum left03:55
→ chexum joined03:55
← dmc left03:56
→ dmc joined03:58
← PantelicGR left04:02
→ Lord_of_Life joined04:05
← hwpplayer1 left04:07
→ thiago joined04:08
→ Minvera2 joined04:10
← Minvera left04:10
← Minvera2 left04:14
← cmc left04:16
→ cmc joined04:17
← Gary_Sinise left04:18
→ pedahzur joined04:30
← Sazhen86 left04:32
→ Sazhen86 joined04:34
← JupiterBig left04:36
← Sazhen86 left04:39
← pedahzur left04:42
← trashbox left04:44
→ kale joined04:54
← kale left04:55
← saavedro left05:03
→ saavedro joined05:03
→ kale joined05:04
← nullroute left05:05
← bket left05:07
→ phogg joined05:08
← bloody left05:09
→ bket joined05:11
← hbautista left05:17
← jumpcutking left05:18
→ bloody joined05:18
→ Azin joined05:21
→ jumpcutking joined05:21
← SuperLag left05:24
← omero left05:25
→ SuperLag joined05:25
← SuperLag left05:25
→ SuperLag joined05:25
→ omero joined05:27
← acw left05:32
→ JTL joined05:34
← JTL left05:36
→ Chaser joined05:37
← R2robot left05:41
→ JTL joined05:43
← Azin left05:51
→ user_oreloznog joined05:58
→ jaredce joined06:18
← thiago left06:19
→ Azin joined06:19
→ peirik__ joined06:28
→ gandhibobandhi_ joined06:29
← peirik_ left06:31
→ theoceaniscool joined06:51
← ak-1_ left06:53
→ ak-1 joined06:53
← larryv left06:53
→ gnoo joined06:59
← chuanshi left06:59
← shalok left07:03
→ chuanshi joined07:03
→ jacklsw joined07:04
← codaraxis left07:08
← umbramalison left07:09
→ codaraxis joined07:09
→ umbramalison_alt joined07:09
→ rfuentess joined07:10
← jacklsw left07:16
← umbramalison_alt left07:16
→ umbramalison joined07:16
→ peirik_ joined07:17
→ becm joined07:20
→ rosco joined07:23
→ hwpplayer1 joined07:25
← P1ro left07:25
→ john_johnk joined07:26
→ P1ro joined07:26
→ Sazhen86 joined07:27
→ larryv joined07:33
→ oxymoron93 joined07:34
← chuanshi left07:37
→ happyleaf joined07:39
→ Karyon_ joined07:41
← Karyon left07:42
← oxymoron93 left07:45
← peirik_ left07:46
← Thanzex0 left07:55
← becm left07:58
→ becm joined07:58
← mns left07:59
→ mns joined08:02
← larryv left08:07
→ Thanzex0 joined08:07
← rfuentess left08:07
→ peirik_ joined08:10
← iomari891 left08:10
→ iomari891 joined08:11
→ chuanshi joined08:13
→ rfuentess joined08:14
← peirik_ left08:14
← iomari891 left08:15
← kale left08:15
← Azin left08:16
→ Azin joined08:23
← Azin left08:24
→ Azin joined08:24
→ x_x joined08:25
← hussein1 left08:27
← cmc left08:27
← ghost43 left08:27
← chiselfuse left08:27
← FinnElija left08:27
← x_x left08:27
→ ghost43 joined08:27
→ x_x joined08:27
→ FinnElija joined08:27
→ cmc joined08:27
→ chiselfuse joined08:28
→ hussein1 joined08:28
← gumnos left08:28
← becm left08:29
→ becm joined08:29
→ peirik_ joined08:31
→ R2robot joined08:31
→ gumnos joined08:31
← peirik_ left08:36
← Sazhen86 left08:39
→ speeder joined08:39
→ TomyWork joined08:43
→ peirik_ joined08:47
osse "fatal: options '-m' and '--fixup:amend' cannot be used together" why the flying fuck not, I wonder08:49
the whole point of --fixup=amend:foo is to replace foo's commit message with this one.08:50
← konsolebox left08:50
← Crispy left08:51
← peirik_ left08:52
→ peirik_ joined08:54
→ Artea joined08:55
← chiselfuse left08:57
→ chiselfuse joined08:57
← peirik_ left08:59
← becm left09:00
→ becm joined09:00
← intelfx left09:10
← hwpplayer1 left09:13
→ theyneversleep joined09:13
intelfx_ → intelfx09:15
← chuanshi left09:18
← codaraxis left09:21
→ codaraxis joined09:22
→ peirik_ joined09:23
mgedmin no? fixup is like squash except it discards the commit message of the second commit that you're squashing, and --fixup specifies the commit message so autosquash will know which commits to fixup with which other commits09:25
→ codaraxis__ joined09:28
← becm left09:31
→ becm joined09:31
← codaraxis left09:31
← peirik_ left09:31
→ chuanshi joined09:31
→ peirik_ joined09:43
← jim left09:44
← jinsun left09:51
→ jim joined09:52
→ jinsun joined09:53
→ alexherbo2 joined10:02
← becm left10:02
→ becm joined10:03
→ Left_Turn joined10:04
← rosco left10:09
← theyneversleep left10:22
→ spareproject joined10:22
← Non-ICE left10:30
→ intelfx_ joined10:34
← michele left10:35
← kaiseisei left10:36
→ michele joined10:39
osse mgedmin: recently --fixup gained some additional powers. now you can do --fixup=amend: and --fixup=reword:10:51
mgedmin ooh10:52
→ intelfx__ joined10:54
← intelfx__ left10:55
← spareproject left10:55
kurahaupo mgedmin: fixup not only discards the message from the second commit, it keeps all the author & date from the first commit10:55
← intelfx_ left10:58
→ jmd joined10:58
← becm left11:02
→ becm1 joined11:02
→ spareproject joined11:04
→ tom_ joined11:04
becm1 → becm11:05
← tom_ left11:06
→ tom_ joined11:06
→ jpw_alt joined11:12
← jpw left11:13
jpw_alt → jpw11:13
← jpw left11:13
→ jpw joined11:13
← tom_ left11:15
← spareproject left11:17
← mingdao left11:19
→ dlh404 joined11:24
→ spareproject joined11:25
→ Nixkernal joined11:31
osse I need to programatically edit the commit messages of the N latest commits. --fixup=reword/amend would be perfect but for some reason it forces interactivity11:32
abuse GIT_EDITOR perhaps...11:33
← alexherbo2 left11:33
→ alexherbo2 joined11:34
→ tom_ joined11:35
← tom_ left11:38
→ rosco joined11:40
→ weko joined11:40
← becm left11:43
→ becm1 joined11:43
→ mingdao joined11:43
becm1 → becm11:45
→ Betal joined11:47
← FH_thecat left11:48
← mingdao left11:51
→ mingdao joined11:52
osse Yes, that worked. But even easier since I do this programatically anyway: Manually craft the subject11:55
← memset left11:59
→ npc joined12:01
→ memset joined12:02
← user_oreloznog left12:02
← spareproject left12:03
→ gandhibobandhi__ joined12:05
← gandhibobandhi_ left12:08
→ FH_thecat joined12:09
→ codaraxis___ joined12:13
← becm left12:14
→ becm joined12:14
← codaraxis__ left12:16
← codaraxis___ left12:18
← arahael left12:21
← npc left12:22
← intelfx left12:25
→ intelfx joined12:25
← Azin left12:28
→ jensen1 joined12:28
← speeder left12:30
← jaredce left12:32
→ konsolebox joined12:32
→ arahael joined12:40
← Left_Turn left12:43
→ iomari891 joined12:44
← becm left12:44
→ jaredce joined12:44
→ becm1 joined12:45
→ Azin joined12:47
becm1 → becm12:47
← jaredce left12:50
→ trashbox joined12:52
← iomari891 left12:53
← Chaser left12:53
→ Chaser joined12:56
→ jaredce joined13:00
← agrmohit15 left13:01
→ agrmohit15 joined13:02
← techtruth left13:03
→ techtruth joined13:08
→ Left_Turn joined13:09
← Chaser left13:11
→ speeder joined13:13
← peirik_ left13:18
→ arahael_ joined13:25
← Azin left13:27
→ hwpplayer1 joined13:28
→ spareproject joined13:30
← alexherbo2 left13:31
← samuelbernardo left13:32
→ samuelbernardo joined13:38
← konsolebox left13:38
← arahael left13:39
← arahael_ left13:39
→ arahael joined13:40
→ Chaser joined13:40
→ codaraxis joined13:46
← Lord_of_Life left13:49
→ Lord_of_Life joined13:49
← RiFo left13:53
← Chaser left13:54
→ RiFo joined13:57
→ Minvera joined13:57
→ shalok joined13:59
→ AmR_ joined14:00
→ thiago joined14:04
← ak77 left14:07
← FH_thecat left14:08
→ FH_thecat joined14:08
→ Non-ICE joined14:11
→ ak77 joined14:11
← thiago left14:19
→ Azin joined14:20
→ konsolebox joined14:20
← gildasio left14:20
→ Turn_Left joined14:26
→ gildasio joined14:28
← Left_Turn left14:30
→ hseg joined14:31
← hseg left14:33
← Lord_of_Life left14:38
→ Lord_of_Life joined14:39
← dsimic left14:41
→ dsimic joined14:42
← theoceaniscool left14:43
← peirik__ left14:44
→ peirik_ joined14:46
→ ___nick___ joined14:46
jensen1 → aof14:47
← ___nick___ left14:47
← bket left14:49
→ ___nick___ joined14:49
→ user_oreloznog joined14:50
→ bket joined14:51
← arahael left14:55
← intelfx left14:55
← speeder left14:57
→ intelfx joined14:57
→ gast0n joined14:58
→ paddymahoney joined14:59
← happyleaf left15:00
→ Chaser joined15:03
← user_oreloznog left15:06
← Lord_of_Life left15:06
→ Lord_of_Life joined15:07
→ thiago joined15:07
← Lord_of_Life left15:09
→ Lord_of_Life joined15:13
→ ChmEarl joined15:15
← rfuentess left15:16
→ skapata joined15:24
← Chaser left15:33
← peirik_ left15:37
→ peirik_ joined15:38
pikapika_lunar → militantorc15:43
← jaredce left15:45
→ peirik__ joined15:55
→ user_oreloznog joined15:56
→ Chaser joined15:57
→ jaredce joined15:58
← peirik_ left15:59
← hwpplayer1 left16:02
← peirik__ left16:02
→ peirik_ joined16:03
← jaredce left16:03
→ becm1 joined16:07
← becm left16:10
becm1 → becm16:10
← john_johnk left16:13
→ fonini joined16:22
← rosco left16:23
← fundatillus left16:26
← Lord_of_Life left16:26
→ fundatillus joined16:26
← konsolebox left16:29
→ Lord_of_Life joined16:30
← fundatillus left16:34
→ fundatillus joined16:34
dfg how can i manually split a patch (like with interactive git add -p) generated from git diff16:40
← ___nick___ left16:42
→ pedahzur joined16:44
→ FreeBDSM joined16:45
BtbN What do you mean?16:46
If you want to split a commit into two, the usual approach would be to reset to before it, and then make two new commits16:46
dfg im looking for some way to split an existing patch (much like add -p)16:47
AmR_ → AmR16:50
→ wootehfoot joined16:50
bremner git you can use "git reset -p" to "uncommit" part of a corresponding commit16:50
→ ___nick___ joined16:51
→ peirik__ joined16:54
→ epicout joined16:54
← epicout left16:56
FreeBDSM is there any article/manual explaining how to unfuck a repo that you mistakenly `git reset ${something} && git push --force`ed to?16:56
today I removed way too many commits that way, more than I wanted16:56
← peirik_ left16:56
FreeBDSM luckily I had a copy of the repo with all those commits in another dir, so I quickly restored, but I was walking on thin ice of maybe having to go looking for a new job16:57
→ bn_work joined16:57
FreeBDSM I know I should've used `git log` first to confirm that my log looks the way I want it to before forcing a push, but still, what if I already screwed up - how to unscrew it?16:58
→ lemuria joined16:59
aof `git diff stash@{1}` <-- doesn't this `diff <working tree> <stash@{1}`? how come if i change a file and run the command again, it's not reflecting any changes? so it's diffing against HEAD?17:01
← becm left17:02
← codaraxis left17:03
→ aiyunyuner45 joined17:07
← aiyunyuner4 left17:09
aiyunyuner45 → aiyunyuner417:09
← gandhibobandhi__ left17:09
← peirik__ left17:10
→ peirik_ joined17:11
→ hdh joined17:11
← Elodin left17:13
→ goldfish joined17:26
aof nvmd17:28
← Chaser left17:31
→ fofoni joined17:32
← goldfish left17:32
→ Chaser joined17:33
← fonini left17:36
← Chaser left17:37
← Traneptora left17:39
← jinsun left17:40
← AmR left17:46
→ peirik__ joined17:47
← peirik_ left17:47
← peirik__ left17:47
→ peirik_ joined17:48
← peirik_ left17:54
→ peirik_ joined17:54
← Lord_of_Life left17:54
← spareproject left17:57
→ Traneptora joined18:02
← peirik_ left18:08
← user_oreloznog left18:08
→ peirik_ joined18:08
← Juest left18:09
→ user_oreloznog joined18:09
→ peirik__ joined18:11
→ gh34 joined18:12
← brw9 left18:12
← techtruth left18:13
→ brw9 joined18:13
← peirik__ left18:16
← peirik_ left18:16
→ peirik_ joined18:17
← peirik_ left18:21
→ Juest joined18:21
→ peirik_ joined18:21
← P1ro left18:23
→ techtruth joined18:25
← techtruth left18:25
→ techtruth joined18:25
→ Lord_of_Life joined18:32
← Lord_of_Life left18:40
→ Lord_of_Life joined18:40
← peirik_ left18:41
→ peirik_ joined18:42
→ P1ro joined18:42
← Lord_of_Life left18:43
→ Lord_of_Life joined18:44
→ peirik__ joined18:45
← peirik_ left18:47
→ peirik_ joined18:47
← Lord_of_Life left18:49
← peirik__ left18:50
→ codaraxis joined18:51
→ Lord_of_Life joined18:51
← Lord_of_Life left18:54
→ Lord_of_Life joined18:55
→ peirik__ joined19:01
← P1ro left19:02
→ P1ro joined19:04
→ john_johnk joined19:05
bookworm FreeBDSM: git reflog, git reset @{$num}19:14
with --hard probably if you want to go back there19:14
→ Elodin joined19:21
b0nn FreeBDSM: Your best bet is to put some protections on that repo, no forced pushes to the "main" branch, only allow branches19:24
Once a repo has been forced push, the only way to "undo" is either have a copy somewhere of the preferred state (which you had) or, HOPE the person that forced push can use their reflog to undo the state change (reflog is local only, nobody else will be able to use their reflog, and the repo will will not have a reflog that reflects the state before the force)19:27
→ Sazhen86 joined19:27
← memset left19:28
→ memset joined19:28
→ bombastick joined19:31
bookworm given that the reflog only clears after 30 days or so unless your an idiot that'd be the norm though19:32
you're*19:32
bombastick Hi guys. What possible reason could there be for git allowing me to make commits in detached head mode? When modifying a submodule I always forget to pay attention, make a new commit, try to push it, "oh wait I'm in detached head", undo the commit, 'git checkout master' (even though the detached HEAD was pointing at the latest commit in master already), readd, recommit. It's annoying.19:32
ikke 90 days fyi19:33
bookworm to test things out19:33
bombastick I asked ChatGPT about a configurtation option and it told me there isnt any, and to use a precommit hook. So there must be some good reason it lets you make commits on detached head?19:33
b0nn bombastick: I have a repo where I am almost always in detached head because there are two commits in my local version that I do NOT want in the remote version19:34
I *should* clean it up, but I am too lazy19:34
← Elodin left19:35
bombastick b0nn: interesting. what's in those commits? dev stuff?19:35
b0nn It's actually work that I did on mylocal main without branching, but the work is incomplete and blocked so cannot be pushed to remote19:36
→ Elodin joined19:37
b0nn As I say, it could and should be cleaned up, but laziness prevails19:37
← cmc left19:38
→ cmc joined19:38
FreeBDSM b0nn, to rewrite history in remote origin's master branch I had to temporarily remove those blocks...19:38
only to screw up big time19:38
b0nn heh19:38
I mean, there is cases (eg. someone has committed Auth keys) where that needs to be done, but yeah, have a spare copy handy is best practice until you get the hang of reflog19:39
bombastick If they achieve nothing else, AI LLMs at least made using git bearable, and so have been worth it19:42
j416 ...until it gives you the wrong command19:44
bombastick I'll cross that bridge when I get to it19:44
→ wobbol joined19:45
b0nn bombastick: FTR, your best bet with git is the same as every other skill, the best way to learn is practice practice practice - AI, like Stackoverflow, or Google, is helpful, only if you know what it's telling you19:46
s/know/understand19:46
→ AmR joined19:53
← Azin left19:56
→ larryv joined20:02
← jmd left20:04
← ___nick___ left20:04
← maxel left20:07
→ hbautista joined20:07
→ dlh4041 joined20:07
← dlh404 left20:08
→ HelloShitty joined20:18
← gh34 left20:19
→ pabogr joined20:32
← codaraxis left20:32
← AmR left20:33
← wootehfoot left20:37
← peirik_ left20:41
→ peirik_ joined20:41
← mven97 left20:46
→ redlegion joined20:51
← peirik_ left20:52
→ peirik_ joined20:52
← TomyWork left20:54
← peirik__ left20:57
→ Left_Turn joined21:04
→ mven97 joined21:05
← fofoni left21:06
← Turn_Left left21:07
← stagas left21:07
→ stagas_ joined21:07
← pabogr left21:11
← Vonter left21:20
→ fofoni joined21:21
→ Vonter joined21:22
→ newpy joined21:22
→ peirik__ joined21:23
→ marc2377 joined21:41
← peirik__ left21:44
← peirik_ left21:46
→ peirik_ joined21:46
→ tuxott joined21:50
← kjartan left21:56
← stwange left22:00
← peirik_ left22:00
→ epicout joined22:00
← epicout left22:00
→ epicout joined22:00
→ peirik_ joined22:00
→ stwange joined22:01
→ kjartan joined22:02
→ monkfish joined22:05
→ fo9 joined22:05
← fofoni left22:09
← Sazhen86 left22:10
← techtruth left22:10
→ hwpplayer1 joined22:10
← Elodin left22:11
→ Sazhen86 joined22:15
→ techtruth joined22:17
← fo9 left22:18
← IceMicha- left22:19
→ fishmonk joined22:24
← memset left22:25
→ memset joined22:26
→ IceMicha- joined22:26
→ Elodin joined22:26
→ Crispy joined22:26
← x_x left22:26
→ peirik__ joined22:27
← monkfish left22:27
← cmc left22:29
→ cmc joined22:30
→ intelfx_ joined22:33
← intelfx left22:33
→ iomari891 joined22:37
intelfx_ → intelfx22:38
← thiago left22:38
← Left_Turn left22:39
← bn_work left22:40
← FreeBDSM left22:44
← P1ro left22:48
← ikwyl6 left22:48
→ ikwyl6 joined22:50
→ P1ro joined22:53
→ arahael joined22:56
← ikwyl6 left23:02
← epicout left23:02
← weko left23:02
← john_johnk left23:04
→ ikwyl6 joined23:10
→ fonini joined23:21
← Elodin left23:24
← aminvakil left23:29
→ vrach joined23:29
→ aminvakil joined23:31
← hwpplayer1 left23:36

Logs Search ←Prev date Next date→ Channels Documentation