chezmoi/private_dot_config/nvim/lua/plugins/git.lua

42 lines
1.1 KiB
Lua

return {
{
'f-person/git-blame.nvim',
config = function()
require('gitblame').setup {
enabled = true,
display_virtual_text = false,
message_template = '<author> • <date>',
date_format = '%r'
}
end,
},
{
'lewis6991/gitsigns.nvim', -- git graphic helpers
config = function()
require('gitsigns').setup()
end,
},
{
'akinsho/git-conflict.nvim',
config = function()
require('git-conflict').setup {
default_commands = true, -- disable commands created by this plugin
disable_diagnostics = false, -- This will disable the diagnostics in a buffer whilst it is conflicted
list_opener = 'copen', -- command or function to open the conflicts list
highlights = { -- They must have background color, otherwise the default color will be used
incoming = 'DiffAdd',
current = 'DiffText',
},
default_mappings = {
ours = 'o',
theirs = 't',
none = '0',
both = 'b',
next = 'n',
prev = 'p',
},
}
end,
},
}