Question

Sometimes I commit my changes and then suddenly remember that I forgot to add some comment or do some simple formatting, and having done that I do yet another commit. When it comes time to format a patch, I don’t want that “small changes” commit to become a separate patch. I want to take the last two commits and merge them to one patch as if they were a diff between current state and before I started committing.

Googling the issue didn’t help. How do I do this?

Answer 1

If you haven’t pushed your changes, use interactive git rebase and mark those commits as fixup:

git rebase -i HEAD~5

# opens editor with:
pick  deadbeaf commit
fixup abcd123  small change # edit this line to say "fixup", then save and exit editor
pick  3133715  another commit

Alternatively, if you discover you forgot some changes right after committing, add that change to the index and use git commit --amend to add it to your HEAD commit