Fixup changes in patches using fixup
While your changes are in the local repository you can make commit one on top of another and then merge them using git rebase git rebase --interactive HEAD~2 But once pushed we want to ammend the previous commit using fixups using git commit --fixup commitID git rebase -i --autosquash master