Nvim: add diffview plugin
This commit is contained in:
parent
6997121c4e
commit
bb75584fa2
3 changed files with 8 additions and 3 deletions
|
@ -28,7 +28,7 @@ keepBackup = false
|
||||||
prompt = false
|
prompt = false
|
||||||
|
|
||||||
[mergetool "nvim"]
|
[mergetool "nvim"]
|
||||||
cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
|
cmd = nvim +DiffviewOpen
|
||||||
|
|
||||||
[diff]
|
[diff]
|
||||||
tool = nvim
|
tool = nvim
|
||||||
|
@ -37,7 +37,7 @@ tool = nvim
|
||||||
prompt = false
|
prompt = false
|
||||||
|
|
||||||
[difftool "nvim"]
|
[difftool "nvim"]
|
||||||
cmd = nvim -d $LOCAL $REMOTE
|
cmd = nvim +DiffviewOpen
|
||||||
|
|
||||||
[pull]
|
[pull]
|
||||||
rebase = merges
|
rebase = merges
|
||||||
|
|
|
@ -4,5 +4,7 @@ return {
|
||||||
enabled = vim.g.neovide == not nil,
|
enabled = vim.g.neovide == not nil,
|
||||||
"yutkat/confirm-quit.nvim",
|
"yutkat/confirm-quit.nvim",
|
||||||
event = "CmdlineEnter",
|
event = "CmdlineEnter",
|
||||||
config = true,
|
opts = {
|
||||||
|
quit_message = "You are in Neovide, are you sure you want to quit?",
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
3
home/.config/nvim/lua/plugins/diffview.lua
Normal file
3
home/.config/nvim/lua/plugins/diffview.lua
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
-- Improved diffs
|
||||||
|
--- @type LazyPluginSpec
|
||||||
|
return { "sindrets/diffview.nvim" }
|
Loading…
Add table
Add a link
Reference in a new issue