- `git commit --fixup <commit>` - change contents of `<commit>`, leave message unchanged - `git commit --fixup amend:<commit>` - change contents and message of `<commit>` - `git commit --fixup --reword:<commit>` - change message of `<commit>`, leave contents unchanged - `git rebase --autosquash` - rebase changes