Keyboard shortcuts

Press ← or → to navigate between chapters

Press S or / to search in the book

Press ? to show this help

Press Esc to hide this help

Inspecting a commit

Reset your progress

To reset your progress, run this command and cd into the tutorial repository:

curl https://s2p2.github.io/jj-for-everyone/reset.sh | bash -s show
cd ~/jj-tutorial/repo

Alice sees Bob also made changes. To check if they conflict with her own, she inspects his commit using jj show on the main@origin remote bookmark.

jj show main@origin

Commit ID: 8d53839037b21e262e410e087606925f7582914e
Change ID: quolxwkkstmturozxxxrkkpxxxnnosry
Bookmarks: main?? main@origin
Author   : Bob <bob@local> (2025-07-22 21:22:17)
Committer: Bob <bob@local> (2025-07-22 21:22:22)

    Document hello.py in README.md

    The file hello.py doesn't exist yet, because Alice is working on that.
    Once our changes are combined, this documentation will be accurate.

Modified regular file README.md:
   1    1: # jj-tutorial
   2    2:
   3     : This is a toy repository for learning Jujutsu.
        3: The file hello.py contains a script that greets the world.
        4: It can be executed with the command 'python hello.py'.
        5: Programming is fun!

The jj show command provides more detail than jj log:

  • Commit and Change IDs: Shows the full IDs, not just the short prefixes.
  • Bookmarks: Lists any bookmarks pointing to this commit.
  • Author and Committer: Includes full author/committer info and timestamps.
  • Commit Message: Displays the complete message, including the body.
  • Diff: Shows the precise file changes, with additions in green and removals in red.

Author vs. Committer

The author is who wrote the code. The committer is who created the commit. They are usually the same.

They can differ if one person applies a patch submitted by another. For example, to set a different author for the current commit, you can run:

jj describe --author "Claire <claire@local>" --no-edit

Alice confirms the changes are compatible: Bob only modified README.md, while she added hello.py. Now she can combine them.