jj

name: jj description: Jujutsu (jj) version control system - a Git-compatible VCS with novel features. Use when working with jj repositories, managing stacked/dependent commits, needing automatic rebasing with first-class conflict handling, using revsets to select commits, or wanting enhanced Git workflows. Triggers on mentions of 'jj', 'jujutsu', change IDs, operation log, or jj-specific commands.

Jujutsu (jj) Version Control System

Overview

Jujutsu is a powerful Git-compatible version control system that combines ideas from Git, Mercurial, Darcs, and adds novel features. It uses Git repositories as a storage backend, making it fully interoperable with existing Git tooling.

Key differentiators from Git:

• Working copy is automatically committed (no staging area)
• Conflicts can be committed and resolved later
• Automatic rebasing of descendants when commits change
• Operation log enables easy undo of any operation
• Revsets provide powerful commit selection
• Change IDs stay stable across rewrites (unlike commit hashes)

When to Use This Skill

• User mentions "jj", "jujutsu", or "jujutsu vcs"
• Working with stacked/dependent commits
• Questions about change IDs vs commit IDs
• Revset queries for selecting commits
• Conflict resolution workflows in jj
• Git interoperability with jj
• Operation log, undo, or redo operations
• History rewriting (squash, split, rebase, diffedit)
• Bookmark management (jj's equivalent of branches)

Key Concepts

Working Copy as a Commit

In jj, the working copy is always a commit. Changes are automatically snapshotted:

# No need for 'git add' - changes are tracked automatically
jj status        # Shows working copy state
jj diff          # Shows changes in working copy commit

When Snapshots Are Triggered

The working copy is snapshotted into @ when running most jj commands (new, status, diff, log, describe). Force a snapshot with jj util snapshot or just run any jj command.

Change ID vs Commit ID

• Change ID: Stable identifier that persists across rewrites (e.g., kntqzsqt)
• Commit ID: Hash that changes when commit is rewritten (e.g., 5d39e19d)

Always prefer change IDs when referring to commits in commands.

Versioned access (0.37+): Use xyz/n suffix to access hidden/divergent versions:

• xyz/0 - latest version of change xyz
• xyz/1 - previous version (useful for jj restore --from xyz/1 --to xyz)
• Shown automatically in jj log for divergent changes

No Staging Area

Instead of staging, use these patterns:

• jj split - Split working copy into multiple commits
• jj squash -i - Interactively move changes to parent
• Direct editing with jj diffedit

First-Class Conflicts

Conflicts are recorded in commits, not blocking operations:

jj rebase -s X -d Y     # Succeeds even with conflicts
jj log                   # Shows conflicted commits with ×
jj new <conflicted>      # Work on top of conflict
# Edit files to resolve, then:
jj squash                # Move resolution into parent

Operation Log

Every operation is recorded and can be undone:

jj op log                # View operation history
jj undo                  # Undo last operation
jj redo                  # Redo undone operation
jj op revert <op-id>     # Revert specific operation
jj op restore <op-id>    # Restore to specific operation

Essential Commands

Common Workflows

Starting a New Change

# Working copy changes are auto-committed
# When ready to start fresh work:
jj new                    # Create new commit on top
jj describe -m "message"  # Set description
# Or combine:
jj new -m "Start feature X"

Editing a Previous Commit

# Option 1: Edit in place
jj edit <change-id>       # Make working copy edit that commit
# Make changes, they're auto-committed
jj new                    # Return to working on new changes

# Option 2: Squash changes into parent
jj squash                 # Move all changes to parent
jj squash -i              # Interactively select changes

# Option 3: Auto-squash into correct commits in stack
jj absorb                 # Each hunk goes to commit that last changed those lines

Rebasing Commits

# Rebase current branch onto main
jj rebase -d main

# Rebase specific revision and descendants
jj rebase -s <rev> -d <destination>

# Rebase only specific revisions (not descendants)
jj rebase -r <rev> -d <destination>

# Insert commit between others
jj rebase -r X -A Y       # Insert X after Y
jj rebase -r X -B Y       # Insert X before Y

# Simplify redundant parents during rebase
jj rebase -s <rev> -d <dest> --simplify-parents

Reordering Commits with jj arrange

jj arrange <revset>       # Open TUI to reorder/abandon commits

The TUI shows selected commits with their immediate parents/children. Use swap up/down to reorder along graph edges.

Working with Bookmarks (Branches)

jj bookmark list          # List bookmarks
jj bookmark create <name> # Create at current commit
jj bookmark set <name>    # Move bookmark to current commit
jj bookmark delete <name> # Delete bookmark
jj bookmark track <name> --remote <remote>  # Track remote bookmark
jj bookmark advance       # Move bookmark forward to @ (like "jj tug")

Gotchas: Use --allow-backwards to move a bookmark to an ancestor. The * suffix in log means diverged from remote (push to sync). Use bookmark set (not create) if the bookmark may already exist on a remote.

Searching File Contents

jj file search <pattern>                  # Search with regex (default)
jj file search --pattern "glob:*.rs"      # Use glob pattern
jj file search --pattern "substring:foo"  # Substring match
jj file search -r <rev> <pattern>         # Search at specific revision

Pushing Changes

# Push specific bookmark
jj git push --bookmark <name>

# Push change by creating auto-named bookmark
jj git push --change <change-id>

# Push all bookmarks (skips ineligible: private/conflicted)
jj git push --all

# Pass push options to remote server
jj git push --bookmark <name> --option key=value

Reorder a pushed/stacked branch: jj rebase --ignore-immutable -s <change> -d <dest> (descendants auto-rebase), then jj git push --bookmark <name> — jj git push is force-with-lease-safe by default (no flag). See references/github-workflow.md.

Resolving Conflicts

# After a rebase creates conflicts:
jj log                    # Find conflicted commit (marked with ×)
jj new <conflicted>       # Create commit on top
# Edit files to resolve conflicts
jj squash                 # Move resolution into conflicted commit

# Or use external merge tool:
jj resolve                # Opens merge tool for each conflict
jj resolve --list         # List all conflicted files

Binary & Merge Conflict Resolution

Binary files cannot have conflict markers - resolve by choosing a version:

jj restore --from main path/to/binary.wasm    # Take from specific revision

Multi-parent merge conflicts:

jj new <conflicted-merge>    # Create child of merge
# Edit files to resolve
jj squash                    # Move resolutions into merge

Creating multi-parent merges:

jj new branch-a branch-b branch-c -m "integration: merge features"

Undoing Mistakes

jj undo                   # Undo last operation
jj redo                   # Redo undone operation
jj op log                 # View operation history
jj op revert <op-id>      # Revert specific operation
jj op restore <op-id>     # Restore to specific state

# View repo at past operation
jj --at-op=<op-id> log

# Run command without affecting repo state (read-only inspection)
jj --no-integrate-operation log -r 'trunk()..@'

Revsets Quick Reference

Examples:

jj log -r '@::'           # Working copy and descendants
jj log -r 'trunk()..@'    # Commits between trunk and working copy
jj log -r 'mine() & ::@'  # My commits in working copy ancestry
jj rebase -s 'roots(trunk()..@)' -d trunk()  # Rebase branch onto trunk

Git Interoperability

Colocated Repositories

By default, jj git clone and jj git init create colocated repos where both jj and git commands work:

jj git clone <url>        # Creates colocated repo (default)
jj git clone --no-colocate <url>  # Non-colocated (jj only)

Converting Existing Git Repo

cd existing-git-repo
jj git init --colocate    # Add jj to existing Git repo

In colocated repos, Git changes are auto-imported. If git and jj disagree, use jj git import / jj git export. Best practice: primarily use jj commands.

Colocated repos: Git sees @ as uncommitted

Git's HEAD tracks @'s parent (@-), so @'s own changes look uncommitted to git. git checkout/git switch (and git-based tooling — gh, git-chain, hooks) can abort — but only when the target branch touches the same files as the @-vs-parent diff (error: Your local changes to the following files would be overwritten by checkout … Please commit your changes or stash them before you switch branches. Aborting); with no file overlap the checkout succeeds and carries the change over. Fix — park @ so the tree is fully committed first:

jj new <bookmark>         # empty commit on the tip → clean, fully-committed tree
git checkout <bookmark>   # now succeeds

Configuration

Edit config with jj config edit --user (or --repo for per-repo config, stored outside the repo since 0.38):

[user]
name = "Your Name"
email = "your@email.com"

[ui]
default-command = "log"   # Run 'jj log' when no command given
diff-editor = ":builtin"  # For interactive diff editing (split, squash -i)

[revset-aliases]
'wip' = 'description(exact:"") & mine()'  # Custom revset alias

For automation/LLMs: Use -m flags instead of relying on editors. See Non-Interactive Workflows for patterns that work without user interaction.

See references/configuration.md for comprehensive configuration options including editor setup for interactive use.

Template Language

Customize output with -T/--template:

jj log -T 'change_id.short(8) ++ " " ++ description.first_line() ++ "\n"'
jj log -T 'if(conflict, "CONFLICT ", "") ++ description.first_line()'

Key: ++ concatenates, if(cond, then, else) conditionals, separate(sep, ...) joins non-empty. See references/templates.md.

Filesets

Select files in commands using fileset expressions:

jj diff 'glob:*.rs'              # Rust files in cwd
jj diff '~Cargo.lock'            # Everything except Cargo.lock
jj split 'glob:**/test_*'        # Test files only
jj log -r 'files("src")'         # Commits touching src/

See references/filesets.md.

Advanced Topics

For comprehensive documentation, see:

• references/github-workflow.md - GitHub/GitLab PR workflows
• references/conflicts.md - Conflict resolution deep dive
• references/faq-patterns.md - Common patterns & FAQ
• references/templates.md - Template language reference
• references/filesets.md - Fileset language reference
• references/revsets.md - Complete revset reference
• references/commands.md - Full command reference
• references/configuration.md - Configuration reference
• references/git-comparison.md - Git to jj command mapping

Troubleshooting

"Working copy is dirty" - Never happens in jj! Working copy is always a commit.

Conflicts after rebase - Normal in jj. Conflicts are recorded, resolve when convenient.

Lost commits - Use jj op log to find when commits existed, then jj op restore.

Divergent changes - Same change ID, different commits. Usually from concurrent edits:

jj log                    # Shows divergent commits with xyz/0, xyz/1 suffixes
jj diff --from xyz/0 --to xyz/1  # Compare versions
jj abandon <unwanted>     # Remove one version
jj restore --from xyz/1 --to xyz  # Restore to previous version

Immutable commit error - Can't modify trunk(), tags, or untracked remote bookmarks (e.g. branches pushed via git/gh/git-chain, not jj git push) by default:

jj --ignore-immutable <command>   # Override globally (before the subcommand)
jj <command> --ignore-immutable   # Or after the subcommand — both work
# then push

Non-Interactive Workflows

Many jj commands open an editor by default. Use these flags for automation and CLI workflows:

Commit Messages Without Editor

Squash Without Editor

# Use destination's message (discard source)
jj squash --use-destination-message    # or -u

# Provide explicit message
jj squash -m "Combined commit message"

Note: If either commit has an empty description, jj automatically uses the non-empty one without opening an editor.

Conflict Resolution Without Merge Tool

# Use built-in tools instead of external merge tool
jj resolve --tool :ours <file>      # Take "our" version (side #1)
jj resolve --tool :theirs <file>    # Take "their" version (side #2)

# Or use restore for complete replacement
jj restore --from <rev> <file>      # Take file from specific revision

Inherently Interactive Commands

These commands cannot be made non-interactive:

• jj split (without file arguments) - requires diff selection (workaround: pass file paths, e.g. jj split -m "First commit" src/file1.rs)
• jj diffedit - opens diff editor by design
• jj resolve (without --tool) - opens merge tool
• jj arrange - TUI by design

Common Pitfalls

Push Flag Combinations

Some jj git push flag combinations don't work together:

Note (0.41+): --all, --tracked, and -r REVSETS no longer fail when revisions are private or have conflicts - ineligible bookmarks are silently skipped.

Working Copy Changes on Merge Commits

When you jj edit a merge commit, changes appear as "working copy changes" - this is expected. Run jj new to start a fresh commit on top. An empty, description-less, bookmark-less @ is auto-abandoned when you move off it (e.g. via jj new), so a manual jj abandon is usually unnecessary.

Bookmark Movement Refused

If jj bookmark set fails because it would move "backwards":

jj bookmark set name -r <rev> --allow-backwards

This flag is required when moving a bookmark to an ancestor of its current position.

Minimum Version Requirements