CheatPress

Jujutsu Git-compatible version control

Version 0.46 · source

Jujutsu, Postcard, light preview Light · Postcard 102 × 152 mm · PDF Jujutsu, Postcard, dark preview Dark · Postcard 102 × 152 mm · PDF Jujutsu, Postcard, ink saver preview Ink saver · Postcard 102 × 152 mm · PDF
Jujutsu, A5, light preview Light · A5 148 × 210 mm · PDF Jujutsu, A5, dark preview Dark · A5 148 × 210 mm · PDF Jujutsu, A5, ink saver preview Ink saver · A5 148 × 210 mm · PDF
Jujutsu, A4, light preview Light · A4 210 × 297 mm · PDF Jujutsu, A4, dark preview Dark · A4 210 × 297 mm · PDF Jujutsu, A4, ink saver preview Ink saver · A4 210 × 297 mm · PDF
Jujutsu, A4 landscape, light preview Light · A4 landscape 297 × 210 mm · PDF Jujutsu, A4 landscape, dark preview Dark · A4 landscape 297 × 210 mm · PDF Jujutsu, A4 landscape, ink saver preview Ink saver · A4 landscape 297 × 210 mm · PDF
Jujutsu, A3, light preview Light · A3 297 × 420 mm · PDF Jujutsu, A3, dark preview Dark · A3 297 × 420 mm · PDF Jujutsu, A3, ink saver preview Ink saver · A3 297 × 420 mm · PDF
Jujutsu, A3 landscape, light preview Light · A3 landscape 420 × 297 mm · PDF Jujutsu, A3 landscape, dark preview Dark · A3 landscape 420 × 297 mm · PDF Jujutsu, A3 landscape, ink saver preview Ink saver · A3 landscape 420 × 297 mm · PDF
Jujutsu, Letter, light preview Light · Letter 8.5 × 11 in · PDF Jujutsu, Letter, dark preview Dark · Letter 8.5 × 11 in · PDF Jujutsu, Letter, ink saver preview Ink saver · Letter 8.5 × 11 in · PDF
Jujutsu, Tabloid, light preview Light · Tabloid 11 × 17 in · PDF Jujutsu, Tabloid, dark preview Dark · Tabloid 11 × 17 in · PDF Jujutsu, Tabloid, ink saver preview Ink saver · Tabloid 11 × 17 in · PDF

Start here

jj git clone <url>
Copy a repository
jj st
What changed?
jj describe -m "<msg>"
Name the current change
jj new
Start the next change
jj log
See history
jj squash
Fold into the parent
jj git push
Share bookmarks
jj undo
Revert the last operation

Concepts

  1. Edit files amends @
  2. Describe set the message
  3. New change fresh empty @
  4. Bookmark branch pointer
  5. Remote origin

Setup

jj git clone <url>
Clone a Git repository
jj git init --colocate
Use jj in an existing Git repo
Keeps a .git directory so git and other Git tools keep working.
jj git init
Create a new repository here
jj config set --user user.name "<name>"
Set your name
jj config set --user user.email "<email>"
Set your email
jj config edit --user
Edit the user config file
jj config list
Show active settings

Changes

jj st
Show the working-copy change
jj diff
Diff of the current change
jj diff -r <rev>
Diff of another change
jj diff --from <a> --to <b>
Compare two revisions
jj show <rev>
Message and diff of a change
jj describe -m "<msg>"
Set the current change's message
jj describe <rev>
Edit another change's message
jj commit -m "<msg>"
Describe @ and start a new one
Shortcut for describe followed by new.
jj new
Start a new empty change on @
jj new <rev>
Start a new change on <rev>
jj new -m "<msg>"
New change with a message
jj edit <rev>
Make <rev> the working copy
jj next / jj prev
Step to child or parent
jj restore <path>
Discard changes to a file
jj file untrack <path>
Stop tracking a file

History

jj log
Show the revision graph
jj log -r <revset>
Log selected revisions
Examples: @, @-, trunk()..@, mine().
jj log -p
Log with patches
jj log -n <n> -G
Last n changes, no graph
jj evolog
How a change evolved
jj file annotate <path>
Blame a file
jj file show -r <rev> <path>
Print a file at a revision
jj file list
List tracked files

Rewriting

jj squash
Move @ into its parent
jj squash --into <rev>
Move @ into any ancestor
jj squash -i
Pick which parts to move
jj split
Split @ into two changes
jj absorb
Auto-squash edits into ancestors
Each hunk goes to the mutable ancestor that last touched those lines.
jj rebase -s <rev> -o <dest>
Move a change and its descendants
jj rebase -r <rev> -o <dest>
Move only one change
jj rebase -b <rev> -o <dest>
Move a whole branch
jj duplicate <rev>
Copy a change
jj abandon <rev>
Drop a change, keep its children
jj revert -r <rev> -o @
Apply the inverse of a change
jj diffedit -r <rev>
Edit a change's diff in a tool

Bookmarks & remotes

jj bookmark list
List bookmarks
jj bookmark create <name>
Create a bookmark at @
jj bookmark set <name> -r <rev>
Point a bookmark at a revision
jj bookmark move --from <a> --to <b>
Move bookmarks between revisions
jj bookmark delete <name>
Delete a bookmark
jj bookmark track <name>@<remote>
Track a remote bookmark
jj git fetch
Fetch from the remote
jj git push
Push changed bookmarks
jj git push -b <name>
Push one bookmark
jj git push -c <rev>
Push with an auto-named bookmark
jj git push --dry-run
Preview what would be pushed
jj git remote add <name> <url>
Add a remote
jj git remote list
List remotes

Undo & conflicts

jj undo
Undo the last operation
jj redo
Redo an undone operation
jj op log
List past operations
jj op restore <id>
Restore the repo to an operation
jj op revert <id>
Undo one specific operation
jj resolve
Resolve conflicts with a merge tool
jj resolve --list
List conflicted files
jj workspace add <path>
Add another working copy

Recipes

Feature change and push
jj git fetchjj new main -m "Add feature"# edit filesjj bookmark set my-feature -r @jj git push -b my-feature
Fix an earlier change
jj new <rev># edit files to fix itjj squash          # fold fix into the parent# or: jj absorb
Rebase onto updated main
jj git fetchjj rebase -s <rev> -o main@originjj log
Recover from a mistake
jj op logjj undo# or go back furtherjj op restore <id>