barrett/diffs.nvim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(neojj): add neojj (jujutsu) integration (#187)

Browse source
This commit is contained in:
Barrett Ruth 2026-03-11 14:02:52 -04:00 • committed by GitHub
parent de04381298
commit 0451445966
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 265 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

22
doc/diffs.nvim.txt
View file

@ -40,6 +40,7 @@ CONTENTS *diffs-contents*
7. Integrations ..................................... |diffs-integrations|
Fugitive .......................................... |diffs-fugitive|
Neogit .............................................. |diffs-neogit|
Neojj ............................................... |diffs-neojj|
Gitsigns .......................................... |diffs-gitsigns|
Telescope ........................................ |diffs-telescope|
8. Conflict Resolution .................................... |diffs-conflict|
@ -84,6 +85,7 @@ Configuration is done via `vim.g.diffs`. Set this before the plugin loads:
integrations = {
fugitive = false,
neogit = false,
neojj = false,
gitsigns = false,
committia = false,
telescope = false,
@ -180,6 +182,14 @@ Configuration is done via `vim.g.diffs`. Set this before the plugin loads:
integrations = { neogit = true }
<
{neojj} (boolean|table, default: false)
Enable neojj integration. When active,
`NeojjStatus`, `NeojjCommitView`, and
`NeojjDiffView` filetypes are registered.
See |diffs-neojj|. >lua
integrations = { neojj = true }
<
{gitsigns} (boolean|table, default: false)
Enable gitsigns.nvim blame popup highlighting.
See |diffs-gitsigns|. >lua
@ -536,6 +546,7 @@ each integration's filetypes and attaches automatically.
integrations = {
fugitive = true,
neogit = true,
neojj = true,
gitsigns = true,
},
}
@ -624,6 +635,17 @@ Expanding a diff in a Neogit buffer (e.g., TAB on a file in the status
view) applies treesitter syntax highlighting and intra-line diffs to the
hunk lines.
------------------------------------------------------------------------------
NEOJJ *diffs-neojj*
Enable neojj (https://github.com/NicholasZolton/neojj) support: >lua
vim.g.diffs = { integrations = { neojj = true } }
<
Expanding a diff in a neojj buffer (e.g., TAB on a file in the status
view) applies treesitter syntax highlighting and intra-line diffs to the
hunk lines.
------------------------------------------------------------------------------
GITSIGNS *diffs-gitsigns*