rebase-plan

rebase-plan is a command for Claude Code from sigistry/marketplace. It costs 21 tokens per session (810 once invoked), scanned A, original, MIT.

A command that creates a step-by-step plan for an interactive git rebase, which reorganizes a branch's commits without running the rebase.

In plain words
What is it for?
Use it to decide which commits to keep, rename, combine, edit, or remove before rebasing onto another branch.
Why use it?
It makes a branch's history easier to review while identifying risks such as merge commits or commits that may already have been shared.

Command for Claude Code

Written for Claude Code: argument-hint in frontmatter. Also seen: model in frontmatter.

Part of the release-conductor plugin — 2 skills, 5 commands, 3 agents shipped together

Good fit Use it to decide which commits to keep, rename, combine, edit, or remove before rebasing onto another branch.

Compare 6 commands from other repositories ↓
Install with agentmods
npx agentmods add commands/sigistry/marketplace/rebase-plan
Install

Getting it into your agent

One page per mod, every tool's command on it. A separate URL per tool would split the same page into five that compete with each other.

Clone the repo
git clone --depth 1 https://github.com/sigistry/marketplace

Made for: Claude Code.

Or install release-conductor, the plugin that ships this one along with the rest of its 2 skills, 5 commands, 3 agents.

Wrote this? Show the measurements

A badge with what this costs and how it scanned, read live from this page, so it follows the numbers instead of freezing them. Markdown for a README, HTML for a documentation site or a project page.

agentmods badge for rebase-plan

README.md
[![agentmods](https://agentmods.dev/badge/commands/sigistry/marketplace/rebase-plan/github.svg)](https://agentmods.dev/commands/sigistry/marketplace/rebase-plan)
Your own site
<a href="https://agentmods.dev/commands/sigistry/marketplace/rebase-plan"><img src="https://agentmods.dev/badge/commands/sigistry/marketplace/rebase-plan/github.svg" alt="Measured on agentmods" height="20"></a>

Or the 80×15 button, for a site that already has a row of RSS and ATOM ones. Only the verdict fits; the numbers stay here.

agentmods 80×15 button for rebase-plan

Your own site · 80×15
<a href="https://agentmods.dev/commands/sigistry/marketplace/rebase-plan"><img src="https://agentmods.dev/badge/commands/sigistry/marketplace/rebase-plan.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 21 Only the description is in the session, so the agent can decide to use it. The body loads when it is invoked.
When invoked 810 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. A grade says what 26 rules found in the file — not that it is safe.
Origin original No closer match found in the catalogue.
Token cost

What it costs to keep this loaded

Counted locally with the o200k_base tokenizer, which is exact for GPT models; Claude uses its own tokenizer and its counts differ. Treat this as one consistent yardstick across the catalogue rather than a bill. Prices are per million input tokens.

ModelPer sessionOnce invoked
Fable 5.1 $0.00021 $0.00810
Opus 5 $0.00010 $0.00405
Sonnet 5 $0.00004 $0.00162
Haiku 4.5 $0.00002 $0.00081

Measured 5d ago against content hash c5ed57710a41, method: parsed. Prices are Anthropic first-party input rates as of 2026-09-08, from the pricing page.

Security

Grade A, and why

rebase-plan scanned grade A with 0 findings against 26 rules in 11 categories — prompt injection, anti-refusal, data exfiltration, privilege escalation, supply chain, agent snooping, system-prompt leakage, SSRF and excessive agency — measured 5d ago.

A static scan of the body, not an audit. Every finding is printed with the line that produced it so you can judge whether it matters here. A mod is markdown that instructs an agent; that is exactly why what it instructs is worth reading.

Nothing flagged

None of the 26 patterns this scan looks for appear in this file: no shell pipes, no recursive deletes, no credential paths, no hidden text, no instruction-override or anti-refusal phrasing, no agent-config snooping. That is not a guarantee, it is the absence of the things that are checkable.

plugins/release-conductor/commands/rebase-plan.md · 62 lines

How it starts

The opening of the file, as written. The whole thing — 62 lines — stays where its author put it; the contents beside it link to each section on GitHub.

Analyze the commits on the current branch and produce a concrete git rebase -i plan that yields a clean, reviewable history, with a plain-English rationale for every pick/reword/squash/fixup/drop and an explicit risk assessment. This command PLANS ONLY; it never runs the rebase. $ARGUMENTS optionally names the base branch.

Process

Step 1: Resolve the base and the commit range

  • Base = $ARGUMENTS if given, else the auto-detected default (origin/HEAD, then main/master/develop).
  • Range = git merge-base HEAD <base>..HEAD. Everything below operates on commits in this range only.

Step 2: Inventory the commits

  • git log --oneline --stat <merge-base>..HEAD: commits, messages, and files touched.
  • git log --format='%H %ci %an %s' <merge-base>..HEAD: dates and authors.
  • Note merge commits (git log --merges <merge-base>..HEAD), interactive rebase will linearize them; flag this.

Step 3: Assess what has already been shared

  • git rev-parse --abbrev-ref --symbolic-full-name @{upstream} and git log --oneline @{upstream}..HEAD: which commits are already pushed.
  • Any commit at or below the upstream tip has likely been seen by others. Rewriting it requires a force-push and can disrupt collaborators. Mark these clearly.

Step 4: Propose the rebase todo

Classify each commit and build the todo list:

Action Use when
pick The commit is good as-is
reword Good change, weak/incorrect message
squash Merge into the previous commit, combine messages
fixup Merge into the previous commit, discard this message (typo/wip follow-ups)
drop Debug prints, reverted experiments, accidental commits
edit The commit needs to be split or amended mid-rebase

Group fixups directly under the commit they belong to. Aim for a history where each surviving commit is one logical, buildable, reviewable change.

Step 5: Output the plan

Provide two things:

  1. The exact git rebase -i todo content, in order, that the user pastes into the editor:
pick a1b2c3d feat(api): add pagination
fixup e4f5g6h wip
reword h7i8j9k fix typo
drop k0l1m2n debug logging
  1. A numbered rationale, one line per changed action explaining why.

Read the full file on GitHub · 62 lines

Changes

What this file has done since we first saw it

Hashed on every crawl. A supply-chain change to an agent config is a question of when, not whether, so the history is kept rather than the latest state alone.

  1. 5d ago First seen · 62 lines · 21 tokens per session scan A c5ed57710a41

Subscribe to this mod's changes

rebase-plan is a command published in the GitHub repository sigistry/marketplace (3 stars, last pushed 4d ago), licensed MIT. It adds 21 tokens to every session and 810 once invoked, about $0.0001 per session on Opus 5. A static security scan graded it A with 0 findings. No closer match exists in the catalogue, so it is treated as the original; first seen 2026-09-03.