Git Cheat Sheet/Squash merge

Stage combined branch changes without creating a merge commit.

Section: Merge, Rebase, and Commit Selection

Squash merge

bash
bash
git merge --squash feature/my-change

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 Merge, Rebase, and Commit Selection
Enable rerere
Reuse recorded resolution for repeated conflicts.
OpenIn sheetbash1 tag match
Set global user name
Set default author name.
Initialize repository
Create a new repository in the current directory.
Status short format
Compact status listing.
List all branches
Show local and remote-tracking branches.
List tags
Show local tags.