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

This is my best friend