ワンクリックでManusで任意のスキルを実行

始める

split-commit

スター2

フォーク0

更新日2026年5月17日 06:13

Split a commit with mixed changes into separate commits

インストール

Codex または Claude でインストールこの Prompt をコピーして Codex、Claude、または他のアシスタントに貼り付けると、Skill ページを確認してインストールできます。

Manusで実行

ソース

ahoym

ahoym/dotfiles

GitHub リポジトリを開く Creator のリポジトリを見る

ダウンロード

Manusで実行

Split Commit

Keywords: git, commit split, atomic commits, rewrite history, force-with-lease, two-group split, bisectable, git reset, interactive patch, git add -p

Split a commit that mixes unrelated changes (e.g., docstrings + features) into separate commits.

Usage

/git:split-commit - Split the most recent commit
/git:split-commit <commit-hash> - Split a specific commit

Instructions

Identify the commit to split:
- If $ARGUMENTS is empty, use HEAD
- Otherwise, use the provided commit hash
Show the commit contents:
```
git show <commit> --stat
git show <commit>
```
Output this prompt as plain text and stop (do NOT use AskUserQuestion — this is free-text input): "How would you like to split this commit? Describe the two (or more) groups of changes."

Save original files before resetting:

mkdir -p tmp/claude-artifacts/split-commit
# For each file in the commit
git show <commit>:<filepath> > tmp/claude-artifacts/split-commit/<filename>_original

Reset to parent commit:
```
git reset --hard <commit>^
```
Apply first group of changes:
- Using the saved files in tmp/claude-artifacts/split-commit/ as reference, apply only the first group
- Ask the operator for commit message
```
git add <files>
git commit -m "<message>

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>"
```
Apply remaining changes:
- Restore full versions from tmp/claude-artifacts/split-commit/ originals
- Ask the operator for commit message
```
git add <files>
git commit -m "<message>

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>"
```
Verify and push:
```
git log --oneline -3
```
Ask the operator: "Ready to force push these changes?"
```
git push origin <branch> --force-with-lease
```

Important Notes

This rewrites history - only use on commits not yet merged
Always save files to tmp/claude-artifacts/split-commit/ BEFORE resetting
The original commit is replaced by multiple new commits
This workflow assumes the two groups of changes are in separate files. If both groups modify the same file, use git add -p (interactive patch mode) after step 4 to selectively stage each group instead of restoring from tmp/claude-artifacts/split-commit/

このリポジトリの他の Skills

同じリポジトリ

compound

ahoym/dotfiles

Capture session learnings and save to skills, guidelines, or reference docs under ~/.claude/.

2026-05-182

director

ahoym/dotfiles

Orchestrate parallel claude -p sessions — bootstrap, launch, monitor, and converge. Works with any skill that produces manifest.json, item directories, and a runner script.

2026-05-172

create-request

ahoym/dotfiles

Create a request (pull request or merge request) or update an existing one following project conventions.

2026-05-172

resolve-conflicts

ahoym/dotfiles

Resolve merge or rebase conflicts between branches.

2026-05-172

address-prs

ahoym/dotfiles

Assess open PRs with unaddressed review comments and generate a parallel addressing script — produces manifest.json and let-it-rip.sh for address-request-comments execution.

2026-05-172

work-items

ahoym/dotfiles

Assess open work items and generate a parallel execution script — produces manifest.json and let-it-rip.sh for implement/clarify execution.

2026-05-172

Split Commit

Keywords: git, commit split, atomic commits, rewrite history, force-with-lease, two-group split, bisectable, git reset, interactive patch, git add -p

Split a commit that mixes unrelated changes (e.g., docstrings + features) into separate commits.

Usage

/git:split-commit - Split the most recent commit

/git:split-commit <commit-hash> - Split a specific commit

Instructions

Identify the commit to split:

If $ARGUMENTS is empty, use HEAD
Otherwise, use the provided commit hash

Show the commit contents:

git show <commit> --stat
git show <commit>

Output this prompt as plain text and stop (do NOT use AskUserQuestion — this is free-text input): "How would you like to split this commit? Describe the two (or more) groups of changes."

Save original files before resetting:

mkdir -p tmp/claude-artifacts/split-commit
# For each file in the commit
git show <commit>:<filepath> > tmp/claude-artifacts/split-commit/<filename>_original

Reset to parent commit:

git reset --hard <commit>^

Apply first group of changes:

Using the saved files in tmp/claude-artifacts/split-commit/ as reference, apply only the first group
Ask the operator for commit message

git add <files>
git commit -m "<message>

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>"

Apply remaining changes:

Restore full versions from tmp/claude-artifacts/split-commit/ originals
Ask the operator for commit message

git add <files>
git commit -m "<message>

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>"

Verify and push:

git log --oneline -3

Ask the operator: "Ready to force push these changes?"

git push origin <branch> --force-with-lease

Important Notes

This rewrites history - only use on commits not yet merged

Always save files to tmp/claude-artifacts/split-commit/ BEFORE resetting

The original commit is replaced by multiple new commits

This workflow assumes the two groups of changes are in separate files. If both groups modify the same file, use git add -p (interactive patch mode) after step 4 to selectively stage each group instead of restoring from tmp/claude-artifacts/split-commit/

name	split-commit
description	Split a commit with mixed changes into separate commits