rebase

rebase is a skill for Claude Code, Codex from JHostalek/dotclaude. It costs 24 tokens per session (237 once invoked), scanned A, original, CC0-1.0.

A Git operation that reapplies the commits on your current branch on top of another branch, creating a straight-line history instead of a merge commit. It is commonly used to bring a feature branch up to date before sharing it.

In plain words
What is it for?
Use it when updating a branch from another branch or preparing a clean branch history for pushing. It handles conflict resolution, migration reconciliation when needed, quality checks, and a lease-protected force push.
Why use it?
It reduces branch-history clutter and can expose conflicts before the changes are pushed. This skill also accounts for database migration files and runs the repository's configured quality checks after the history is rewritten.

Skill for Claude CodeCodex

Part of the jhostalek-skills plugin — 32 skills, 12 agents shipped together

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.

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

Made for: Claude Code, Codex.

Or install jhostalek-skills, the plugin that ships this one along with the rest of its 32 skills, 12 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

README.md
[![agentmods](https://agentmods.dev/badge/skills/jhostalek/dotclaude/rebase.svg)](https://agentmods.dev/skills/jhostalek/dotclaude/rebase)
Your own site
<a href="https://agentmods.dev/skills/jhostalek/dotclaude/rebase"><img src="https://agentmods.dev/badge/skills/jhostalek/dotclaude/rebase.svg" alt="Measured on agentmods" height="20"></a>
Per session 24 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 237 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. Scan, not verified.
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 $0.00024 $0.00237
Opus 5 $0.00012 $0.00118
Sonnet 5 $0.00005 $0.00047
Haiku 4.5 $0.00002 $0.00024

Measured 4d ago against content hash eade9adb84f3, method: parsed. Prices are Anthropic first-party input rates as of 2026-08-30, 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 4d 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.

skills/rebase/SKILL.md · 25 lines

What it actually says

input = $ARGUMENTS

Goal: clean linear history, ready to push.

Read at the point of use, not up front:

  • Conflicts → ~/.claude/skills/shared/conflict-heuristics.md
  • Migration files touched → ~/.claude/skills/shared/migration-reconciliation.md

Execution

Announce commits ahead + target, then proceed without waiting for confirmation.

After the rebase:

  • If any migration files were touched: reconcile per the migration guide (re-chain + apply to local DB if running).
  • Run the repository's configured quality gates — rebase bypasses pre-commit hooks, so inspect its scripts and configuration rather than relying on a separate instruction document.
  • Force-push with --force-with-lease. Invoking /rebase = intent to push; no additional confirmation needed.

Report: commits applied/dropped, conflicts resolved, migration reconciliation results, quality gate results.

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. 4d ago First seen · 25 lines · 24 tokens per session scan A eade9adb84f3

Subscribe to this mod's changes

rebase is a skill published in the GitHub repository JHostalek/dotclaude (11 stars, last pushed 1mo ago), licensed CC0-1.0. It adds 24 tokens to every session and 237 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-31.