rebase-feat-with-main

rebase-feat-with-main is a skill for Claude Code from retz8/pastiche. It costs 58 tokens per session (217 once invoked), scanned A, original, MIT.

A procedure for replaying the current feature branch’s commits on top of the latest main branch. Rebasing changes the branch’s starting point so it includes newer commits from main.

In plain words
What is it for?
Use it to fetch main, rebase a clean feature branch, handle conflicts manually if they occur, and update an already-pushed branch with force-with-lease.
Why use it?
It incorporates hotfixes from main before feature work continues and checks that the branch is safe to update. It stops when conflicts need a human decision.

Skill for Claude Code

Written for Claude Code: installed under .claude/.

Good fit Use it to fetch main, rebase a clean feature branch, handle conflicts manually if they occur, and update an already-pushed branch with force-with-lease.

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

Made for: Claude Code.

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-feat-with-main

README.md
[![agentmods](https://agentmods.dev/badge/skills/retz8/pastiche/rebase-feat-with-main/github.svg)](https://agentmods.dev/skills/retz8/pastiche/rebase-feat-with-main)
Your own site
<a href="https://agentmods.dev/skills/retz8/pastiche/rebase-feat-with-main"><img src="https://agentmods.dev/badge/skills/retz8/pastiche/rebase-feat-with-main/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-feat-with-main

Your own site · 80×15
<a href="https://agentmods.dev/skills/retz8/pastiche/rebase-feat-with-main"><img src="https://agentmods.dev/badge/skills/retz8/pastiche/rebase-feat-with-main.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 58 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 217 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.00058 $0.00217
Opus 5 $0.00029 $0.00109
Sonnet 5 $0.00012 $0.00043
Haiku 4.5 $0.00006 $0.00022

Measured 11d ago against content hash 3cfa276974e2, method: parsed. Prices are Anthropic first-party input rates as of 2026-09-10, from the pricing page.

Security

Grade A, and why

rebase-feat-with-main 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 11d 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/skills/rebase-feat-with-main/SKILL.md · 16 lines

What it actually says

rebase-feat-with-main

Workflow

  1. Guard. Current branch must be a feature branch (<version>/<task-name>) or sub-task branch — never main. Working tree must be clean; if not, stop and ask.
  2. git fetch origin main
  3. git rebase origin/main
  4. On conflict: stop immediately, show the conflicting files, and let the user decide — never auto-resolve, never --abort without asking.
  5. If the branch is already pushed: git push --force-with-lease. Never force-push main.
  6. Report: how many commits were replayed and whether main had moved at all (no-op is a valid outcome).
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. 11d ago First seen · 16 lines · 58 tokens per session scan A 3cfa276974e2

Subscribe to this mod's changes

rebase-feat-with-main is a skill published in the GitHub repository retz8/pastiche (4 stars, last pushed 3mo ago), licensed MIT. It adds 58 tokens to every session and 217 once invoked, about $0.0003 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.

Related

Other skills, from other repositories

release-retrospective

Produce a structured look-back after a major release or deprecation — capturing what the plan got right, what it missed, and what to do differently. Trigger when someone says: release retrospective, post-release review, what went wrong with the release, how did the deprecation go, release post-mortem, retro on the…

murphytrueman/design-system-ops · 89 tokens

version-bump-advisor

Recommend the correct semver bump with reasoning and a generated changelog entry. Trigger when someone says: what version bump, is this a breaking change, semver recommendation, should this be major or minor, version this release, changelog entry, what kind of release is this, or anything about versioning a design…

murphytrueman/design-system-ops · 72 tokens

procoder

Work like a senior developer in a repository governed by procoder: run the commit gate before calling anything done, format and lint through the binary, and drive the spec, plan, todo, backlog, and sprint chain in .procoder/. Use this skill when the repository contains a .procoder/ directory or an AGENTS.md naming…

azrtydxb/procoder · 101 tokens

pr-feedback

Work a reviewer's comments on a pull request to the end - all three comment surfaces enumerated before any is triaged, every comment fixed, declined with a reason, or ticketed, push before you reply. Use when a PR comes back with review feedback or a red check.

jjanczur/tyran · 57 tokens

detect-task

Internal skill for commands. Detect the active task (any tracker adapter) from the task-state file / git branch name. Do not trigger on user conversation - only when commands need task detection.

restarter/lets-workflow · 41 tokens

loop-bb-pr

A command that prepares a repeating check for a Bitbucket pull request. A pull request is a request to review and merge code changes into a project.

restarter/lets-workflow · 118 tokens