rebase-main

rebase-main is a command for Claude Code from sjungling/sjungling-claude-plugins. It costs 13 tokens per session (568 once invoked), scanned A, original, MIT.

A Git command workflow that rebases your current branch onto the latest main branch, including special handling for linked worktrees and uncommitted changes.

In plain words
What is it for?
Use it to stash local changes, fetch the latest main branch, rebase the current branch, and restore the stashed changes.
Why use it?
It reduces the risk of losing local edits or running into Git errors when updating a branch, especially when several worktrees share the same repository.

Command for Claude Code

Written for Claude Code: allowed-tools in frontmatter.

Part of the workflow plugin — 10 commands, 1 agent shipped together

Good fit Use it to stash local changes, fetch the latest main branch, rebase the current branch, and restore the stashed changes.

Compare 6 commands from other repositories ↓
Install with agentmods
npx agentmods add commands/sjungling/sjungling-claude-plugins/rebase-main
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/sjungling/sjungling-claude-plugins

Made for: Claude Code.

Or install workflow, the plugin that ships this one along with the rest of its 10 commands, 1 agent.

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-main

README.md
[![agentmods](https://agentmods.dev/badge/commands/sjungling/sjungling-claude-plugins/rebase-main/github.svg)](https://agentmods.dev/commands/sjungling/sjungling-claude-plugins/rebase-main)
Your own site
<a href="https://agentmods.dev/commands/sjungling/sjungling-claude-plugins/rebase-main"><img src="https://agentmods.dev/badge/commands/sjungling/sjungling-claude-plugins/rebase-main/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-main

Your own site · 80×15
<a href="https://agentmods.dev/commands/sjungling/sjungling-claude-plugins/rebase-main"><img src="https://agentmods.dev/badge/commands/sjungling/sjungling-claude-plugins/rebase-main.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 13 Only the description is in the session, so the agent can decide to use it. The body loads when it is invoked.
When invoked 568 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.00013 $0.00568
Opus 5 $0.00006 $0.00284
Sonnet 5 $0.00003 $0.00114
Haiku 4.5 $0.00001 $0.00057

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

Security

Grade A, and why

rebase-main 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 10d 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/workflow/commands/rebase-main.md · 65 lines

How it starts

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

Rebase the current branch against main. Follow this workflow exactly:

Step 1: Detect Environment

Run these commands to determine context:

!git rev-parse --show-toplevel !git worktree list !git branch --show-current !git status --porcelain

From these results, determine:

  • Current branch name (from git branch --show-current)
  • Is this a worktree? — If git worktree list shows more than one entry AND the current working directory is NOT the first (main) worktree listed, then we are in a linked worktree
  • Has uncommitted changes? — If git status --porcelain produces output
  • Main worktree path — The first entry in git worktree list (the bare/main worktree)

Step 2: Stash if needed

If there are uncommitted changes (staged or unstaged):

  1. Run git stash push -m "rebase-main: auto-stash before rebase"
  2. Remember that we stashed so we can pop later

Step 3: Rebase based on context

Case A: In a worktree

Fetch the latest main from origin and rebase against it. Do NOT try to update the local main ref — git refuses to update a branch that is checked out in another worktree.

  1. Run git fetch origin main
  2. Run git rebase origin/main

Case B: Not in a worktree, ON main branch

We're on main itself — rebase against origin:

  1. Run git fetch origin main
  2. Run git rebase origin/main

Case C: Not in a worktree, on a NON-main branch

Rebase against the local main branch:

  1. Run git rebase main

Step 4: Handle rebase conflicts

If the rebase fails due to conflicts:

  1. Report the conflicting files to the user
  2. Ask the user how they want to proceed: resolve conflicts, or abort with git rebase --abort
  3. Do NOT automatically resolve conflicts — wait for user guidance

Step 5: Restore stash

If we stashed changes in Step 2:

  1. Run git stash pop
  2. If the stash pop has conflicts, report them to the user

Step 6: Report results

Summarize what happened:

  • Which rebase case was used (worktree/main/branch)
  • Whether changes were stashed and restored
  • Current branch status after rebase

Read the full file on GitHub · 65 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. 10d ago First seen · 65 lines · 13 tokens per session scan A 50c44147c9a9

Subscribe to this mod's changes

rebase-main is a command published in the GitHub repository sjungling/sjungling-claude-plugins (13 stars, last pushed 27d ago), licensed MIT. It adds 13 tokens to every session and 568 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-08-30.