3 changed files with 41 additions and 3 deletions
@ -1 +1,35 @@ |
|||||||
return { "sindrets/diffview.nvim" } |
return { |
||||||
|
"sindrets/diffview.nvim", |
||||||
|
cmd = { "DiffviewOpen", "DiffviewClose", "DiffviewToggleFiles", "DiffviewFocusFiles", "DiffviewFileHistory" }, |
||||||
|
keys = { |
||||||
|
{ "<leader>gvv", "<cmd>DiffviewOpen<cr>", desc = "Diffview Open" }, |
||||||
|
{ "<leader>gvq", "<cmd>DiffviewClose<cr>", desc = "Diffview Close" }, |
||||||
|
{ "<leader>gvf", "<cmd>DiffviewFileHistory %<cr>", desc = "Browse current file history" }, |
||||||
|
{ "<leader>gvr", "<cmd>DiffviewFileHistory<cr>", desc = "Browse repo history" }, |
||||||
|
{ "<leader>gvh", "<cmd>DiffviewOpen HEAD~1<cr>", desc = "Diff vs last commit" }, |
||||||
|
{ "<leader>gvm", "<cmd>DiffviewOpen master...HEAD<cr>", desc = "Diff branch vs master" }, |
||||||
|
}, |
||||||
|
opts = { |
||||||
|
enhanced_diff_hl = true, |
||||||
|
view = { |
||||||
|
merge_tool = { |
||||||
|
layout = "diff3_mixed", |
||||||
|
}, |
||||||
|
}, |
||||||
|
file_history_panel = { |
||||||
|
log_options = { |
||||||
|
git = { |
||||||
|
all = false, |
||||||
|
}, |
||||||
|
}, |
||||||
|
win_config = { |
||||||
|
position = "bottom", |
||||||
|
height = 16, |
||||||
|
}, |
||||||
|
}, |
||||||
|
file_panel = { |
||||||
|
listing_style = "tree", |
||||||
|
win_config = { width = 35 }, |
||||||
|
}, |
||||||
|
}, |
||||||
|
} |
||||||
|
|||||||
Loading…
Reference in new issue