smart-rebase
Installation
SKILL.md
Smart Rebase — Partial Rebase for Squash-Merge Repos
Analyze branch history → identify squash-merged commits → generate precise git rebase --onto command.
When NOT to Use
- Simple
git rebasewithout squash-merge complexity — the developer runs it; Claude never executesrebase, here or anywhere else (§ Permissions). "Use git directly" is an instruction to the human, and this list is read by the dispatcher before § Permissions loads, so it says so here - Merge conflict resolution (use
/merge-prep) - Branch management or switching — the developer runs the git command
- Cherry-picking specific commits (use
git cherry-pick)
Core Problem
In squash-merge repositories, when a feature branch is based on another branch that was already squash-merged: