rebase-master

A command that fetches the latest origin/master branch and rebases your current branch on top of it. Rebasing reapplies your branch’s commits after the updated base branch.

In plain words
What is it for?
Use it to bring a feature branch up to date with origin/master, resolve conflicts, restore stashed work, and push the rebased branch.
Why use it?
It updates your branch and handles uncommitted changes and merge conflicts as part of the process.

Command for Claude Code

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 commands/dixus/claudeframework/rebase-master
Clone the repo
git clone --depth 1 https://github.com/dixus/claudeframework

Made for: Claude Code.

Per session 11 Only the description is in the session, so the agent can decide to use it. The body loads when it is invoked.
When invoked 220 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.00011 $0.00220
Opus 5 $0.00005 $0.00110
Sonnet 5 $0.00002 $0.00044
Haiku 4.5 $0.00001 $0.00022

Measured 2d ago against content hash 88117b2cbce6, method: parsed. Prices are Anthropic first-party input rates as of 2026-08-30, from the pricing page.

Security

Grade A, and why

rebase-master 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 2d 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.

.claude/commands/rebase-master.md · 17 lines

What it actually says

Rebase the current branch onto the latest origin/master:

  1. Run git fetch origin master to get the latest master.
  2. Check for uncommitted changes with git status --short. If there are any, stash them with git stash push -m "auto-stash before rebase".
  3. Run git rebase origin/master.
  4. If there are merge conflicts:
    • Show the conflicted files.
    • For each conflict, read the file, resolve it by keeping both sides where sensible (prefer master for infrastructure, prefer branch for feature code), then git add the resolved file.
    • Run git rebase --continue. Repeat until done.
  5. If changes were stashed in step 2, run git stash pop to restore them.
  6. Run git push --force to update the remote branch with the rebased history.
  7. Show git log --oneline -5 to confirm the result.
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. 2d ago First seen · 17 lines · 11 tokens per session scan A 88117b2cbce6

Subscribe to this mod's changes

rebase-master is a command published in the GitHub repository dixus/claudeframework (10 stars, last pushed 4mo ago), licensed MIT. It adds 11 tokens to every session and 220 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.