cuozg/git-squash
skills/git-squash/SKILL.md
Use this skill to squash a branch's commits into clean, logical units before merging a PR. Use it when the user wants to "clean up commits," "squash before merge," "combine WIP commits," or "make the history cleaner." Analyzes commit history, groups related changes, presents a squash plan for approval, then executes via interactive rebase. Do not use for amending a single commit — use git-comment for that.
$ install --global
skillsauthnpx skillsauth add cuozg/oh-my-skills git-squashInstall this skill globally with one command. Works with Claude Code, Cursor, and Windsurf.
Security Scan Results
3 of 9 scanners reported clean
Some scanners were skipped, did not run, or reported a non-clean status. Review each row below.
3
Scanners Passed
9
Scanners in report
Clean
TrivyContainer and dependency vulnerability scanner
95%
Clean
SemgrepStatic code analysis for vulnerabilities
95%
Clean
mcp-scan (Snyk)Model Context Protocol security validation
95%
Skipped
Snyk (dep)Open source security scanning
50%
Skipped
Socket.devSupply chain security analysis
50%
Skipped
VirusTotalMulti-engine malware detection
50%
Skipped
CrowdStrikeAdvanced threat intelligence
50%
Skipped
OSV-ScannerOpen Source Vulnerability database check
50%
Skipped
OWASP Dep-Check
50%
Last scanned: Apr 20, 2026, 8:37 AM13.1s1 file scanned
SKILL.md
- name:
- git-squash
- description:
- >
- author:
- kuozg
- version:
- 1.0
git-squash
Analyze a branch's commit history, group related commits into a squash plan, present it for approval, then execute with interactive rebase.
When to Use
- Cleaning up WIP commits before opening or merging a PR
- Combining fix-up and tweak commits into logical units
- Reducing commit noise in a feature branch
- Preparing a branch for a clean merge into main
Workflow
- Analyze — Run
git log --oneline origin/HEAD..HEAD(or base branch) to list all branch commits - Group — Cluster commits by logical concern: features, fixes, refactors, tests, docs
- Plan — Produce a squash table: group name → commits to combine → proposed message
- Present — Show the plan to the user and wait for explicit approval before touching history
- Execute — After approval, run
git rebase -iusing the plan; usesquash/fixupmarkers
Rules
- Never execute the squash without explicit user approval of the plan
- Never squash commits that have already been pushed to a shared remote branch
- Keep one logical commit per concern — do not over-squash unrelated changes
- Preserve the earliest commit's message as the base; rewrite for clarity
- Use imperative mood in squashed commit messages
Output Format
Squash plan shown to user → approval received → rebase executed → git log --oneline confirming the reduced history.
Reference Files
references/squash-workflow.md— step-by-step squash strategy and git rebase commands
Load references on demand via read_skill_file("git-squash", "references/{file}").
Related Skills
cuozg/unity-image-gen
tools
VerifiedTrustedCommunity
Generate Unity raster image assets through Unity MCP: game sprites, item art, backgrounds, UI icons, portraits, concept images, transparent cutouts, image edits, upscales, background removal, and Unity scene or Game View screenshots. Use when a Unity project needs image files imported under Assets or screenshots captured from the editor. Do not use for meshes, audio, animation, materials, gameplay code, UI Toolkit layout, or generic non-Unity image generation.
4SKILL.mdUpdated May 29, 2026
cuozg/unity-technical
tools
VerifiedTrustedCommunity
Create Unity technical solution documents from user requirements, feature ideas, bug goals, specs, or codebase problems. Use when the user asks for a technical approach, architecture, implementation strategy, solution options, feasibility analysis, system design, or "how should we build/fix this" for Unity runtime, Editor, tools, assets, data, UI, WebGL, SDKs, or production pipelines.
4SKILL.mdUpdated May 26, 2026
cuozg/unity-mcp-orchestrator
tools
VerifiedTrustedCommunity
Orchestrate Unity Editor via MCP (Model Context Protocol) tools and resources. Use when working with Unity projects through MCP for Unity - creating/modifying GameObjects, editing scripts, managing scenes, running tests, or any Unity Editor automation. Provides best practices, tool schemas, and workflow patterns for effective Unity-MCP integration.
4SKILL.mdUpdated May 21, 2026
cuozg/goal-todo
development
VerifiedTrustedCommunity
Convert a spec document into an implementation TODO list in the same spec folder. U se when the user says goal-todo, todo from spec, generate tasks from spec, turn this spec into todos, create implementation checklist, extract tasks, or asks to read a Docs/Specs design doc and produce what must be implemented. Includes UI/UX review and codebase investigation before writing the checklist. Do not use for implementing the tasks, creating new goal files, writing test cases, or verifying completed work.
4SKILL.mdUpdated May 21, 2026