Instead of Git: Jujutsu

Why Jujutsu is better

• The working copy is a commit that is amended automatically, which replaces both git stash and the staging area.
• An operation log records every command, so jj undo reverses any mistake, including a bad rebase.
• Editing a commit automatically rebases everything on top of it, which makes stacked changes simple.
• Conflicts are stored in commits as first-class objects, so a rebase never stops halfway, and resolving a conflict carries through to descendants.
• LWN reports that its rebase operations are significantly faster than Git's, enough that Git developers proposed a new git replay command in response.

When to keep Git

Stay on plain Git if your workflow depends on Git hooks, submodules or Git LFS, none of which jj supports. Also stay if your team shares scripts and documentation built on git commands, or if you rarely rewrite history and Git already feels fine.

Switching

Run jj git init inside an existing Git repository, or jj git clone for a new one. Both create a colocated workspace, so git and jj work in the same directory, so you can fall back to Git at any time. Branches are called bookmarks and must be moved explicitly before pushing. Expect a few days to unlearn the staging area.

Watch out

The project calls itself experimental and has not reached a stable major release, so commands and config still change between versions. Hooks, submodules and Git LFS are not supported. A Google engineer leads it and several Googlers contribute, while support comes from the community rather than Google.