Skip to content

add dlyongemallo/diffview-plus.nvim as alternative to sindrets/diffview.nvim #1939

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dlyongemallo wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −5
Open

add dlyongemallo/diffview-plus.nvim as alternative to sindrets/diffview.nvim #1939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ body:
plenary = "https://github.com/nvim-lua/plenary.nvim.git",
telescope = "https://github.com/nvim-telescope/telescope.nvim",
diffview = "https://github.com/sindrets/diffview.nvim",
-- or: diffview = "https://github.com/dlyongemallo/diffview-plus.nvim",
neogit = "https://github.com/NeogitOrg/neogit"
})
-- WARN: Do all plugin setup, test runs, reproductions, etc. AFTER calling setup with a list of plugins!
Expand Down
7 changes: 4 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,9 @@ Here's an example spec for [Lazy](https://github.com/folke/lazy.nvim), but you'r
"nvim-lua/plenary.nvim", -- required

-- Only one of these is needed.
"sindrets/diffview.nvim", -- optional
"esmuellert/codediff.nvim", -- optional
"sindrets/diffview.nvim", -- optional
"dlyongemallo/diffview-plus.nvim", -- optional
"esmuellert/codediff.nvim", -- optional

-- For a custom log pager
"m00qek/baleia.nvim", -- optional
Expand Down Expand Up @@ -332,7 +333,7 @@ neogit.setup {
-- Neogit only provides inline diffs. If you want a more traditional way to look at diffs, you can use `diffview`.
-- The diffview integration enables the diff popup.
--
-- Requires you to have `sindrets/diffview.nvim` installed.
-- Requires you to have `dlyongemallo/diffview.nvim` installed.
diffview = nil,

-- Alternative diff viewer integration.
Expand Down
4 changes: 2 additions & 2 deletions doc/neogit.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ to Neovim users.
-- Neogit only provides inline diffs. If you want a more traditional way to look at diffs, you can use `diffview`.
-- The diffview integration enables the diff popup.
--
-- Requires you to have `sindrets/diffview.nvim` installed.
-- Requires you to have `sindrets/diffview.nvim` or `dlyongemallo/diffview-plus.nvim` installed.
diffview = nil,

-- Alternative diff viewer integration.
Expand Down Expand Up @@ -1462,7 +1462,7 @@ ref range.

For these actions to become available, Neogit needs to have a diff viewer
integration enabled. Supported viewers are:
- `diffview.nvim`: https://github.com/sindrets/diffview.nvim
- `diffview.nvim`: https://github.com/dlyongemallo/diffview.nvim
- `codediff.nvim`: https://github.com/esmuellert/codediff.nvim

By default, Neogit will auto-detect which viewer is available. You can
Expand Down