Smart Rebase

Smart partial rebase for squash-merge repositories. Auto-detect which commits to keep/drop when base branch was squash-merged into target. Use when: user says 'rebase', 'partial rebase', 'base already merged', 'smart rebase', or /smart-rebase. Not for: simple git rebase (the developer runs it — no skill executes rebase for them), merge conflict resolution (use /merge-prep), branch switching (the developer runs git checkout). Output: rebase plan table + a shell-quoted git rebase --onto command for the developer to run after the ambiguity check in Step 5.

sd0xdev Updated 194 repo stars
agentctl in a Claude Code session: a git push refused before it runs, a test pass gone stale after an edit, and the band above the prompt

File contents

sd0xdev/sd0x-dev-flow commit 64e4a6c4e1

Frequently asked questions

npx get-skill add sd0xdev/smart-rebase