Jujutsu (jj) Usage Guide for Claude Code

Use jj (Jujutsu) instead of git for version control. jj is Git-compatible with a simpler model and powerful history editing.

Delegate noisy work to a subagent

For multi-step VCS work — history cleanup, rebase, conflict resolution, splitting commits — spawn a subagent (Sonnet) to do it and return a one-line summary. This keeps verbose jj log/diff/op log output and this reference out of the parent's context, saving tokens. Tell the subagent exactly what changed and what the end state should be.

Do NOT delegate trivial one-shots (jj describe -m … && jj git push) — spawn overhead exceeds the saving. Run those inline.

Mental model