What are the differences between `--squash` and `--no-ff --no-commit`?

Viewed 33036

Which one should one use to hide microcommits?

Is the only difference between git merge --squash and git merge --no-ff --no-commit the denial of the other parents?

1 Answers
Related