simon/nvim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: add git diff keymaps

Browse source
This commit is contained in:
Simon Lasbrugnas 2026-01-19 18:04:23 +01:00
parent 1b295597f4
commit 13fafde824
No known key found for this signature in database
GPG key ID: 43F4DC559B52E7FA
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lua/config/keymaps.lua
View file

@ -46,11 +46,12 @@ set("n", "<leader>dl", "mzyyp`zj")
-- Start merge conflict resolution
set("n", "<leader>gm", ":Git mergetool<CR>:only<CR>")
-- Diff get local
set("n", "<leader>dgl", "/\\V======<CR>d<CR>dd/\\V>>>>>><CR>dd")
-- Toggle vimdiff for side-by-side comparison
set("n", "<leader>dd", ":if &diff | diffoff | only | else | Gvdiffsplit! | endif<CR>")
-- Diff get remote
set("n", "<leader>dgr", "V/\\V======<CR>d<CR>dd/\\V>>>>>><CR>dd")
-- Diff get both
set("n", "<leader>dgb", "dd/\\V======<CR>dd/\\V>>>>>><CR>dd")
-- Git conflict resolution (choose local/remote/both)
set("n", "<leader>dl", 'j?HEAD<CR>"_dd/\\V======<CR>V/\\V>>>>>><CR>"_dk')
set("n", "<leader>dc", 'j?HEAD<CR>"_dd/\\V======<CR>V/\\V>>>>>><CR>"_dk')
set("n", "<leader>dr", 'j?HEAD<CR>V/\\V======<CR>"_d/\\V>>>>>><CR>"_ddk')
set("n", "<leader>di", 'j?HEAD<CR>V/\\V======<CR>"_d/\\V>>>>>><CR>"_ddk')
set("n", "<leader>db", 'j?HEAD<CR>"_dd/\\V======<CR>"_dd/\\V>>>>>><CR>"_dd2k')

6
lua/custom/plugins/go.lua
View file

@ -3,8 +3,8 @@ return {
event = "VeryLazy",
opts = {},
keys = {
{ "<leader>goa", "<cmd>GoAddTag<CR>", desc = "Add struct tags"},
{ "<leader>gor", "<cmd>GoRmTag<CR>", desc = "Remove struct tags"},
{ "<leader>got", "<cmd>GoAddAllTest<CR>", desc = "Add all tests"},
-- { "<leader>goa", "<cmd>GoAddTag<CR>", desc = "Add struct tags"},
-- { "<leader>gor", "<cmd>GoRmTag<CR>", desc = "Remove struct tags"},
-- { "<leader>got", "<cmd>GoAddAllTest<CR>", desc = "Add all tests"},
},
}