What is the difference between `git merge` and `git merge --no-ff`? What is the difference between `git merge` and `git merge --no-ff`? git git