Jujutsu (jj) Version Control Guide

Jujutsu is a modern, Git-compatible version control system. This project uses jj colocated with git.

Non-Interactive Usage (for Agents)

When using jj in automated contexts (CI, scripts, agents), use these flags to prevent blocking:

Flag	Use With	Purpose
`--no-pager`	`log`, `diff`, `show`, `op log`, `evolog`	Prevents pager from opening
`-m "message"`	`commit`, `describe`, `new`	Avoids opening editor for message
`--no-edit`	Various	Skip editor prompts
`--tool=:ours` / `--tool=:theirs`	`resolve`	Non-interactive conflict resolution

Always use --no-pager for any command that displays output in agent/script contexts.

To permanently disable the pager (useful for CI/agent environments):

bash

jj config set --user ui.paginate never

Or add to your config file (~/.config/jj/config.toml):

toml

[ui]
paginate = "never"

Concept	Git	Jujutsu
Staging area	Explicit `git add`	None - working copy IS a commit
Branches	Named refs	Bookmarks (auto-follow rewrites)
Stash	Separate stash stack	Not needed - just use commits
Amend	`git commit --amend`	Just edit files, or use `jj squash`
Identity	Commit ID only	Change ID (stable) + Commit ID

Task	Command (use `--no-pager` for agents)
Status	`jj status` or `jj st`
Diff	`jj diff` (or `jj --no-pager diff`)
Log	`jj log` (or `jj --no-pager log`)
Commit & continue	`jj commit -m "message"`
Update message	`jj describe -m "message"`
New empty commit	`jj new`
Squash into parent	`jj squash`
Undo last operation	`jj undo`
Fetch from remote	`jj git fetch`
Push to remote	`jj git push`
Create & push bookmark	`jj git push --named name=@`
Push existing bookmark	`jj git push --bookmark name`

The working copy (@) is always a commit. File changes are automatically tracked - no staging required.

code

parent commit
    ↓
@ (working copy) ← your edits go here automatically

Git	Jujutsu
`git status`	`jj st`
`git diff`	`jj diff`
`git log`	`jj log`
`git add . && git commit -m "msg"`	`jj commit -m "msg"`
`git push`	`jj git push`
`git pull`	`jj git fetch` then `jj rebase -d main@origin`
`git checkout -b branch`	`jj new main` then `jj bookmark set branch`
`git branch`	`jj bookmark list`
`git stash`	`jj new` (just start new commit)
`git blame`	`jj file annotate`