菜单
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.
默认使用会先检查来源的 Prompt；你也可以切换为直接命令，或下载本地副本。
决定是否安装前，请先阅读 SKILL.md，以及 SkillsMP 当前展示的配套文件。
用 Codex 或 Claude 帮你安装 复制这段 Prompt，粘贴到 Codex、Claude 或其他助手里，让它检查 Skill 页面并帮你完成安装。
直接命令不会经过审查 Prompt；运行前请先检查来源。
npx skills add https://github.com/ilonatommy/copilot-skills --skill commit-squashing命令会保持在同一行。复制前请横向滚动并检查完整内容。
想先保存到本地？可下载 SkillsMP 当前能够提供的文件。
正在显示 SKILL.md
基于 SOC 职业分类
| name | commit-squashing |
| description | 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. |
Helps squash multiple git commits into a single, well-structured commit to maintain a clean git history.
First, review the commits that will be squashed:
# 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
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 |
# Replace N with number of commits to squash
git rebase -i HEAD~N
In the editor that opens:
pick for the first (oldest) commitpick to squash (or s) for commits to combine# Find the commit to reset to (usually branch point)
git merge-base main HEAD
# Soft reset preserving changes
git reset --soft <commit-hash>
# Create new squashed commit
git commit -m "feat: your squashed commit message"
# From the target branch (e.g., main)
git merge --squash feature-branch
git commit -m "feat: merged feature with squashed commits"
Follow conventional commits format:
<type>(<scope>): <subject>
<body>
<footer>
Types: feat, fix, docs, style, refactor, test, chore
Example:
feat(auth): implement OAuth2 login flow
- Add OAuth2 provider configuration
- Create login/callback endpoints
- Implement token refresh logic
- Add user session management
Closes #123
If commits were already pushed, force push is required:
# Force push with lease (safer)
git push --force-with-lease
# Or standard force push
git push --force
⚠️ Warning: Only force push on branches where you're the sole contributor, or coordinate with your team.
Situation: You made 3 commits for one feature:
abc123 wip: started login formdef456 fix: typo in validationghi789 done: login form completeCommands:
git rebase -i HEAD~3
# Change to: pick abc123, squash def456, squash ghi789
# Save and write new message
Result: Single commit with clean message.
Situation: Feature branch has 10 messy commits, need to squash before merging to main.
Commands:
# Find where branch diverged
git merge-base main feature-branch
# Returns: 1a2b3c4
# Soft reset
git reset --soft 1a2b3c4
# Create clean commit
git commit -m "feat(dashboard): add analytics dashboard
- Implement chart components
- Add data fetching hooks
- Create dashboard layout
- Add unit tests"
# Force push
git push --force-with-lease
Situation: Squash went wrong, need to recover.
Commands:
# Find the commit before rebase in reflog
git reflog
# Reset to that state
git reset --hard HEAD@{n}
--force-with-lease: Safer than --force, prevents overwriting others' workProblem: Conflicts appear during interactive rebase Solution:
# Resolve conflicts in files, then:
git add .
git rebase --continue
# Or abort and try different approach:
git rebase --abort
Problem: Can't find original commits
Solution: Use git reflog to find and recover them
Problem: Remote rejects push because history diverged
Solution: Use git push --force-with-lease (only on your own branches!)
| Action | Command |
|---|---|
| View commits | git log --oneline -n 10 |
| Interactive rebase | git rebase -i HEAD~N |
| Soft reset | git reset --soft <commit> |
| Find branch point | git merge-base main HEAD |
| Force push safely | git push --force-with-lease |
| Undo rebase | git reset --hard HEAD@{1} |
| Check reflog | git reflog |