One doc tagged with "git"

What is the difference between merge and squash and merge?