Git Rebase Cheat Sheet/Squash commit into previous commit

Combine two commits and merge their messages.

Section: Interactive Rebase Actions

Squash commit into previous commit

text
text
squash d4e5f6g Follow-up fix
Explanation

`squash` merges the commit into the previous one and opens an editor to combine messages.

Learn the surrounding workflow

Compare similar commands or jump into common fixes when this command is part of a bigger troubleshooting path.

Related commands

Same sheet · prioritizing Interactive Rebase Actions
Keep commit as-is
Todo action to replay a commit normally.
OpenIn sheettextsame section
Change commit message during rebase
Replay the commit but edit its message.
OpenIn sheettextsame section
Stop to amend a commit during rebase
Replay the commit and pause so you can modify it.
OpenIn sheettextsame section
Fix up previous commit
Combine commit into previous commit and discard this commit message.
OpenIn sheettextsame section
Drop a commit during rebase
Omit a commit from the rewritten history.
OpenIn sheettextsame section
Edit rebase todo during a rebase
Open the rebase todo list while a rebase is in progress.
OpenIn sheetbash3 tag match