latest-rebase

latest-rebase is a skill for Claude Code, Codex from a1f/agent-templates. It costs 31 tokens per session (354 once invoked), scanned A, original, MIT.

A procedure for moving the current Git branch onto the newest version of the remote main branch. Git branches are separate lines of development, and rebasing replays your commits on top of another branch.

In plain words
What is it for?
Use it when asked to rebase on the latest main branch. It can fetch changes, temporarily stash local edits, rebase, report conflicts, validate the result, and prepare installation.
Why use it?
It helps bring unfinished work up to date and detects conflicts between your changes and main. It also checks whether the branch was already merged and runs validation afterward.

Skill for Claude CodeCodex

Written for no agent in particular: nothing here depends on one.

Good fit Use it when asked to rebase on the latest main branch. It can fetch changes, temporarily stash local edits, rebase, report conflicts, validate the result, and prepare installation.

Compare 6 skills from other repositories ↓
Install with agentmods
npx agentmods add skills/a1f/agent-templates/latest-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 a1f/agent-templates --skill latest-rebase
Clone the repo
git clone --depth 1 https://github.com/a1f/agent-templates

Made for: Claude Code, Codex.

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

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

Your own site · 80×15
<a href="https://agentmods.dev/skills/a1f/agent-templates/latest-rebase"><img src="https://agentmods.dev/badge/skills/a1f/agent-templates/latest-rebase.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 31 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 354 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.00031 $0.00354
Opus 5.5 $0.00012 $0.00142
Sonnet 5.5 $0.00006 $0.00071
Haiku 4.5 $0.00003 $0.00035

Measured 2mo ago against content hash 6856306d7bc7, method: parsed. Prices are Anthropic first-party input rates as of 2026-10-07, from the pricing page.

Security

Grade A, and why

latest-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 2mo 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/latest-rebase/SKILL.md · 61 lines

What it actually says

Latest Rebase

Rebase the current branch onto the latest remote main. Handles stashing, conflict detection, and force-push.

Execution

1. Fetch and rebase

git fetch origin main

If there are unstaged changes, stash them first:

git stash
git rebase origin/main
git stash pop

Otherwise:

git rebase origin/main

2. Check result

Check if commits are ahead of main:

git log origin/main..HEAD --oneline
  • If no commits ahead: branch was already merged. Switch to main, pull, delete branch locally and remotely. Run validate and install.
  • If commits ahead: rebase succeeded with work remaining. Ask if the user wants to force-push (git push --force-with-lease).

3. If rebase had conflicts

If rebase fails with conflicts:

  • Show which files have conflicts
  • Ask the user how to proceed (resolve, abort, or skip)
  • Do NOT automatically resolve conflicts

4. Validate and install

./validate.sh
./install.sh --non-interactive --all

Common Mistakes

Mistake Fix
Force-pushing without asking Always ask before --force-with-lease
Auto-resolving conflicts Show conflicts and ask the user
Forgetting to validate after rebase ALWAYS run validate and install
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. 2mo ago First seen · 61 lines · 31 tokens per session scan A 6856306d7bc7

Subscribe to this mod's changes

latest-rebase is a skill published in the GitHub repository a1f/agent-templates (2 stars, last pushed 2mo ago), licensed MIT. It adds 31 tokens to every session and 354 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-31.