Jujutsu

Jujutsu is a Git-compatible version control system featuring a first-class working copy and a revolutionary revset engine for non-destructive history manipulation.

Jujutsu (jj) redefines the developer workflow by treating the working copy as a continuous commit, eliminating the need for manual staging or index management. It operates as a powerful frontend for Git repositories, utilizing a unique 'operation log' that allows users to undo any action (including rebases and merges) with a single command. By representing conflicts as first-class objects in the commit graph, jj enables developers to share and evolve broken states across machines without losing metadata. This is a high-performance tool built in Rust for engineers who demand precise, functional control over complex branch topologies.

https://github.com/martinvonz/jj