How to merge branches into one commit?

Question

git

The merger seems to be clear:

$ git checkout master
Switched to branch 'master'
$ git merge test

But what if I made a lot of commits to the test branch and when merging, all these commits are copied to master. How to make the merge be like a single committed commit to the master branch so that it can be easily rolled back later?

Answer 1

git merge --help
You need either --no-ff or --squash