rebase

rebase is a skill for Claude Code from flurdy/agent-skills. It costs 55 tokens per session (1,923 once invoked), scanned A, original, MIT.

A Git workflow for replaying the current branch's commits on top of an updated main branch or parent branch. Git branches are separate lines of development, and rebasing rewrites their commit order to use a newer starting point.

In plain words
What is it for?
Use it when main changes, a stacked parent branch changes, or a parent pull request has merged and the child branch must be moved onto the new base.
Why use it?
It helps update stacked or dependent branches while checking which commits belong to the child branch. Safety gates reduce the chance of rewriting dirty work or pushing an incorrect history.

Skill for Claude Code

Written for Claude Code: allowed-tools in frontmatter. Also seen: model in frontmatter; names the AskUserQuestion tool.

Good fit Use it when main changes, a stacked parent branch changes, or a parent pull request has merged and the child branch must be moved onto the new base.

Compare 6 skills from other repositories ↓
Install with agentmods
npx agentmods add skills/flurdy/agent-skills/rebase
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.

Any agent
npx skills add flurdy/agent-skills --skill rebase
Clone the repo
git clone --depth 1 https://github.com/flurdy/agent-skills

Made for: Claude Code.

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

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

Your own site · 80×15
<a href="https://agentmods.dev/skills/flurdy/agent-skills/rebase"><img src="https://agentmods.dev/badge/skills/flurdy/agent-skills/rebase.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 55 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 1,923 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.00055 $0.01923
Opus 5 $0.00028 $0.00962
Sonnet 5 $0.00011 $0.00385
Haiku 4.5 $0.00006 $0.00192

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

Security

Grade A, and why

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 3d ago.

The scan reads SKILL.md. This mod also ships 5 executable files (scripts/gh-pr-base-branch.sh, scripts/gh-pr-edit-base.sh, scripts/rebase-range.sh, …), listed below but not scanned — reading those needs a real analyzer, not pattern matching.

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.

skills/rebase/SKILL.md · 188 lines

How it starts

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

Rebase

One target-aware workflow for the three rebase situations. The commit range is always resolved by a read-only helper that refuses to guess; the rebase command is the one it prints, verbatim.

Usage

/rebase                                   # Infer the target from the recorded parent / PR base
/rebase main                              # Main moved; replay this branch on top
/rebase parent {parent-branch}            # Stacked parent was updated or force-pushed
/rebase merged {old-parent} [--old-tip {sha}]   # Parent PR merged; move onto main, child commits only

/rebase-main, /rebase-parent, and /rebase-merged-parent remain as aliases for the three explicit forms.

Requirements

  • git; gh only for target inference, old-tip recovery, and PR retargeting. Without gh, pass the target explicitly and skip step 9 with PR base: not checked (gh unavailable).
  • The helpers under ~/.agents/skills/rebase/scripts/ are read-only except gh-pr-edit-base.sh, which is only ever run behind the step 9 gate.

Instructions

1. Working tree gate

git branch --show-current
git status --porcelain

A detached HEAD stops the workflow. If the tree is dirty, use AskUserQuestion before anything else: Stash, Commit first, or Stop. Never rebase over uncommitted work.

2. Determine the target

An explicit argument wins. Otherwise infer, in this order:

git config --get branch.$(git branch --show-current).gh-merge-base   # recorded by /stack-branch
~/.agents/skills/rebase/scripts/gh-pr-base-branch.sh                 # PR base, if a PR exists
Evidence Mode
No recorded parent, and PR base is main or there is no PR main
Parent recorded or PR base is not main, parent PR still open parent {parent}
Parent recorded or PR base is not main, parent PR merged (gh pr view {parent} --json state) merged {parent}

If the evidence conflicts, gh is unavailable, or the parent PR state is unknown, ask once with AskUserQuestion showing the evidence and the three modes. Do not guess a mode.

Read the full file on GitHub · 188 lines

Files

What ships with it

5 files beside SKILL.md in the same directory: the scripts, references and assets a skill reads on demand. Not counted in the per-session cost; read them before you install if any of them is executable.

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. 3d ago First seen · 188 lines · 55 tokens per session scan A 25c07396eecd

Subscribe to this mod's changes

rebase is a skill published in the GitHub repository flurdy/agent-skills (9 stars, last pushed 4d ago), licensed MIT. It adds 55 tokens to every session and 1,923 once invoked, about $0.0003 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-08.

Related

Other skills, from other repositories

prowler-commit

Creates professional git commits following conventional-commits format. Trigger: When creating commits, after completing code changes, when user asks to commit.

prowler-cloud/prowler · 33 tokens

gh-auth-isolation

Safely manage multiple GitHub identities (EMU + personal) in agent workflows.

github/gh-aw · 20 tokens

comet-github

A routing guide for Comet-related GitHub work. It directs requests about pull requests, issues, CI failures, ideas, and fixes to the appropriate review or implementation process.

rpamis/comet · 72 tokens

github-skill

Work with GitHub via the gh CLI — clone repositories, create/list/merge pull requests, create/list issues, and run any other gh command (API calls, workflow runs, releases, repo administration). List operations return parsed JSON.

zeenie-ai/OpenCompany · 51 tokens

re0-merge

Review and land an external contribution the way this suite does: gate it against the thesis, land it with the author's credit intact, complete a new skill rather than merging it raw, then approve, credit, and explain before closing. Use when reviewing a pull request, as any collaborator or maintainer, not only the…

LilMGenius/paperthin · 70 tokens

nvca-chart-release

Release NVCA Operator chart changes from the native monorepo source to the vendored Helm chart. Use when updating the vendored NVCA Operator chart, changing NVCA image refs, publishing helm-nvca-operator, or validating the chart against a self-managed control plane.

NVIDIA/nvcf · 61 tokens