Rebase

Rebase feature or stacked branches, or explicitly integrate a fetched upstream into local main/master. Separate trunk mode proves local replay scope and never enters force-push or PR flows; its mutations require fresh confirmation.

Install

skills CLI (Claude Code, Cursor, Codex and more)
npx skills add flurdy/agent-skills --skill rebase
Manual install
git clone --depth 1 https://github.com/flurdy/agent-skills.git /tmp/agent-skills
mkdir -p ~/.claude/skills
cp -r /tmp/agent-skills/skills/rebase ~/.claude/skills/rebase

Personal skills live in ~/.claude/skills. Use .claude/skills in a project folder to share a skill with your team.

From the SKILL.md

# Rebase

Feature/stacked modes resolve the child-only range using the existing read-only helper.
Explicit `upstream` mode separately integrates fetched remote trunk changes into local
`main`/`master`, replaying only eligible local commits without replacing remote history.

## Usage

```
/rebase                                   # Infer the target from the recorded parent / PR base
/rebase main                              # Main moved; replay this branch on top
/rebase parent {parent-branch}            # Stacked parent was updated or force-pushed
/rebase merged {old-parent} [--old-tip {sha}]   # Parent PR merged; move onto main, child commits only
/rebase upstream                          # Explicit local main/master integration; never force-push trunk
```

Use these explicit forms directly; the former target-specific alias skills are retired.

## Mode boundary — dispatch before PR inference

- Explicit `/rebase upstream`: read [Trunk-upstream integration](references/upstream.md)
  completely and follow only that path, then stop. Do not enter the feature steps below.
- Other forms remain feature/stacked workflows. Preserve the existing main-on-main
  refusal. Explain that `/rebase upstream` is available, but never switch modes implicitly
  after a refusal or infer trunk mode from the current branch.
- Repository Git wrappers and stricter confirmation rules apply to every mode. A helper
  preview is not mutation permission or source-write authority.
Read the full skill on GitHub

Details

Skill name
rebase
Path
skills/rebase/SKILL.md
License
MIT
Repo updated
17 November 2026

FAQ

What does the Rebase skill do?

Rebase feature or stacked branches, or explicitly integrate a fetched upstream into local main/master. Separate trunk mode proves local replay scope and never enters force-push or PR flows; its mutations require fresh confirmation.

How do I install the Rebase skill?

skills CLI (Claude Code, Cursor, Codex and more): npx skills add flurdy/agent-skills --skill rebase. Skills go in ~/.claude/skills (personal) or .claude/skills (project), and Claude loads them automatically when a task matches the description.

Is Rebase popular?

It lives in flurdy/agent-skills, which has 9 GitHub stars and 0 forks.

Related skills

Architect

9

flurdy/agent-skills

Architecture and implementation planning gate for complex or high-blast-radius work. Produces evidence-backed decisions, reviewable slices, acceptance evidence, and conditional human review ownership without editing code.

Software Development

Artifact Hygiene

9

flurdy/agent-skills

Run a local-only, read-only advisory audit of publishable working-tree files and unpublished branch history with redaction-safe findings.

Git & Code Review

Backlog Groom

9

flurdy/agent-skills

Auto-detects workspace unfinished backlogs across unique stores; otherwise local open beads. Flags thin prose, missing labels, drift, lifecycle and duplicates. Report-only; mutations need approval, destructive ones individually.

Other

Reply Comments

9

flurdy/agent-skills

Safely publish prepared PR-feedback outcomes through separately confirmed push, reply, and inline-thread resolution gates. Re-fetches normalized identities before every mutation and keeps retries idempotent.

Git & Code Review

Ready to Release

9

flurdy/agent-skills

Read-only release-readiness authority for one service. Collects normalized Git, CI, contract, ordering, toggle, and deployment evidence through one shared evaluator; renders its gate table and verdict without prompting or changing state.

Git & Code Review

Review Comments

9

flurdy/agent-skills

Address PR review feedback through explicit item selection, independent validation, focused local fixes, verification, and a local commit. Never publishes remote actions; use reply-comments for separately confirmed push, reply, and resolution gates.

Git & Code Review

Browse the most popular Claude skills, all git & code review skills, or write your own with the skills generator.