Jujutsu brings automatic rebasing and native undo to version control

Jujutsu Primer

Jujutsu brings automatic rebasing and native undo to version control

A primer on Jujutsu (jj), a version control system that works alongside Git in the same repository. It offers automatic rebasing, native undo, and a branchless model where you edit a graph of commits instead of juggling branches. The guide covers installation, setup, creating and evolving changes, revsets for selecting revisions, and navigating the commit graph, aimed at Git users curious about a smoother workflow.

Features like automatic rebase and native undo soften the sharp edges of Git.
  1. sarthak-ag

    I wrote a piece on what specific advantages jj brings over git, and what kind of development workflows deserve it. Give it a read if you are debating internally whether jj deserves a place in your toolbox: https://sarthakag.bearblog.dev/from-git-to-jj-jujutsu/

  2. nixpulvis

    I'm skeptical about the no staging area, but it seems just like a HEAD commit replaces that, which could be nice.

    I really don't like the automatic bookmark naming thing.

    I'm also skeptical about automatic rebasing, but having conflicts not block the process could be nice, I'll have to try it out on more complex trees.

    Also, I didn't see a section on workspaces, but I assume they basically do the right thing.

  3. pkuki

    Shameless plug, but a bit related to jj:)

    I recently created a project which utilizes FUSE to serve git files directly from object store without a checkout. Main motivation was to sepeedup a worktrees creation (I work on a huge monorepo). In my case it helps a lot - now I wait a second instead of a minute.

    But then I realised there are other interesting features which having vfs opened:

    - tree structure of related branches (simplest case of that are stacked PRs) which rebases itself

    - live preview of merge state or any node of such tree

    - on demand creation of a new branch which merges any of the existing ones very cheaply (e.g for a throwaway build check)

    - quick and simple comand which shows conflicting files between selected worktree and all others

    - agents gets notified about such conflicts when they happen

    I was able to design it in a way so git sees those virtual workspaces as normal worktrees, and all git commands works exactly as you would expect. So I think for some people, especially on the very big repositpries, it might solve a few problems they try to solve with jj.

    https://github.com/pkukielka/gitfold

    A few typical use cases: https://github.com/pkukielka/gitfold/blob/main/docs/guide.md

  4. danpalmer

    I've been using JJ almost exclusively for over 2 years now. It's great, it works fantastically with our rather large monorepo at work.

    However I mostly use it backing on to a custom VCS, not git. I can't wait to see some JJ-native forges that don't try to keep it compatible with git, I think there's a lot more benefits and more UX to be explored there!

  5. tkz1312

    I'm fully onboard with the idea that git is horrible to learn and unfriendly for beginners, and also that jj is more convenient and a better UX. I do however struggle to find the point of it for me personally when I've suffered with git for long enough that it has become deeply familiar and very intuitive, and these days I mostly interact with it at a distance through a robot. I've yet to see anything which is for me personally compelling enough to make the effort to switch.

  6. esseph

    [delayed]

  7. pprotas

    JJ would be interesting to me pre-AI, but these days I don't run VCS commands myself so the problems JJ solves don't apply to me anymore

  8. textlapse

    Does this work well with LLM workflows? Any advantages over git for say Claude or GPT or Gemini to stage changes in a better way?

More from this day

2026-11-20