Nvim: add diffview plugin
This commit is contained in:
parent
f9b7a93570
commit
845f4024df
|
@ -28,7 +28,7 @@ keepBackup = false
|
|||
prompt = false
|
||||
|
||||
[mergetool "nvim"]
|
||||
cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
|
||||
cmd = nvim +DiffviewOpen
|
||||
|
||||
[diff]
|
||||
tool = nvim
|
||||
|
@ -37,7 +37,7 @@ tool = nvim
|
|||
prompt = false
|
||||
|
||||
[difftool "nvim"]
|
||||
cmd = nvim -d $LOCAL $REMOTE
|
||||
cmd = nvim +DiffviewOpen
|
||||
|
||||
[pull]
|
||||
rebase = merges
|
||||
|
|
|
@ -4,5 +4,7 @@ return {
|
|||
enabled = vim.g.neovide == not nil,
|
||||
"yutkat/confirm-quit.nvim",
|
||||
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…
Reference in a new issue