Undo & History

How to Squash Multiple Commits into One with Git Rebase

Combine multiple messy "wip" or "fix typo" commits into a single clean, atomic commit.

Instant 1-Line Solution

Reversible (History Change)Intermediate

git rebase -i HEAD~N

When to use this scenario:You have 5 commits on your feature branch like "fix typo", "oops", "wip test" and want to clean up your PR history before merging.

Step-by-Step Execution Guide

1Start interactive rebase for last N commits

git rebase -i HEAD~3

Opens your editor displaying the last 3 commits with "pick" next to each.

2Change "pick" to "squash" or "s"

# pick a1b2c3d First commit
# s d4e5f6a Second commit
# s g7h8i9j Third commit

Keep the first commit as "pick", and change subsequent commits to "squash" (or "s") to merge them into the first.

3Save and write a consolidated commit message

:wq

Git prompts you to enter a single unified commit message for all squashed changes.

Critical Pitfalls & Precautions

•Do not squash commits that have already been merged into a shared production branch.

Frequently Asked Questions

Squash Commits (Rebase) - Frequently Asked Questions

Common questions about safe rollback, remote history implications, and troubleshooting.

Run "git rebase --abort". Your repository will return to the exact state it was in before starting the rebase.

Related Git Command Guides

Browse All Git Recipes

Undo & HistorySafe

How to Undo the Last Commit in Git

Undo your most recent Git commit while keeping all your edited files staged or unstaged in your working directory.

Undo & HistoryDestructive

How to Discard All Local Changes in Git

Discard all unstaged and uncommitted file modifications and restore your working tree to the latest commit.

Branches & TagsSafe

How to Rename a Local and Remote Git Branch

Rename your current local branch and update the upstream remote tracking branch on GitHub or GitLab.

Branches & TagsReversible

How to Delete a Remote Branch in Git

Delete a branch from remote origin (GitHub, GitLab, Bitbucket) after a pull request has been merged.

Undo & HistorySafe

How to Change the Most Recent Git Commit Message

Amend the commit message of your latest commit before or after pushing.

Undo & HistorySafe

How to Unstage Files from Git (Undo git add)

Remove files from the Git staging area (index) without losing any of your local changes.