Um documento marcado com "git"

What is the difference between merge and squash and merge?