mcpField
G
git-hunk

git-hunk

github.com/wkentaroDevelopment14136 installsUpdated 2d ago
Repository

About git-hunk

git-hunk is a command-line tool and workflow for dividing working-tree changes into focused commits. It lets developers inspect, stage, unstage, or discard whole and partial hunks by content-based IDs.

Key features

  1. 01List and inspect change hunks
  2. 02Stage hunks by ID or line range
  3. 03Unstage or discard selected changes
  4. 04Filter output by file path or state
  5. 05Use stable content-based hunk IDs

Use cases

  1. 01Separate unrelated edits into focused commits
  2. 02Stage only selected lines from a larger change
  3. 03Review staged and unstaged work before committing

Install

Copy the command and run it in a terminal.

$npx skills add https://github.com/wkentaro/git-hunk --skill git-hunk

After installing, type/git-hunkin Claude Code to confirm it loaded.

Details

From the project README

/git-hunk - split changes into focused commits

Requires: uv tool install git-hunk (or pip install git-hunk)

Workflow

  1. git-hunk list — see all hunks (file, id, +/- stats). No diffs.
  2. git-hunk show [<id>...] when headers aren't clear enough (no args shows all).
  3. Plan commits before staging. For each planned commit, list the hunk IDs (and -l line ranges for partial hunks). A single hunk may need to be split across commits. Ask the user if grouping is ambiguous.
  4. Stage and commit each group: 
    git-hunk stage <id1> <id2> ...
git commit -m "<type>: <description>"
  5. git-hunk list again to check nothing got left behind.

Partial hunks

Line selection (-l) works with stage, unstage, and discard (requires single id):

  • Include lines: git-hunk stage <id> -l 3,5-7
  • Exclude lines: git-hunk stage <id> -l ^3,^5-7

Fixing mistakes

  • git-hunk unstage <id1> <id2> ... — move staged hunks back to working tree.
  • git-hunk unstage <id> -l 3,5-7 — partially unstage specific lines.
  • git-hunk discard <id1> <id2> ... — permanently discard unstaged hunks (restore from HEAD).
  • git-hunk discard <id> -l 3,5-7 — partially discard specific lines.

Example git-hunk list output

unstaged:
labelme/app.py
  c43213b  @@ -78,6 +78,7 @@ _AI_CREATE_MODES  +1
  4da0d77  @@ -1364,6 +1365,19 @@ class MainWindow  +13
labelme/translate/de_DE.qm
  7a3befc  Binary file

Notes

  • IDs are content-based hashes, stable across partial staging, and support prefix matching
  • git-hunk list [<file>...] — filter hunks by file path
  • --staged / --unstaged to filter list and show (both search staged+unstaged by default)
  • --json exists but plain output is usually enough
  • One logical change per commit, conventional commit messages

Comments

Markdown supported