# Commit Squashing > Squashes multiple git commits into a single commit with a clean message. Use when cleaning up commit history, combining WIP commits, preparing branches for merge, tidying feature branches, or when asked to squash, combine, or consolidate commits. - Skill: `ilonatommy/commit-squashing` (Agent Skill) - Install (CLI): `npx skillmds@latest add ilonatommy/commit-squashing` - Raw SKILL.md: https://api.skillmd.com/api/skills/ilonatommy/commit-squashing/raw - Safety review: pending - Works with: Claude Code, Claude.ai, OpenAI Codex - Category: Coding & Dev Tools - Author: ilonatommy (https://skillmd.com/u/ilonatommy) - Updated: 2026-09-22 - Page: https://skillmd.com/skills/ilonatommy/commit-squashing --- # Commit Squashing Skill Helps squash multiple git commits into a single, well-structured commit to maintain a clean git history. ## When to Use This Skill - Cleaning up a feature branch before merging to main - Combining multiple WIP/fix commits into one logical commit - Preparing a pull request with clean commit history - User explicitly asks to "squash", "combine", or "consolidate" commits ## Prerequisites - Git installed and available in PATH - Working directory is a git repository - Commits to squash are on the current branch ## Step-by-Step Process ### Step 1: Analyze Current Commit History First, review the commits that will be squashed: ```powershell # Show last N commits with summary git log --oneline -n 10 # Show with more detail git log --pretty=format:"%h %s%n%b" -n 10 ``` ### Step 2: Determine Squash Strategy Choose the appropriate method based on the situation: | Scenario | Method | |----------|--------| | Squash last N commits | Interactive rebase: `git rebase -i HEAD~N` | | Squash into specific commit | Interactive rebase to that commit | | Squash all commits on branch | Soft reset + recommit | | Squash before merge (PR) | Merge with `--squash` flag | ### Step 3: Execute the Squash #### Method A: Interactive Rebase (Most Flexible) ```powershell # Replace N with number of commits to squash git rebase -i HEAD~N ``` In the editor that opens: 1. Keep `pick` for the first (oldest) commit 2. Change `pick` to `squash` (or `s`) for commits to combine 3. Save and close 4. Edit the combined commit message when prompted #### Method B: Soft Reset (Quick for All Branch Commits) ```powershell # Find the commit to reset to (usually branch point) git merge-base main HEAD # Soft reset preserving changes git reset --soft # Create new squashed commit git commit -m "feat: your squashed commit message" ``` #### Method C: Merge Squash (For PRs) ```powershell # From the target branch (e.g., main) git merge --squash feature-branch git commit -m "feat: merged feature with squashed commits" ``` ### Step 4: Craft a Good Commit Message Follow conventional commits format: ``` ():