Run any Skill in Manus with one click

split-commit

Stars2

Forks0

UpdatedApril 15, 2026 at 15:24

Split an existing commit or PR into smaller reviewable pieces through a one-hunk patch queue. Use when extracting part of a commit, splitting a commit into multiple commits, or splitting PR changes from one or more source commits without starting from direct source edits.

Installation

Install with Codex or Claude Copy this prompt, paste it into Codex, Claude, or another assistant, and let it review the skill page and install it for you.

Run Skill in Manus

Source

szokeasaurusrex

szokeasaurusrex/pi-agent

View GitHub Repository View Creator Repositories

Download

Run Skill in Manus

Related occupationsSOC

Based on SOC occupation classification

Software DevelopersComputer and Mathematical Occupations·SOC 15-1252

File Explorer

4 files

SKILL.md

readonly

name	split-commit
description	Split an existing commit or PR into smaller reviewable pieces through a one-hunk patch queue. Use when extracting part of a commit, splitting a commit into multiple commits, or splitting PR changes from one or more source commits without starting from direct source edits.

Split Commit

Use this skill when the user asks to split an existing commit or PR into smaller pieces through an explicit patch queue.

Requirements

Start with a clean worktree and index unless the user explicitly says otherwise.
Do not start by editing source files directly. Use the generated one-hunk patches as the extraction source of truth.
After setup, do not enumerate todo/ or read patch files directly. Inspect patches only through scripts/next-patch.sh.
Process the queue strictly in order. Do not inspect later entries before the current patch leaves todo/.
Every patch must leave todo/ through exactly one state: applied/, skipped/, partially-applied/, or merge-conflicted/.
For partial, keep the moved patch as the audit artifact, then reduce that patch to the in-scope subset only. Do not introduce edits that are not already present in the surfaced patch.
Validate the repo state before creating final commits.

Scripts

scripts/setup-split-patches.sh
scripts/next-patch.sh
scripts/process-patch.sh

Workflow

Create the queue from a source commit or revision range.
Run scripts/next-patch.sh to get the next patch path and full patch content.
Decide only for that surfaced patch: apply, skip, or partial.
Run scripts/process-patch.sh for that action.
If the action is partial, perform the scoped manual edit immediately and keep only the in-scope subset from that patch.
If a patch reaches merge-conflicted/, resolve the reported conflicts before continuing.
Repeat until scripts/next-patch.sh prints All patches are processed..

Example loop

scripts/setup-split-patches.sh --source 4a95362 --repo /abs/path/to/repo
scripts/next-patch.sh --workdir /tmp/split-commit.ABC123

scripts/process-patch.sh \
  --workdir /tmp/split-commit.ABC123 \
  --patch /tmp/split-commit.ABC123/todo/003-file.patch \
  --action apply

scripts/next-patch.sh --workdir /tmp/split-commit.ABC123

scripts/process-patch.sh \
  --workdir /tmp/split-commit.ABC123 \
  --patch /tmp/split-commit.ABC123/todo/004-file.patch \
  --action partial
# then reduce that surfaced patch to the in-scope subset only

scripts/next-patch.sh --workdir /tmp/split-commit.ABC123

Notes

scripts/setup-split-patches.sh supports --source <commit-ish> and also accepts explicit revision ranges.
scripts/next-patch.sh is the only queue inspection entry point and is also the completion check.
scripts/process-patch.sh --action apply tries normal apply first, then falls back to git apply --3way.

More from this repository

same repository

delegation-plan

szokeasaurusrex/pi-agent

Write plans intended for a cheaper or less capable implementation model. Use when the user asks for a plan suitable for another LLM, junior engineer, intern, cheaper model, coding agent, or implementation delegate.

2026-07-062

thinking-through

szokeasaurusrex/pi-agent

Use when the user asks for ideas, brainstorming, discussion, exploration, possibilities, pros and cons, tradeoffs, or to "think through" something.

2026-07-032

plan

szokeasaurusrex/pi-agent

Use this skill when asked to plan something, or plan and implement. Do not use when asked to implement a plan.

2026-05-112

cargo

szokeasaurusrex/pi-agent

Use when initializing Rust projects or modifying Cargo.toml, Cargo.lock, cargo config, or other cargo-related files. Prefer this skill for dependency changes, features, package metadata, workspaces, and cargo commands. Do not load it for editing Rust source code generally.

2026-05-112

context-fork

szokeasaurusrex/pi-agent

Checkpoint, inspect, and return through session tree branches. Use when exploring uncertain approaches, investigating code, or when the user asks for a forked agent.

2026-03-192

sub-agents

szokeasaurusrex/pi-agent

Use multiple pi sub-agents for delegation, isolation, and parallel work. Use when tasks can be split and later merged.

2026-03-182

name	split-commit
description	Split an existing commit or PR into smaller reviewable pieces through a one-hunk patch queue. Use when extracting part of a commit, splitting a commit into multiple commits, or splitting PR changes from one or more source commits without starting from direct source edits.

Split Commit

Use this skill when the user asks to split an existing commit or PR into smaller pieces through an explicit patch queue.

Requirements

Start with a clean worktree and index unless the user explicitly says otherwise.
Do not start by editing source files directly. Use the generated one-hunk patches as the extraction source of truth.
After setup, do not enumerate todo/ or read patch files directly. Inspect patches only through scripts/next-patch.sh.
Process the queue strictly in order. Do not inspect later entries before the current patch leaves todo/.
Every patch must leave todo/ through exactly one state: applied/, skipped/, partially-applied/, or merge-conflicted/.
For partial, keep the moved patch as the audit artifact, then reduce that patch to the in-scope subset only. Do not introduce edits that are not already present in the surfaced patch.
Validate the repo state before creating final commits.

Scripts

scripts/setup-split-patches.sh
scripts/next-patch.sh
scripts/process-patch.sh

Workflow

Create the queue from a source commit or revision range.
Run scripts/next-patch.sh to get the next patch path and full patch content.
Decide only for that surfaced patch: apply, skip, or partial.
Run scripts/process-patch.sh for that action.
If the action is partial, perform the scoped manual edit immediately and keep only the in-scope subset from that patch.
If a patch reaches merge-conflicted/, resolve the reported conflicts before continuing.
Repeat until scripts/next-patch.sh prints All patches are processed..

Example loop

scripts/setup-split-patches.sh --source 4a95362 --repo /abs/path/to/repo
scripts/next-patch.sh --workdir /tmp/split-commit.ABC123

scripts/process-patch.sh \
  --workdir /tmp/split-commit.ABC123 \
  --patch /tmp/split-commit.ABC123/todo/003-file.patch \
  --action apply

scripts/next-patch.sh --workdir /tmp/split-commit.ABC123

scripts/process-patch.sh \
  --workdir /tmp/split-commit.ABC123 \
  --patch /tmp/split-commit.ABC123/todo/004-file.patch \
  --action partial
# then reduce that surfaced patch to the in-scope subset only

scripts/next-patch.sh --workdir /tmp/split-commit.ABC123

Notes

scripts/setup-split-patches.sh supports --source <commit-ish> and also accepts explicit revision ranges.
scripts/next-patch.sh is the only queue inspection entry point and is also the completion check.
scripts/process-patch.sh --action apply tries normal apply first, then falls back to git apply --3way.