メニュー
Splits a mixed-commit branch into focused branches off main using cherry-pick. Use when a branch has unrelated commits, asking "split this branch", or needing to separate concerns into reviewable PRs.
Codex または Claude でインストール この Prompt をコピーして Codex、Claude、または他のアシスタントに貼り付けると、Skill ページを確認してインストールできます。
SOC 職業分類に基づく
Pulls review findings and CI status on the current branch's open PR, fixes each in the working tree, refreshes any stale `.claude/` docs, replies with a summary comment, and pushes a follow-up commit. The worker's return leg after `claude-pr-review`. Use when asked to "address the review", "fix the PR comments", "respond to review", or after an orchestrator posts findings. Do NOT use to write a review. That is `claude-pr-review`.
Ships a small self-review edit on the current PR branch by staging, committing, pushing, and syncing the open PR, replying on the PR when it carries review comments. Use when asked to "ship a followup", "push the PR fix", "followup", or "commit and push this small change". Do NOT use when there is no open PR for the branch (use git-ship instead).
Claude skill structure and authoring rules
Chains implement → verify → review → ship after a feature plan is approved. Reads the plan for the current branch, runs the full pipeline in one session, and stops on any failure or non-minor review finding. Use when asked to "autoship", "ship this feature end to end", or "run the chain". Do NOT auto-trigger. Requires an approved plan file.
Asserts the orchestrator role for the current session and holds the build loop, dispatching to the roadmap, feature, review, and worktree skills. Use when asked to "be the orchestrator", "run the orchestrator", "orchestrate this project", or to set up the control session for parallel feature builds. Do NOT build features or merge PRs in this session.
Reviews an open pull request from an independent session and posts findings as a review comment on the PR. Reads project docs and the roadmap for cross-feature context a self-review lacks. Use when asked to "review the PR", "review this feature's PR", "post a PR review", or acting as the orchestrator reviewing a worker's PR. Do NOT use to review local uncommitted changes. That is `claude-review`.
| name | git-split |
| description | Splits a mixed-commit branch into focused branches off main using cherry-pick. Use when a branch has unrelated commits, asking "split this branch", or needing to separate concerns into reviewable PRs. |
Before proposing a split, read in parallel:
${CLAUDE_SKILL_DIR}/references/branch.md: format, types, length limit, and constraints${CLAUDE_SKILL_DIR}/references/pr.md: PR title format, body sections, and content rulesFollow both exactly.
Run these commands in parallel to gather git context:
git status --porcelain 2>/dev/null || echo "NO_STATUS"git branch --show-current 2>/dev/null || echo "NO_BRANCH"git log main..HEAD --oneline --no-decorate --stat 2>/dev/null || echo "NO_COMMITS"git status --porcelain), stop:
❌ Working tree is dirty. Commit or stash changes before splitting.main or master, stop:
❌ Already on main. Nothing to split.❌ No commits ahead of main. Nothing to split.git branch -m if the current name does not already match. Skip the rename if it already matches. Secondary concerns are extracted as new focused branches via cherry-pick.git branch -d <current> to delete the original.main without the others. Base every branch on main.Current branch: <branch_name> Total commits ahead of main: Mode: Independent | Stacked
| Group | Branch | Base | Commits | Count |
|---|---|---|---|---|
| / | main | |||
| / |
All commits accounted for.
<current_branch> → <new_name> only when renaming. Show just <current_branch> if the existing name already matches the concern.main first, then each layer above. For independent mode, list the primary concern first.If Mode is Stacked, append this line to the preview:
🔁 Sequential squash-merge loop. Squash-merge each PR bottom-up with --delete-branch. After each merge, signal me so I can restack the next branch onto main before you merge it.
If Mode is Independent, append this line to the preview:
🔁 Squash-merge secondaries first, primary last. The primary keeps every cherry-picked commit, so merging it first lands every secondary's content on main and leaves the secondary PRs empty after rebase.
After outputting the preview, execute the final commands immediately. Claude Code's tool permission dialog is the confirmation gate. Do not wait for user input.
For independent mode, base every branch on main:
# Rename current branch to reflect primary concern
git branch -m <current_branch> <new_name>
# Create, cherry-pick, push, and open PR for each secondary branch
mkdir -p .claude/.tmp/pr-split
git switch -c <branch> main && git cherry-pick <sha> <sha> \
&& git push -u origin <branch> \
&& (cat <<'BODY' > .claude/.tmp/pr-split/<branch>.md
<body following pr.md template, written from the cherry-picked commits>
BODY
) && gh pr create --title "<title>" --body-file .claude/.tmp/pr-split/<branch>.md \
&& rm .claude/.tmp/pr-split/<branch>.md
# Return to primary branch, push, and open its PR
git checkout <new_name> && git push -u origin <new_name> \
&& (cat <<'BODY' > .claude/.tmp/pr-split/<new_name>.md
<body following pr.md template, written from the primary's commits>
BODY
) && gh pr create --title "<title>" --body-file .claude/.tmp/pr-split/<new_name>.md \
&& rm .claude/.tmp/pr-split/<new_name>.md
# Clean up the body-file dir if all PRs succeeded (no-op when non-empty)
rmdir .claude/.tmp/pr-split 2>/dev/null || true
For stacked mode, base each branch on the previous and cherry-pick only that group's commits:
# Rename current branch to reflect primary concern
git branch -m <current_branch> <new_name>
mkdir -p .claude/.tmp/pr-split
# Group 1: based on main
git switch -c <branch-1> main && git cherry-pick <g1-sha> <g1-sha> \
&& git push -u origin <branch-1> \
&& (cat <<'BODY' > .claude/.tmp/pr-split/<branch-1>.md
<body following pr.md template, written from the cherry-picked commits>
BODY
) && gh pr create --title "<title>" --body-file .claude/.tmp/pr-split/<branch-1>.md \
&& rm .claude/.tmp/pr-split/<branch-1>.md
# Group 2: based on <branch-1>, this group's commits only
git checkout -b <branch-2> && git cherry-pick <g2-sha> <g2-sha> \
&& git push -u origin <branch-2> \
&& (cat <<'BODY' > .claude/.tmp/pr-split/<branch-2>.md
<body following pr.md template, written from the cherry-picked commits>
BODY
) && gh pr create --title "<title>" --body-file .claude/.tmp/pr-split/<branch-2>.md \
&& rm .claude/.tmp/pr-split/<branch-2>.md
# Return to primary branch, push, and open its PR
git checkout <new_name> && git push -u origin <new_name> \
&& (cat <<'BODY' > .claude/.tmp/pr-split/<new_name>.md
<body following pr.md template, written from the primary's commits>
BODY
) && gh pr create --title "<title>" --body-file .claude/.tmp/pr-split/<new_name>.md \
&& rm .claude/.tmp/pr-split/<new_name>.md
# Clean up the body-file dir if all PRs succeeded (no-op when non-empty)
rmdir .claude/.tmp/pr-split 2>/dev/null || true
Respond with exactly one line:
✅ Renamed: <old> → <new> | PRs: <primary-url>, <url1>, <url2>
Do not add any other text.
When the user signals the previous stacked PR has merged, restack the next one.
git fetch origin main && git checkout <branch> && git rebase --onto origin/main HEAD~<own-commit-count> && git push --force-with-leasegh pr view <num> --json baseRefName. If not, gh pr edit <num> --base main.✅ <branch> rebased onto main. Ready for squash-merge.Edge cases:
gh pr create --base main --head <branch> and a regenerated body.