Git Squash

Git squash takes several commits, especially on feature branches with many small incremental commits, and combines them into one. This prevents clutter and presents a polished, easy-to-follow history to your team.

Git Squash-Merge Command Line

You can combine commits from a feature branch into a single commit and merge it into your current branch using:

git merge --squash feature-branch

This command condenses all commits from the feature branch into one that is applied onto your current branch. After squash merging, the repository history becomes cleaner and more organized.

How to Squash Commits

There are mainly two way:

1. Interactive Rebase Method

• Run:

git rebase -i HEAD~3

• An interactive editor opens listing the last 3 commits.
• Change pick to squash on commits you want to combine into the first one.
• Save and close the editor.
• Another editor opens where you can write a combined commit message.
• Save and exit to complete rebasing.

After this, your multiple commits will be combined into one.

2. Squashing with the --squash Option

• Create and switch to your target branch:

git checkout main

• Merge with squash option:

git merge --squash feature-branch

• Resolve any merge conflicts manually.
• Commit combined changes with a message:

git commit -m "Add group video calls and bug fixes"

• Push changes to the remote repository.

Squashing Last Two Commits

If you want to squash only the last two commits:

• Switch to your branch.
• Run:

git rebase -i HEAD~2

• Change pick to squash for the last commit.
• Save, update commit message as needed, and close the editor.

Git Squash vs Rebase