Changing History, or How to Git pretty ⇥ Nice chart describing how to clean up various git messes. link