Added `git reset --hard ORIG_HEAD` to my Dotfiles aliases today: https://github.com/bkuhlmann/dotfiles/commit/a86c06f3609049f167940e7d65dfce1c02895801
I rebase a LOT but sometimes I mess up. Usually, I use `git rebase --abort` or `git reflog` to undo but `git reset --hard ORIG_HEAD` is super handy for when you want to undo a rebase *after* it has finished.
I update the Conflict Resolution of my Git Rebase article to capture more details if it's of help: https://alchemists.io/articles/git_rebase#_conflict_resolution
Enjoy!








