nishiki/nvim-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feat: add git conflict plugin

Browse source
This commit is contained in:
Adrien Waksberg 2023-09-13 10:14:09 +02:00
parent 13189d3488
commit 9a291ffd92
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mappings.lua
View file

@ -7,6 +7,12 @@ M.general = {
["<leader>gr"] = { "<cmd> Gitsigns reset_hunk <CR>", "Reset hunk" },
["<leader>gp"] = { "<cmd> Gitsigns preview_hunk <CR>", "See preview hunk" },
["<leader>gd"] = { "<cmd> Gitsigns diffthis <CR>", "See diff" },
["<leader>gco"] = { "<cmd> GitConflictChooseOurs <CR>", "Git conflict ours" },
["<leader>gct"] = { "<cmd> GitConflictChooseTheirs <CR>", "Git conflict theirs" },
["<leader>gcb"] = { "<cmd> GitConflictChooseBoth <CR>", "Git conflict both" },
["<leader>gc0"] = { "<cmd> GitConflictChooseNone <CR>", "Git conflict none" },
["<leader>gcp"] = { "<cmd> GitConflictPrevConflict <CR>", "Git conflict preview conflict" },
["<leader>gcn"] = { "<cmd> GitConflictNextConflict <CR>", "Git conflict next conflict" };
},
}

5
plugins.lua
View file

@ -12,6 +12,11 @@ local plugins = {
"sindrets/diffview.nvim",
lazy = false,
},
{
"akinsho/git-conflict.nvim",
lazy = false,
config = true,
},
{
"vinnymeller/swagger-preview.nvim",
lazy = false,