git-rebase

git-rebase is a skill for Claude Code from motlin/claude-code-plugins. It costs 19 tokens per session (225 once invoked), scanned A, original, Apache-2.0.

A procedure for rebasing local commits onto the configured upstream branch, moving your work on top of the latest upstream history.

In plain words
What is it for?
It helps update local commits, stop safely when the working tree is not clean, and route merge conflicts to a dedicated conflict-resolution workflow.
Why use it?
It checks for uncommitted changes first and uses a fixed workflow, reducing the risk of rebasing the wrong repository state.

Skill for Claude Code

Written for Claude Code: ${CLAUDE_PLUGIN_ROOT} variable. Also seen: mentions Claude Code; mentions Codex.

Runs only inside its plugin — its command needs a path that Claude Code sets for a plugin’s own hooks and for nothing else. Install the plugin, not this.

Part of the git plugin — 12 skills shipped together

Good fit It helps update local commits, stop safely when the working tree is not clean, and route merge conflicts to a dedicated conflict-resolution workflow.

Compare 6 skills from other repositories ↓
Install

Getting it into your agent

This one installs as part of its plugin. Adding the marketplace and installing the plugin brings it with everything else the plugin ships.

Claude Code
/plugin marketplace add motlin/claude-code-plugins
Claude Code
/plugin install git

Made for: Claude Code.

Or install git, the plugin that ships this one along with the rest of its 12 skills.

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 git-rebase

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

Your own site · 80×15
<a href="https://agentmods.dev/skills/motlin/claude-code-plugins/git-rebase"><img src="https://agentmods.dev/badge/skills/motlin/claude-code-plugins/git-rebase.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 19 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 225 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.00019 $0.00225
Opus 5.5 $0.00008 $0.00090
Sonnet 5.5 $0.00004 $0.00045
Haiku 4.5 $0.00002 $0.00022

Measured 9d ago against content hash 7108694232a8, method: parsed. Prices are Anthropic first-party input rates as of 2026-10-07, from the pricing page.

Security

Grade A, and why

git-rebase 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 9d 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/git/skills/git-rebase/SKILL.md · 28 lines

What it actually says

Git Rebase

Resolve <plugin-root> before running plugin scripts:

  • In Claude Code, use ${CLAUDE_PLUGIN_ROOT}.
  • In Codex, use the plugin root that contains this skills/git-rebase/SKILL.md file.

Run git status. If there are uncommitted changes, stop and report them.

Then run exactly this, with no added arguments or environment overrides:

<plugin-root>/scripts/rebase

The script reads the project's configured upstream remote and branch. Other rebase commands pick the wrong base: git rebase and git replay don't know the upstream, and git pull --rebase and git rebase @{upstream} use the branch's tracking info, such as origin/<current-branch>.

Outcomes

  • Success: report success.
  • Merge conflicts: use the git:conflicts skill.
  • Other errors: report the specific error and stop.
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. 9d ago Changed 7108694232a8
  2. 22d ago Changed · -4 lines 3ecf7d7b5df6
  3. 1mo ago Changed 6ac35abfc4ba
  4. 1mo ago First seen · 32 lines · 19 tokens per session scan A dddfb5077d1f

Subscribe to this mod's changes

git-rebase is a skill published in the GitHub repository motlin/claude-code-plugins (20 stars, last pushed yesterday), licensed Apache-2.0. It adds 19 tokens to every session and 225 once invoked, about $0.0001 per session on Opus 5.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.