Working with jj

This repository, like most of the user's repositories, is managed with Jujutsu (jj) and colocated with Git. Git sees a detached HEAD; that is expected.

Mental modelCopy Anchor Link

• The working copy is a commit, @. There is no staging area; edits are part of @ automatically.
• After jj commit, the finished change is @- and @ is a new empty change.
• Bookmarks (jj's branches) do not move by themselves. main is moved explicitly or by the sync alias's push of the current stack.

Everyday commandsCopy Anchor Link

jj status          # what changed in @
jj diff            # the diff of @
jj logn            # local, unpublished work on top of trunk
jj commit          # describe @ (with an AI-drafted message) and start a new change
jj pull            # fetch, then rebase the local stack onto trunk
jj sync            # pull, then push the current stack's bookmarks

logn, pull, and sync are aliases defined by the VCS module.

Tooling that understands jjCopy Anchor Link