git-squash

Merge all commits from a specific branch into the current branch as a single commit

$ git squash [source_branch]

$ git squash [commit]

$ git squash HEAD~[n] "[message]"

$ git squash --squash-msg HEAD~[n]

git squash [-k|-kk] [number] [message]

-k, --keep-first
    Keep first commit message (default)

-kk, --keep-all
    Keep all commit messages in new message

number
    Commits to squash (default: 2)

message
    Custom commit message (overrides defaults)

The git squash command, from the git-extras extension, simplifies combining the last N commits into a single commit. It performs an interactive rebase, preserving changes while allowing a custom message. Ideal for cleaning up local history before pushing, such as fixing minor commits or typos. By default, it squashes 2 commits using the first commit's message. Use -k to keep the first message or -kk to append all messages. It updates the current branch and requires a clean working directory. Not part of core Git; install git-extras first.

Requires git-extras installed.
Rewrites history; unsafe for public/shared branches.
Clean working directory needed.

Linux: sudo apt install git-extras or yum install git-extras.
macOS: brew install git-extras.

git squash 3 (squash last 3).
git squash 3 "Fixed typos and updates".

Part of git-extras (2012), a GitHub-hosted toolkit by Linus Ægosth et al., enhancing Git workflow.

git-rebase(1), git-commit(1), git-reset(1)