1. find a commit id you want to fix and a CID before that
2. commit changes as git commit --fixup <CID_to_fix>
3. rebase the commit as git rebase -i --autosquash CID_before_fix