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 rebase without squash-merge complexity — the developer runs it; no skill runs rebase for them, this one included, and the one credential that reaches it is the user's own message naming that execution (§ 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:

Installs
19
GitHub Stars
194
First Seen
Mar 9, 2026