← ClaudeAtlas

recomposing-commitslisted

Use when commits on a feature branch are messy, out of logical order, mix unrelated changes, or need restructuring before a PR - also triggered by "clean up history", "reorganize commits", "recompose branch", "make commits logical", or similar
Stormix/transcripts-mcp · ★ 10 · Code & Development · score 79
Install: claude install-skill Stormix/transcripts-mcp
# Recomposing Commits ## Overview Analyze messy commits → isolate in a worktree → let user review → apply back. **Core principle:** The original branch is NEVER modified until the user explicitly approves the new history. Worktree isolation and the review gate are non-negotiable — even if the user says "just do it" or "I trust you, skip review." **Announce at start:** "I'm using the recomposing-commits skill to reorganize your branch history." --- ## Safety Check — Do This First ```bash git rev-parse --abbrev-ref HEAD ``` **Refuse immediately** if the current branch is any of: `main`, `master`, `dev`, `develop`, `development`, `staging`, `production`, `release`, or matches `release/*` or `hotfix/*`. ``` ⛔ Recomposing commits on '<branch>' is not allowed. This skill only works on feature branches. Please switch to your feature branch first. ``` Do NOT create a workaround branch. Do NOT proceed. Refuse and stop. --- ## When to Use - Commits are WIP/messy and a PR is coming - Multiple unrelated changes were mixed into the same commits - Commit messages are unclear ("fix", "WIP", "stuff") - Commits need to be split, merged, or reordered **Do NOT use when:** - History is already clean - You are on a protected/shared branch (refuse instead) - There is only one commit to restructure --- ## Workflow (Steps 1–8) ### Step 1: Show current history ```bash git log --oneline ``` Display the output to the user. ### Step 2: Ask for the start SHA ``` Which commit should