git commit -m "Something terribly misguided" git reset HEAD~ [ edit files as necessary ] git add . git commit -c ORIG_HEAD