如何在合并分支上压缩Git提交

Question

I usually never do this but this time I wound up with a feature branch that, for update purposes, got master merged into it (I usually favour rebase master on my feature branch to avoid useless merge commits).

And now I want to squash all commits of my feature branch into one before merging it as finalised to master but it is not as seamless as it usually is.

How can I do that?

Answer 1

Simplest way would be to merge all the changes as single commit using merge --squash

git checkout master
git merge --squash feature_branch
git commit -a

Note: However, this doesn't really do a merge. It is more akin to doing a single commit on master itself. That's why I always mention the name of the merged branch explicitly in commit message.