About Majutsu
Majutsu is a Magit-inspired Emacs interface for Jujutsu. It provides an interactive log viewer and commands for inspecting and rewriting revision history. It uses Magit's section and transient systems and provides visual workflows for operations such as rebasing, squashing, and conflict resolution.
About Jujutsu
Jujutsu (jj) is a version control system whose working copy is represented by a
commit. Unlike Git, it has no staging area: the working-copy commit is marked
@, and jj snapshots filesystem changes into it at the beginning of most
commands. Mutable history and conflicts are first-class parts of Jujutsu's
model, making rebasing, squashing, and conflict resolution ordinary operations.
Acknowledgments
Majutsu stands on the shoulders of giants. We are grateful to:
The Jujutsu community for creating a revolutionary VCS.
The Magit authors and contributors for defining the gold standard of VCS interfaces.
Brandon Olivier for the initial codebase of
jj-mode.el.