{"repo":"emilien-jegou/oyui","free":true,"listed":false,"github":"https://github.com/emilien-jegou/oyui","clone":"git clone https://github.com/emilien-jegou/oyui.git","description":"Modern TUI merge tool and interactive diff editor for Jujutsu (jj) and Git","language":"Rust","stars":143,"topics":["git","jj","jujutsu","tui","diff","diff-tool","merge-editor"],"license":null,"category":"cli-tools","readme_excerpt":"Oyui Oyui is a modern TUI merge tool and staging interface for Jujutsu and Git. Features 🔧 Scriptable config with hot reload: Your config is a script much like how vim use lua or emacs use lisp, oyui use rune! modify it and see changes live. 🖥️ Command Palette: Perform bulk operations with simple commands. :add / md -- to stage all markdown files in diff. :unstage / md -- to unstage them. 🔢 Binary support: Infer binary files format using their magic number signature). 🧠 Config LSP: Oyui come with a complex type-safe LSP builtin, set it up and avoid configuration error. 🎨 Theming: 40+ builtin themes, check full list. Command support - Full support: jj commit -i , jj squash -i , jj split , jj diffedit , jj restore -i - Partial support: git difftool , jj diff , jj interdiff 🚧 - Planned features: jj resolve , git mergetool Why Another merge editor? While Jujutsu is a powerful VCS, the built-in diff-editing experience (via scm-record ) is quite limited. It lack syntax highlighting, is mostly monochromatic, and made it difficult to visualize the impact of changes across full files. Although some more polished solution like lightjj exist (web based), we were missing a modern TUI merge editor. 📦 Installation Cargo Nix Flakes Add oyui to your flake.nix inputs: Then, add it to your system packages: ⚙️ Configuration Setup the default config for oyui at /.config/oyui/config.rn : Usage with Jujutsu ( config.toml ) To use oyui as your primary merge editor with Jujutsu add the follow","default_branch":null,"files":null,"tree":[],"storefront":"/r/emilien-jegou","claimed":false,"request_supported":{"post":"https://gitbuyer.com/r/emilien-jegou/oyui/request-supported","requests":0},"note":"indexed from public GitHub; nothing is for sale on this page. Clone it from GitHub. Paid listings live at /search."}