
jj-toolkit
Work with Jujutsu history and hunk-level changes.
- version
- 0.1.8
- GitHub stars
- 347
Install
/plugin install jj-toolkit@khanelinix-ai-toolsRun it inside Claude Code after adding the marketplace with /plugin marketplace add khaneliman/khanelinix.
Contents
Discovered from sourceSkills 1
Jujutsu Toolkit
Route to one mode and read only its reference:
- hunk-edit: split, squash, restore, or move exact hunks with
jj-hunk-tool. Read jj-surgeon.md. - conflicts: resolve conflicted changes or rebases. Read conflict-resolution.md.
- bisect: identify a first bad change. Read bisect.md.
- git-interop: bookmarks, colocated repositories, push visibility, and GitHub boundaries. Read git-interop.md.
- revsets/templates: write or debug selection and output expressions. Read revset-reference.md or template-reference.md.
- workspaces: create, inspect, or clean up parallel workspaces. Read workspaces.md.
Use model-known jj mechanics for routine operations. Load the upstream
jj-surgeon guide only for hunk-level work or when another focused reference
routes there.
Non-negotiable: move the bookmark
In a git-colocated repo, moving the bookmark is part of finishing a change, not
a follow-up. Committing without it leaves the Git branch behind and the work
invisible to git log, gh, CI, and reviewers. This is the most common agent
failure mode with jj. A commit with no bookmark on it is not on a branch.
After creating or rewriting a commit stack in a git-colocated repository,
confirm its bookmark sits on the intended stack tip and task-owned changes have
been committed, leaving @ empty when no unrelated work remains. Do not move
bookmarks or empty the working copy for inspection, explanation, or diagnosis.
Follow
references/git-interop.md.
Read it before your first commit, not after.
MIT attribution: references/LICENSE-jj-hunk-tool.
Sponsors
Details
- Marketplace
- khaneliman/khanelinix
- Source
- modules/common/ai-tools/skills/jj-toolkit
- Author
- khaneliman
- Category
- Developer Tools
More from khaneliman/khanelinix
All 43- lua-toolkitv0.2.0
- mcp-builderv0.1.6
- memory-profilerv0.1.6
- microsoft-teamsv0.1.0
- nix-toolkitv0.4.12
- okf-memoryv0.1.6
- performance-forensicsv0.1.4
- planning-with-filesv0.1.9
- program-orchestrationv0.1.5
- recallv0.1.7
- requirements-interviewv0.1.4
- researchv0.1.3
- rust-toolkitv0.1.6
- sarif-toolkitv0.1.5
- security-toolkitv0.1.7
- show-me-your-workv0.1.7
- skill-creatorv0.1.8
- software-engineeringv0.1.9
- tddv0.1.4
- technical-writingv0.2.0
- to-specv0.1.1
- to-ticketsv0.1.1
- typescript-best-practicesv0.1.6
- unslopv0.1.7