This is one of my personal favourites of all time; an excellent guide to fixing all things gone wrong when using git.

It’s presented as a simple choose-your-own-adventure text guide; you can find it on:

On undoing, fixing, or removing commits in git