uploaded from otxe6530::git-memo
git reset --soft HEAD^ #and move from that commit to staging
git reset --hard HEAD^ #and wipe changes, files aren't put in staging (reverted)
git reset --hard HEAD^^ #revert to 2 commits back
Here's a comforting quote from Scott Chacon: