rebase

Interactive Rebase

Rewrite the commits of the current branch: keep, squash, reword or drop each one.

$ARGUMENTS selects the range, or names a follow-up:

Argument	Meaning
N	the last N commits (HEAD~N)
<rev>	every commit since the merge base with <rev> — it edits those commits, it does not move the branch onto <rev>
X..Y	every commit since X
continue | skip | abort | status	act on a rebase that stopped on a conflict

The backend never opens an editor and never prompts. It prints one JSON object per call; you ask the questions and feed the answers back in. You write the message suggestions in Phase 3, and the user sees every one before it is used.

Phase 0: Follow-ups

If the argument is continue, skip, abort or status, run that mode and stop:

run `"${CLAUDE_PLUGIN_ROOT}/scripts/rebase.ts" {argument}`

Report step on success. On ok: false, report error and detail; when guidance is present, print every line of it. Then stop — no other phase runs.

exec-failed on continue or skip means a commit message was never applied and neither mode can replay it. Say so, and offer /git:rebase abort — never retry the same mode. backup_ref, when set, names the branch that still holds the history as it was before the rebase started.

Phase 1: Plan

run `"${CLAUDE_PLUGIN_ROOT}/scripts/rebase.ts" plan {argument}`
capture: exit_code, stdout, stderr

if stdout is empty OR is not valid JSON:
  STOP — report "rebase backend failed" with exit_code and stderr

plan = parse stdout as JSON

if plan.ok == false:
  STOP — report plan.error and plan.detail:
    not-a-git-repo             the command needs a git repository
    dirty-worktree             commit or stash first; detail lists the files
    rebase-already-in-progress finish it with /git:rebase continue, skip or abort
    invalid-range              detail says which revision was rejected

if plan.commits is empty:
  STOP — tell the user there is nothing to rebase in that range