Rebase Plan — Git skill for Claude Code
Drafts a pick / squash / reword plan for git rebase -i to clean up a feature branch before PR.
How to install Rebase Plan
Installs to ~/.claude/skills/bryancollins99-agent-skills-rebase-plan/SKILL.md
mkdir -p ~/.claude/skills/bryancollins99-agent-skills-rebase-plan && curl -fsSL https://raw.githubusercontent.com/bryancollins99/agent-skills/HEAD/skills/rebase-plan.md -o ~/.claude/skills/bryancollins99-agent-skills-rebase-plan/SKILL.md Restart Claude Code, or start a new session, for it to be picked up.
What Rebase Plan does
Drafts a pick / squash / reword plan for `git rebase -i` to clean up a feature branch before PR. Advisory only - never executes the rebase.
Purpose
Interactive rebase is the right tool for consolidating wip commits - and the one most people get wrong on their first try. This skill proposes the todo-list your editor will show, so you walk into the rebase knowing what to do.
When to use
- Branch has typo/fixup/wip commits you want to consolidate into 1-3 clean commits before opening a PR
Alternatives in Git
- Clean Worktrees (Automatic) — Automatically remove all worktrees for branches merged into master 25.5k ★
- Bulletproof Quick Start Guide — Target Audience: Complete beginners Never used Python/git before 11.1k ★
- Intel — On-demand intelligence fetch for a target — CVEs, disclosed reports, new features 3.8k ★
Full documentation available on GitHub
View Source RepositoryRelated Skills
Land Work Through Gitassembly
How work reaches entities-godot — declared in gitassembly and applied in order, never merged into the default
Commit Branch PR Pick
Commit the current changes to a new branch and create a PR. Cherry-picks only the relevant changes into the br
Rebase
Rebase current branch onto a feature branch
GitAnalyze
深入分析指定分支或 worktree,评估 merge / rebase / cherry-pick / delete 是否安全
Submit Feedback
Report a bug or request a feature for the pyramid-principle plugin — drafts a GitHub issue and files it only a
Gw PR Merge
Merge PR #$ARGUMENTS with squash and clean up worktree if exists.
Related Agents
Merger
Reviews, validates, and merges arc-agents PRs. Sole authority for destructive git ops (rebase, push, merge, br
Pull Analyst
Post-pull advisory analyst subagent. Reads the new-commits range after a successful git pull --rebase and prod
Pan Release
Release squad agent for the bot-army campaign. Ships approved, green work safely behind a human gate — squash-