diff --git a/home/vim/after/plugin/mappings/git.vim b/home/vim/after/plugin/mappings/git.vim deleted file mode 100644 index bb8b194..0000000 --- a/home/vim/after/plugin/mappings/git.vim +++ /dev/null @@ -1,18 +0,0 @@ -lua << EOF -local wk = require("which-key") - -local keys = { - d = { - name = "Merging diff hunks", - o = { "diffget", "Use this buffer's change", mode="x" }, - p = { "diffput", "Accept other buffer change", mode="x" }, - }, - ["g"] = { - name = "Git", - l = { ":spT:Gllog --follow -- %:p", "Current buffer log" }, - m = { "(git-messenger)", "Current line blame" }, - }, -} - -wk.register(keys) -EOF diff --git a/home/vim/plugin/settings/gitsigns.vim b/home/vim/plugin/settings/gitsigns.vim index 7804f3e..c8f11a1 100644 --- a/home/vim/plugin/settings/gitsigns.vim +++ b/home/vim/plugin/settings/gitsigns.vim @@ -26,7 +26,10 @@ gitsigns.setup({ b = { gitsigns.toggle_current_line_blame, "Toggle blame virtual text" }, d = { gitsigns.diffthis, "Diff buffer" }, D = { function() gitsigns.diffthis("~") end, "Diff buffer against last commit" }, + g = { "Git", "Git status" }, h = { gitsigns.toggle_deleted, "Show deleted hunks" }, + L = { ":spT:Gllog --follow -- %:p", "Current buffer log" }, + m = { "(git-messenger)", "Current line blame" }, p = { gitsigns.preview_hunk, "Preview hunk" }, r = { gitsigns.reset_hunk, "Revert hunk" }, R = { gitsigns.reset_buffer, "Revert buffer" },