[jordanboxer]

  git commit —fixup=<commit-id> 
  git rebase -i —autosquash

This is my best friend

[tupton]

Then you will really like:

    git history fixup <commit-id>

https://git-scm.com/docs/git-history#Documentation/git-histo...