jj-vcs/jj
Jj
Jujutsu is a distributed version control engine designed to manage project history through mutable commits and a persistent operation log. By treating the working directory as a mutable commit, it eliminates the need for manual staging areas, allowing users to modify repository history directly without checking out specific branches. The system maintains full compatibility with existing remote repositories, ensuring that local workflows remain interoperable with standard version control ecosystems.
A defining characteristic of the project is its conflict-aware architecture, which treats merge conflicts as first-class, persistent objects within the commit history. This approach enables deferred resolution and safer history rewriting, as conflicted states are recorded directly inside commits. Furthermore, the system automates complex tasks such as descendant rebasing and bookmark tracking, ensuring that history remains consistent even when commits are moved or rewritten.
The platform provides a functional query language for precise repository navigation, allowing users to filter and traverse commit graphs using set-based operators and reachability analysis. It also supports advanced operational auditing, where every action is recorded in a directed graph to provide full undo capabilities and visibility into concurrent development. These features are supported by a lock-free design that facilitates synchronization across multiple machines and processes.
The software is distributed as a command-line tool that includes support for shell completion and configuration of user identity. It integrates with existing infrastructure through native submodule support, file rename tracking, and built-in commands for common code hosting platforms.