Skip to content
0WD0Public

About

Majutsu! Magit for jujutsu

Topics

Resources

Stars

288 stars

Watchers

3 watching

Forks

Latest commit

 

History

900 Commits

Folders and files

NameName
Last commit message
Last commit date
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

Repository files navigation

Majutsu — Shape history without leaving Emacs

Majutsu is a Magit-style interface for Jujutsu (jj) in Emacs: a log you can act on, diffs you can select from, and transients for jj’s commands.

Read the manual at majutsu.org, or its source in docs/majutsu.org.

Installation

;; Doom Emacs (packages.el)
(package! majutsu :recipe (:host github :repo "0WD0/majutsu"))

;; use-package + straight.el
(use-package majutsu
  :straight (:host github :repo "0WD0/majutsu"))

;; use-package + package-vc (Emacs 30+)
(use-package majutsu
  :vc (:url "https://github.com/0WD0/majutsu" :rev :newest))

Usage

M-x majutsu in a jj repository opens the log.

  • n / p move between revisions (Evil: C-j / C-k); [ and ] jump to a parent or a child.
  • TAB folds the section at point.
  • ? lists every command.
  • RET on a revision shows its diff; in a diff it visits the file.
  • $ (Evil: `) shows what jj printed.

Commands open a transient in which you set options and pick revisions from the log before anything runs.

VanillaEvilCommand
ooNew change
ccDescribe
wiEdit descriptions in place
CCCommit
eeEdit a revision
kxAbandon
ssSquash
SSSplit
aaAbsorb
RRRestore
rrRebase
V_Revert
? y? yDuplicate
ddDiff
EEEdiff
MMResolve conflicts
bbBookmarks
? t? tTags
G? GGit: fetch, push, remotes, Gerrit
Z*Workspaces
lLLog options
v? vEvolution log
XXOperation log, restore, revert
C-/uUndo
C-?C-rRedo
!!Run a jj or shell command
gg rRefresh

In a diff, Split, Squash, Absorb, and Restore can take selected hunks, files, or lines instead of the whole change.

Integrations

All optional; see Integrations in the manual.

Evil
Normal-state bindings are installed when Evil is present.
Embark
embark-act works on bookmarks, revisions, remotes, and workspaces.
Forge
(majutsu-forge-mode 1) shows pull requests and issues in the log of a colocated repository.
Org
org-store-link in a Majutsu buffer stores a link to a revision or a repository.
TRAMP
Repositories on remote hosts work.
Ghostel
Runs jj’s terminal diff editor and jj arrange inside Emacs.

Requirements

Documentation

License

GNU GPL v3 or later. LICENSE-MIT keeps the notice of the code from before the change of license.

Credits

Majutsu began as a fork of jj-mode.el by Brandon Olivier. It builds on Magit’s sections and transients.

Contributing

Issues and pull requests are welcome at https://github.com/0WD0/majutsu

About

Majutsu! Magit for jujutsu

Topics

Resources

Stars

288 stars

Watchers

3 watching

Forks

Releases

Contributors

Languages