this post was submitted on 07 Feb 2025
529 points (98.9% liked)

Programmer Humor

20429 readers
2674 users here now

Welcome to Programmer Humor!

This is a place where you can post jokes, memes, humor, etc. related to programming!

For sharing awful code theres also Programming Horror.

Rules

founded 2 years ago
MODERATORS
Feyter@programming.dev
anzo@programming.dev
BurningTurtle@programming.dev
pylapp@programming.dev
529
Commit (sh.itjust.works)
submitted 5 days ago by cm0002@lemmy.world to c/programmer_humor@programming.dev
24 comments fedilink hide all child comments
 
you are viewing a single comment's thread
view the rest of the comments
[–] muntedcrocodile@lemm.ee 38 points 5 days ago (1 children)

That's not a mistake git can do that to people. Especially those who have never used git via command line.

[–] NocturnalMorning@lemmy.world 11 points 5 days ago* (last edited 5 days ago) (3 children)

Yeah, imagine you accidently commit over weeks of work, or hell, if it's the main branch, and you deleted the other origin branch prior to merging, it could be a lot more than a few weeks worth of work. The revert to a previous commit... shutters.

[–] WimpyWoodchuck@feddit.org 14 points 5 days ago (2 children)

I don't know if you're joking, but in case you're not: git reflog and git reset --hard HEAD@{n} is your friend. You can undo almost anything. Deleted commits and branches aren't really deleted. Remotely deleted branches can be pushed again.

Except for an (accidental) git restore/git reset. Those are permanent and can't be undone.

[–] rooroo@feddit.org 4 points 5 days ago* (last edited 5 days ago)

Even git reset can be undone by a lot of editors. At least IntelliJ has an excellent local history that works much like git. Sure it’s a pain if you touched several files but that’ll teach you to atomify your commits.

Edit: Plus, git reset itself does nothing of note really, but I’m sure you know. Needs the —hardflag to do any meaningful damage.

[–] ulterno@programming.dev 1 points 4 days ago* (last edited 4 days ago)

Except for an (accidental) git restore/git reset. Those are permanent and can't be undone.

Unless, you didn't close your editor before doing so, in which case, you can just save it again.

I'm not talking about IDEs.
Even Kate gives you the option to either discard the deleted document/changes or keep them and save again.

[–] muntedcrocodile@lemm.ee 7 points 5 days ago (1 children)

Its even scarier when master branch is prod

[–] NocturnalMorning@lemmy.world 5 points 5 days ago* (last edited 5 days ago)

Don't tell me ghost stories right now, it's almost my bedtime.

[–] wise_pancake@lemmy.ca 4 points 4 days ago (1 children)

That’s when you call in a wizard.

They do git necromancy and sacrifice a goat to the reflog to recover your code

[–] verstra@programming.dev 2 points 4 days ago

Ah, yes, the reflog incantation. It is said that it can be performed only by those who have rebased on an hard reset origin.