Why does git merge sometimes create a commit, sometimes does not?

Question

When I do git merge from another branch to current workspace, git sometimes makes a new commit:

Merge remote-tracking branch xxx into xxx
         


        

Answer 1

You can use the --no-ff option to force a new commit to avoid the fast-forward.