菜单
Non-interactive hunk-level git staging, unstaging, discarding, undoing, fixup, amend, squash, commit splitting, and commit reordering. Use when selectively staging, unstaging, discarding, reverting, squashing, splitting, or reordering individual diff hunks by ID instead of interactively.
默认使用会先检查来源的 Prompt；你也可以切换为直接命令，或下载本地副本。
决定是否安装前，请先阅读 SKILL.md，以及 SkillsMP 当前展示的配套文件。
用 Codex 或 Claude 帮你安装 复制这段 Prompt，粘贴到 Codex、Claude 或其他助手里，让它检查 Skill 页面并帮你完成安装。
直接命令不会经过审查 Prompt；运行前请先检查来源。
npx skills add https://github.com/raine/skills --skill git-surgeon命令会保持在同一行。复制前请横向滚动并检查完整内容。
想先保存到本地？可下载 SkillsMP 当前能够提供的文件。
基于 SOC 职业分类
正在显示 SKILL.md
| name | git-surgeon |
| description | Non-interactive hunk-level git staging, unstaging, discarding, undoing, fixup, amend, squash, commit splitting, and commit reordering. Use when selectively staging, unstaging, discarding, reverting, squashing, splitting, or reordering individual diff hunks by ID instead of interactively. |
CLI for hunk-level git operations without interactive prompts. Useful for AI agents that need precise control over which changes to stage, unstage, discard, or undo.
# List unstaged hunks (shows ID, file, +/- counts, preview)
git-surgeon hunks
# List staged hunks
git-surgeon hunks --staged
# Filter to one file
git-surgeon hunks --file=src/main.rs
# List hunks from a specific commit
git-surgeon hunks --commit <HEAD/sha>
# Show all hunks with line numbers (for small commits needing line-range splits)
git-surgeon hunks --commit <sha> --full
# Show blame info (which commit introduced each line)
git-surgeon hunks --blame
git-surgeon hunks --blame --staged
git-surgeon hunks --blame --commit <sha>
# Show full diff for a hunk (lines are numbered for use with --lines)
git-surgeon show <id>
git-surgeon show <id> --commit HEAD
# Stage specific hunks
git-surgeon stage <id1> <id2> ...
# Stage only part of a hunk by line range
git-surgeon stage <id> --lines 5-30
# Stage and commit hunks in one step
git-surgeon commit <id1> <id2> ... -m "message"
# With inline line ranges
git-surgeon commit <id>:1-11 <id2> -m
git-surgeon commit-to <branch> <id1> <id2> ... -m
git-surgeon commit-to main <>:1-11 <id2> -m
git-surgeon unstage <id1> <id2> ...
git-surgeon unstage <> --lines 5-30
git-surgeon discard <id1> <id2> ...
git-surgeon discard <> --lines 5-30
git-surgeon fixup <target>
git-surgeon fixup <target> --from <commit>
git-surgeon fixup <target> --from <commit1> <commit2> <commit3>
git-surgeon amend <commit>
git-surgeon reword HEAD -m
git-surgeon reword <commit> -m
git-surgeon reword HEAD -m -m
git-surgeon squash HEAD~1 -m
git-surgeon squash HEAD~2 -m -m
git-surgeon squash <commit> -m
git-surgeon squash HEAD~3 --force -m
git-surgeon squash HEAD~1 --no-preserve-author -m
git-surgeon undo <id1> <id2> ... --from <commit>
git-surgeon undo <> --from <commit> --lines 2-10
git-surgeon undo-file <file1> <file2> ... --from <commit>
git-surgeon HEAD \
--pick <id1> <id2> -m \
--rest-message
git-surgeon HEAD \
--pick <id1> -m -m \
--rest-message --rest-message
git-surgeon <commit> \
--pick <>:1-11,20-30 <id2> -m
git-surgeon move <sha> --after <target-sha>
git-surgeon move <sha> --before <target-sha>
git-surgeon move <sha> --to-end
git-surgeon update
git-surgeon HEAD \
--pick <id1> -m \
--pick <id2> -m \
--rest-message
git-surgeon hunks to list hunks with their IDsgit-surgeon show <id> to inspect a hunk (lines are numbered)git-surgeon commit <id1> <id2> -m "message"git-surgeon stage <id1> <id2>, then git commitgit-surgeon commit <id>:5-30 -m "message"Use commit-to when working in a worktree and you need to commit changes to a
branch checked out elsewhere (e.g., main):
git-surgeon hunks to list hunksgit-surgeon commit-to main <id1> <id2> -m "message"fixup folds one or more commits into an earlier one. The source(s) (default:
HEAD) are removed from history and their changes merge into the target.
Intermediate commits stay untouched. Dirty working tree is autostashed.
git-surgeon fixup <target> -- fold HEAD into target (most common)git-surgeon fixup <target> --from <commit> -- fold a specific non-HEAD commitgit-surgeon fixup <target> --from <c1> <c2> <c3> -- fold multiple commits in one passUse --blame to see which commit introduced the surrounding lines:
git-surgeon hunks --blame
Output shows commit hashes for each line:
a1b2c3d src/auth.rs (+2 -0)
8922b52 fn login(user: &str) {
8922b52 validate(user);
0000000 + log_attempt(user); # new line, not yet committed
0000000 + audit(user); # new line, not yet committed
8922b52 }
The context lines show 8922b52 -- that's the commit where this function was
added. If your new lines belong with that change:
git-surgeon commit a1b2c3d -m "add login logging"
git-surgeon fixup 8922b52
amend folds staged changes into an earlier commit. For HEAD, amends directly;
for older commits, uses autosquash rebase. Unstaged changes are preserved.
git-surgeon stage <id1> <id2>git-surgeon amend <commit-sha>Squash collapses ALL commits from the target through HEAD into a single commit.
Every intermediate commit in the range is merged. To fold one commit into a
non-adjacent earlier commit without collapsing the range, use fixup instead.
git-surgeon squash HEAD~2 -m "combined"-m flags for subject + body: git-surgeon squash HEAD~1 -m "Subject" -m "Body paragraph"--force to squash ranges containing merge commits--no-preserve-author for current usergit-surgeon hunks --commit <sha> to list hunks in a commitgit-surgeon undo <id> --from <sha>git-surgeon undo-file src/main.rs --from <sha>git-surgeon hunks --commit <sha>
--full to see all lines with line numbers in one callgit-surgeon split <sha> --pick <id1> -m "first" --rest-message "second"-m flags for subject + body: --pick <id> -m "Subject" -m "Body paragraph"id:range syntax for partial hunks: --pick <id>:5-20
--pick <id>:2-6,34-37move reorders commits in history. Useful for grouping related changes or
moving a commit to a logical position after splitting.
git-surgeon move <sha> --after <target> -- place commit right after targetgit-surgeon move <sha> --before <target> -- place commit right before targetgit-surgeon move <sha> --to-end -- place commit at HEAD-2, -3 suffixeshunks to get fresh IDs