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.
Features
- Version Control Systems - Manages project history as a distributed version control engine with mutable commit objects and persistent operation logs.
- Git Interoperability Layers - Maintains full compatibility with existing remote repositories while utilizing advanced local version control features.
- Mutable Working Copies - Represents the working directory as a mutable commit that updates automatically without manual staging.
- Version Control Utilities - Treats merge conflicts as persistent objects to enable deferred resolution and non-destructive history rewriting.
- Working Copy Management - Treats the working directory as a standard commit that updates automatically to eliminate manual staging.
- Atomic History Manipulators - Allows direct modification of project history and commit structures without manual staging.
- Git Repository Integrators - Allows fetching and pushing code changes directly to remote Git repositories.
- History Rewriting - Enables modifying commit messages, editing file changes, and splitting commits without checking them out.
- Persistent Conflict Management - Treats conflicted states as first-class objects within the commit history.
- Automated Rebasing - Updates descendant commits automatically whenever a parent commit changes.
- Automatic Committers - Commits changes automatically as you work to eliminate the need for manual staging.
- Automatic File Tracking - Tracks file changes automatically by committing updates to the working directory.
- Change Tracking - Assigns stable identifiers to commits that remain constant even when history is rewritten.
- Merge Resolution - Stores merge conflicts directly inside commits to facilitate deferred resolution.
- Operation Audit Logs - Tracks every repository change in a permanent, graph-based log for full undo capabilities.
- Operation Logs - Tracks repository modifications using an operation log that records state changes as a directed graph.
- Query Languages - Provides a functional syntax for selecting and manipulating commit sets through complex graph-traversal operators.
- Revision Selection Languages - Provides a functional language to filter and manipulate commit sets for precise revision identification.
- Undo Systems - Records every action and repository state in a persistent log to enable undo and revert capabilities.
- Developer Tools - Git-compatible version control system.
- Development Tools - Git-compatible version control system with advanced conflict handling.
- Audit Logs - Records every repository action as a directed graph of states to enable full undo capabilities.
- Commit Identifiers - Assigns a constant identifier to commits that remains unchanged as the commit evolves.
- Repository Interoperability Layers - Maintains full interoperability with existing remote hosting services while providing advanced local commit management.
- Repository Synchronization - Synchronizes repository clones using file-level tools and a lock-free design.
- Workspace Managers - Enables maintenance of multiple independent working copies for a single repository.
- Data Structures - Records every repository state change as a directed graph to enable full undo capabilities and concurrent branch management.
- Reference Tracking - Uses named pointers that automatically track commits during history rewrites.
- Revision Expression Engines - Enables composition of complex revision queries using logical and graph-traversal operators.
- Synchronization Tools - Supports multi-machine and multi-process access through a lock-free, file-level design.
- Version Control Evolution Frameworks - Modernizes source code management by replacing manual staging with automated, persistent commit workflows.
- Branching Strategies - Maintains chains of commits that persist until explicitly abandoned, even without named pointers.
- Colocated Workspace Synchronizers - Synchronizes the working directory across multiple tools to allow simultaneous use of different interfaces.
- Forge Integrations - Simplifies the submission of changes to popular code hosting platforms using built-in commands.
- Revision Query Functions - Provides built-in functions for graph-based reachability analysis and depth-limited traversal.
- Version Control History Visualizers - Provides a visual representation of the operation graph, including concurrent forks and merges.
