squash
Combining several commits into one, for example small fix-up commits into the commit they fix.
In more detail
In an interactive rebase, marking a commit squash melds it into the commit above and lets you edit the combined message; fixup does the same and keeps only the first message. Hosting services also offer a squash merge that turns a whole pull request into one commit.
Related terms
- interactive rebase — A rebase that first opens a todo list in your editor, letting you reorder, reword, squash or drop commits before they are replayed.
- rebase todo list — The text file an interactive rebase opens, one line per commit, where the first word says what to do with that commit.
Taught in
- Interactive Rebase: Squash, Reorder, Reword — Advanced Git Internals & Distributed Workflows