rebase

A branch-updating workflow that replays your commits on top of the latest version of the project's main branch and updates the remote pull request.

In plain words
What is it for?
Use it to rebase a branch onto the latest upstream default branch, resolve conflicts, and force-push the updated branch to its pull request.
Why use it?
It helps bring an older branch up to date and surfaces conflicts that must be resolved before merging.

Skill for Claude CodeCodex

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/drn/dots/rebase
Any agent
npx skills add drn/dots --skill rebase
Clone the repo
git clone --depth 1 https://github.com/drn/dots

Made for: Claude Code, Codex.

Per session 35 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 1,245 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.00035 $0.01245
Opus 5 $0.00017 $0.00622
Sonnet 5 $0.00007 $0.00249
Haiku 4.5 $0.00003 $0.00125

Measured 2d ago against content hash 84e59c6270bd, 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 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.

agents/skills/rebase/SKILL.md · 93 lines

How it starts

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

Context

  • Current branch: !git branch --show-current
  • Git status: !git status --short
  • Remotes: !git remote -v 2>/dev/null | head -10
  • HEAD ref: !git rev-parse --abbrev-ref HEAD 2>/dev/null | head -1
  • Open PR: !gh pr view --json number,url,headRefName 2>/dev/null | head -10
  • Base ref: !git branch -r 2>/dev/null | grep -oE 'origin/(main|master)' | head -1
  • Commits vs main: !git log origin/main..HEAD --oneline 2>/dev/null | head -20
  • Commits vs master: !git log origin/master..HEAD --oneline 2>/dev/null | head -20
  • Arguments: $ARGUMENTS

Your task

Rebase the current branch onto the latest upstream default branch and force-push to update the remote PR branch.

Step 0: Validate state

  • If HEAD is detached (not on a named branch), stop and tell the user: "Cannot rebase in detached HEAD state."
  • Determine the current branch name.

Step 1: Determine the target remote

  • Run git remote to list remotes.
  • If upstream exists, use upstream as the target remote.
  • Otherwise, use origin.

Step 2: Determine the default branch

If the user passed --onto <branch> in the arguments, use that branch as the rebase target instead of the default branch. Otherwise:

  • Run git symbolic-ref refs/remotes/<remote>/HEAD 2>/dev/null (where remote is from Step 1) and extract the branch name.
  • If that fails, check if <remote>/main exists with git rev-parse --verify <remote>/main 2>/dev/null.
  • If that fails, check if <remote>/master exists with git rev-parse --verify <remote>/master 2>/dev/null.
  • If none work, stop and tell the user: "Could not determine the default branch. Use --onto to specify."

If the current branch IS the default branch, stop and tell the user: "You are on the default branch. Rebase is not needed."

Step 3: Fetch

  • Run git fetch <remote> <default-branch>.
  • Report: "Fetching /..."

Step 4: Check if rebase is needed

  • Run git merge-base --is-ancestor <remote>/<default-branch> HEAD to check if already up to date.
  • If the branch is already up to date (exit code 0 from the above), report "Already up to date with /." and skip to Step 6.

Read the full file on GitHub · 93 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. 2d ago First seen · 93 lines · 35 tokens per session scan A 84e59c6270bd

Subscribe to this mod's changes

rebase is a skill published in the GitHub repository drn/dots (23 stars, last pushed 3d ago), licensed MIT. It adds 35 tokens to every session and 1,245 once invoked, about $0.0002 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.

Related

Other skills, from other repositories

systematic-debugging

Use when encountering any bug, test failure, or unexpected behavior, before proposing fixes.

obra/superpowers · 21 tokens

next-cache-components-adoption

Turn on Cache Components in a Next.js app and resolve the blocking routes it surfaces. Use when the user wants to enable, adopt, or migrate to Cache Components, flip the cacheComponents flag, work through a flood of blocking-prerender / instant validation errors, run the cache-components-instant-false codemod, or…

vercel/next.js · 95 tokens

babysit-pr

Babysit a GitHub pull request after creation by continuously polling review comments, CI checks/workflow runs, and mergeability state until the PR is merged/closed or user help is required. Diagnose failures, retry likely flaky failures up to 3 times, auto-fix/push branch-related issues when appropriate, and keep…

openai/codex · 114 tokens

imagegen

Generate or edit raster images when the task benefits from AI-created bitmap visuals such as photos, illustrations, textures, sprites, mockups, or transparent-background cutouts. Use when Codex should create a brand-new image, transform an existing image, or derive visual variants from references, and the output…

openai/codex · 113 tokens

cpu-profile-analysis

Analyze V8/Chrome CPU profiles (.cpuprofile) and DevTools trace files (Trace-.json). Use when: profiling performance, investigating slow functions, comparing code paths, finding bottlenecks, analyzing timeToRequest, understanding call trees from sampling profiler data, analyzing layout/paint/rendering, investigating…

microsoft/vscode · 71 tokens

next-cache-components-optimizer

Drive a Next.js route to instant navigation by setting up an agentic loop, under Cache Components / PPR, on initial load (hard navigation) and client-side navigation (soft navigation). Encode the goal as a failing @next/playwright instant() e2e and work it to green, one verified route at a time; the shipped test then…

vercel/next.js · 170 tokens