Is there a difference between the --squash and --no-commit options of the git merge command?

Question

git

Good afternoon.
Is there a difference between --squash and --no-commit options in git merge?

Answer 1

There is a difference. In the case of squash, after the commit, in the history of the branch into which the merge was made, there will be only one commit (normal, with one parent), adding all the changes from the merged branches. If you make a commit after merge --no-commit, then it will be a normal merge commit, with multiple parents, and all merged patches can be found in the history separately.