ambroisie/nix-config
ambroisie/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

home: vim: centralise 'git'-related mappings

Browse source
This commit is contained in:
Bruno BELANYI 2022-03-04 09:36:05 +01:00
parent 03e412b2f0
commit b6435f0d57
2 changed files with 3 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
home/vim/after/plugin/mappings/git.vim
View file

@ -1,18 +0,0 @@
lua << EOF
local wk = require("which-key")
local keys = {
d = {
name = "Merging diff hunks",
o = { "<cmd>diffget<CR>", "Use this buffer's change", mode="x" },
p = { "<cmd>diffput<CR>", "Accept other buffer change", mode="x" },
},
["<leader>g"] = {
name = "Git",
l = { "<cmd>:sp<CR><C-w>T:Gllog --follow -- %:p<CR>", "Current buffer log" },
m = { "<Plug>(git-messenger)", "Current line blame" },
},
}
wk.register(keys)
EOF

3
home/vim/plugin/settings/gitsigns.vim
View file

@ -26,7 +26,10 @@ gitsigns.setup({
b = { gitsigns.toggle_current_line_blame, "Toggle blame virtual text" }, b = { gitsigns.toggle_current_line_blame, "Toggle blame virtual text" },
d = { gitsigns.diffthis, "Diff buffer" }, d = { gitsigns.diffthis, "Diff buffer" },
D = { function() gitsigns.diffthis("~") end, "Diff buffer against last commit" }, D = { function() gitsigns.diffthis("~") end, "Diff buffer against last commit" },
g = { "<cmd>Git<CR>", "Git status" },
h = { gitsigns.toggle_deleted, "Show deleted hunks" }, h = { gitsigns.toggle_deleted, "Show deleted hunks" },
L = { "<cmd>:sp<CR><C-w>T:Gllog --follow -- %:p<CR>", "Current buffer log" },
m = { "<Plug>(git-messenger)", "Current line blame" },
p = { gitsigns.preview_hunk, "Preview hunk" }, p = { gitsigns.preview_hunk, "Preview hunk" },
r = { gitsigns.reset_hunk, "Revert hunk" }, r = { gitsigns.reset_hunk, "Revert hunk" },
R = { gitsigns.reset_buffer, "Revert buffer" }, R = { gitsigns.reset_buffer, "Revert buffer" },