agentmods.dev

rebase

rebase is a skill for Claude Code from jpoutrin/product-forge. It costs 13 tokens per session (1,017 once invoked), scanned A, original, MIT.

A Git workflow helper that places your local commits on top of newer changes from a remote branch. Git is the tool developers use to track code changes, and a remote branch is the shared copy of a branch stored on a server.

In plain words
What is it for?
Use it to fetch remote updates, rebase the current branch, and resolve conflicts when local and shared work overlap.
Why use it?
It helps incorporate colleagues' updates while keeping your own commits together above them, and can provide more control through an interactive rebase.

Skill for Claude Code

Written for Claude Code: argument-hint in frontmatter. Also seen: mentions Claude Code.

Part of the git-workflow plugin — 11 skills, 8 agents shipped together

not rated 16repo 7mo ago A scan 13 tokens original MIT

Good fit Use it to fetch remote updates, rebase the current branch, and resolve conflicts when local and shared work overlap.

Compare 6 skills from other repositories ↓
Install with agentmods
npx agentmods add skills/jpoutrin/product-forge/rebase
View source ↗ jpoutrin/product-forge
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 jpoutrin/product-forge --skill rebase
Clone the repo
git clone --depth 1 https://github.com/jpoutrin/product-forge

Made for: Claude Code.

Or install git-workflow, the plugin that ships this one along with the rest of its 11 skills, 8 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/jpoutrin/product-forge/rebase/github.svg)](https://agentmods.dev/skills/jpoutrin/product-forge/rebase)
Your own site
<a href="https://agentmods.dev/skills/jpoutrin/product-forge/rebase"><img src="https://agentmods.dev/badge/skills/jpoutrin/product-forge/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/jpoutrin/product-forge/rebase"><img src="https://agentmods.dev/badge/skills/jpoutrin/product-forge/rebase.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 13 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 1,017 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.00013 $0.01017
Opus 5.5 $0.00005 $0.00407
Sonnet 5.5 $0.00003 $0.00203
Haiku 4.5 $0.00001 $0.00102

Measured 1mo ago against content hash f66892ff3b1b, method: parsed. Prices are Anthropic first-party input rates as of 2026-10-07, 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 1mo 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.

plugins/git-workflow/skills/rebase/SKILL.md · 175 lines

How it starts

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

rebase

Category: Development

Usage

rebase [--interactive]

Arguments

  • --interactive: Use interactive rebase for more control over commits (optional)

Description

Rebases your local commits on top of the latest remote changes for your active branch. This is useful when your colleague has pushed changes to the same branch and you want to incorporate them while keeping your commits on top.

Execution Method

This command delegates to the rebase-expert agent (Haiku model) for fast execution.

Delegation: Use the Task tool with:

  • subagent_type: "git-workflow:rebase-expert"
  • prompt: Include the interactive flag if specified and current working directory

Example:

Task(subagent_type="git-workflow:rebase-expert", prompt="Run rebase in /path/to/repo")

Execution Instructions for Claude Code

When this command is run, Claude Code should:

  1. Verify Git State

    • Check that we're in a git repository
    • Confirm the current branch is tracking a remote branch
    • Verify there are no uncommitted changes (offer to stash if needed)

  2. Fetch Latest Remote Changes

    • Run git fetch origin to get the latest remote changes
    • Identify the tracking branch (e.g., origin/main)

  3. Check for Conflicts

    • Run git rebase --dry-run origin/<branch> to detect potential conflicts
    • Warn user if conflicts are likely

  4. Execute Rebase

    • Run git rebase origin/<branch> (or git rebase -i for interactive mode)
    • Monitor for conflicts during rebase
    • Provide guidance if conflicts occur

  5. Handle Conflicts (if any)

    • Display conflicted files
    • Guide user through resolution
    • Verify rebase completion

  6. Confirm Success

    • Show final commit log with new positions
    • Display summary of rebased commits

Interactive Flow

Step 1: Verify State

🔍 Checking repository state...

Current branch: feature/my-feature
Tracking branch: origin/feature/my-feature
Status: Clean (no uncommitted changes)

Read the full file on GitHub · 175 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. 1mo ago First seen · 175 lines · 13 tokens per session scan A f66892ff3b1b

Subscribe to this mod's changes

rebase is a skill published in the GitHub repository jpoutrin/product-forge (16 stars, last pushed 7mo ago), licensed MIT. It adds 13 tokens to every session and 1,017 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-09-03.

Git and workflow
Related

Other skills, from other repositories

merge-batch

Prepare and merge an owner-selected PR batch with contributor credit and exact-candidate admission. Use for a pasted PR list; combined focused validation is diagnostic, and every actual landing still requires its applicable checks and authorization.

diegosouzapw/OmniRoute · 46 tokens

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

release-helper

Ensures configuration and code changes are released correctly. Use PROACTIVELY whenever you edit config.json, change any setting, or fix a configuration bug in this project, so the change reaches production.

Sahir619/fable-method · 43 tokens