News for hackers. Stuff that matters.
Re:Oh Shit, Git by dahart on Saturday June 25, 2022 @11:32AM (#31876051)
It’s the first thing in the article. Git reflog. (BTW you won’t get any disagreement from me about the lack of intuitiveness of the command name. But, in a way, git’s whole reason for existing is to undo, and almost everything you do in git can be undone by design.)
Re:Oh Shit, Git by rfiat on Saturday June 25, 2022 @03:21PM (#31877937)
The reflog is very helpful but I don't think it counts as an "undo". Some operations (like git add or git push) won't show up in the reflog.

Even the operations which do show will often require more thought to undo than a hypothetical "git undo" would. I know how to use the reflog but I often go out of my way to avoid it because "git branch tmp HEAD; git $POSSIBLE_MISTAKE; git reset ---hard tmp; git branch -D tmp" requires less effort than deciphering the reflog's output.

Re:Oh Shit, Git by dahart on Saturday June 25, 2022 @04:40PM (#31878559)
Git reflog absolutely counts as the first step of undo for several workflows, but you’re right there are other commands needed for some kinds of undo.

Undoing a push does require a different set of commands, but my point, to the question @amelius asked, is that you can undo both push and add, and whatever other mistake you’re thinking of, difficult or not.

Re:Oh Shit, Git by amelius on Saturday June 25, 2022 @03:09PM (#31877829)
Of course, but Git keeps track of everything you undo, which at the meta level is something you can't easily undo ...
Re:Oh Shit, Git by dahart on Saturday June 25, 2022 @04:36PM (#31878523)
Maybe I misunderstood your question, what were you asking about above?