How to squash last X commits together in git?

In this example, we’ll squash the last 3 commits. If you want to write the new commit message from scratch, this suffices:

$ git reset --soft HEAD~3 &&
$ git commit

If you want to start editing the new commit message with a concatenation of the existing commit messages, then you need to extract those messages and pass them to git commit:

$ git reset --soft HEAD~3 &&
$ git commit --edit -m"$(git log --format=%B --reverse [email protected]{1})"

Both of those methods squash the last three commits into a single new commit in the same way. The soft reset just re-points HEAD to the last commit that you do not want to squash. Neither the index nor the working tree are touched by the soft reset, leaving the index in the desired state for your new commit (i.e. it already has all the changes from the commits that you are about to “throw away”).

Leave a Reply