Christopher Williams
40 lines
852 B
Lua
40 lines
852 B
Lua
local M = {
|
|
{
|
|
"NeogitOrg/neogit",
|
|
lazy = true,
|
|
dependencies = {
|
|
"nvim-lua/plenary.nvim",
|
|
"sindrets/diffview.nvim",
|
|
},
|
|
cmd = "Neogit",
|
|
keys = {
|
|
{ "<leader>gg", "<cmd>Neogit<cr>", desc = "Show Neogit UI" },
|
|
},
|
|
},
|
|
{
|
|
"esmuellert/codediff.nvim",
|
|
dependencies = { "MunifTanjim/nui.nvim" },
|
|
cmd = "CodeDiff",
|
|
},
|
|
{
|
|
"lewis6991/gitsigns.nvim",
|
|
},
|
|
{
|
|
"akinsho/git-conflict.nvim",
|
|
version = "*",
|
|
config = function()
|
|
require("git-conflict").setup({
|
|
default_mappings = true, -- disable buffer local mapping created by this plugin
|
|
default_commands = true, -- disable commands created by this plugin
|
|
disable_diagnostics = true, -- This will disable the diagnostics in a buffer whilst it is conflicted
|
|
highlights = {
|
|
incoming = "DiffText",
|
|
current = "DiffAdd",
|
|
},
|
|
})
|
|
end,
|
|
},
|
|
}
|
|
|
|
return M
|