git instafix is a tool that allows you to easily amend (or fix) previous Git commits.
How it works:
git add -p
.git-instafix
(or git instafix
, but this doesn't tab complete for me).git-instafix
will amend it and move you back to the HEAD commit.