Tony Mattke published a blog post I wish I’d read 10 years ago. His Oh-Shit Toolkit includes several tools one can use after messing up Git branches or commit history.

Definitely worth reading, even if you’ve been working with Git for ages.