Marty/dotfiles
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Wiki Activity

nvim: Move between git conflict hunks with ][H

Browse source 
Since we move between git chunks with ]h/[h, we may as well
move between git *conflict* chunks (should there be any)
with ]H and [H mirroring the diagnostics/error setup
situation.
This commit is contained in:
Marty Oehme 2023-09-16 11:20:04 +02:00
parent 60ae2e43c3
commit c7393c9114
Signed by: Marty
GPG key ID: EDBF2ED917B2EF6A
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nvim/.config/nvim/lua/plugins/git.lua
View file

@ -11,8 +11,8 @@ return {
vim.keymap.set("n", "<localleader>hO", "<Plug>(git-conflict-theirs)", { desc = "Conflict use theirs" }) vim.keymap.set("n", "<localleader>hO", "<Plug>(git-conflict-theirs)", { desc = "Conflict use theirs" })
vim.keymap.set("n", "<localleader>hm", "<Plug>(git-conflict-both)", { desc = "Conflict use both" }) vim.keymap.set("n", "<localleader>hm", "<Plug>(git-conflict-both)", { desc = "Conflict use both" })
vim.keymap.set("n", "<localleader>hM", "<Plug>(git-conflict-none)", { desc = "Conflict use none" }) vim.keymap.set("n", "<localleader>hM", "<Plug>(git-conflict-none)", { desc = "Conflict use none" })
vim.keymap.set("n", "[x", "<Plug>(git-conflict-prev-conflict)", { desc = "Prev git conflict" }) vim.keymap.set("n", "[H", "<Plug>(git-conflict-prev-conflict)", { desc = "Prev git conflict" })
vim.keymap.set("n", "]x", "<Plug>(git-conflict-next-conflict)", { desc = "Next git conflict" }) vim.keymap.set("n", "]H", "<Plug>(git-conflict-next-conflict)", { desc = "Next git conflict" })
end, end,
lazy = false, -- TODO needs to be force refreshed in lazy loaded mode unfortunately lazy = false, -- TODO needs to be force refreshed in lazy loaded mode unfortunately
}, },