Glossary: Git Beyond the Basics

squash merge

Also written: --squash, Squash and merge

Merging a branch as one new commit; the branch's own commits don't come along. Kettle & Crane allows only this button on GitHub.