How can I git squash commits to combine my last N commits into a single commit?

General Discussions
, ,
1

How can I git squash commits to combine my last N commits into a single commit?

I want to merge multiple recent commits into one to keep my Git history clean. What is the correct way to git squash commits while preserving important changes?

2

I’ve done this countless times—interactive rebase is my go-to for squashing commits.

:small_blue_diamond: Run: git rebase -i HEAD~N (Replace N with the number of commits)

:small_blue_diamond: Change pick to squash (s) for all but the first commit

:small_blue_diamond: Edit the commit message when prompted

:small_blue_diamond: Save & exit to complete the rebase

Boom! Clean history. :white_check_mark:

3

Yep, interactive rebase is solid, but sometimes I prefer a quicker way using git reset.

:one: git reset --soft HEAD~N (Keeps changes staged)

:two: git commit -m "Squashed commit message"

This method lets you squash commits without an interactive editor. Great for quick fixes! :zap:

4

Good points! But what if you’re working on a feature branch? I like using git merge --squash:

:small_orange_diamond: Switch to main: git checkout main

:small_orange_diamond: Merge with squash: git merge --squash feature-branch

:small_orange_diamond: Commit: git commit -m "Merged and squashed feature-branch"

Super useful before merging PRs! Keeps things neat. :dart: