| name | jj-toolkit |
| description | Use for working with Jujutsu (jj) history workflows, including hunk-level split/squash/diffedit/restore via `jj-hunk-tool`. |
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.
Before reporting any jj work done, confirm the bookmark sits on your stack tip
and @ is empty. Follow
references/git-interop.md.
Read it before your first commit, not after.
MIT attribution:
references/LICENSE-jj-hunk-tool.
