diff options
Diffstat (limited to 'nvim/init.lua')
| -rw-r--r-- | nvim/init.lua | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/nvim/init.lua b/nvim/init.lua index 40f43ea..5423d22 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -16,10 +16,12 @@ vim.keymap.set('n', '<leader>z', ':Lazy<CR>', { noremap = true, silent = true, d -- Fugitive shortcuts vim.keymap.set('n', '<leader>gd', ':Gvdiffsplit<CR>', { noremap = true, silent = true, desc = 'Open diff with HEAD' }) -vim.keymap.set('n', '<leader>g3', ':Gvdiffsplit!<CR>', { noremap = true, silent = true, desc = 'Open diff with previous revision / 3-way conflict diff' }) +vim.keymap.set('n', '<leader>gD', ':Gvdiffsplit!<CR>', { noremap = true, silent = true, desc = 'Open diff with previous revision / 3-way conflict diff' }) vim.keymap.set('n', '<leader>gs', ':Git<CR><C-w>o', { noremap = true, silent = true, desc = 'Git status' }) vim.keymap.set('n', '<leader>gb', ':Git blame<CR>', { noremap = true, silent = true, desc = 'Git blame' }) -vim.keymap.set('n', '<leader>ge', ':Gedit<CR>', { noremap = true, silent = true, desc = 'Git: return to HEAD file version' }) +vim.keymap.set('n', '<leader>gl', ':Git log<CR>', { noremap = true, silent = true, desc = 'Git log' }) +vim.keymap.set('n', '<leader>gL', ':0Gclog<CR>', { noremap = true, silent = true, desc = 'Git log: this file' }) +vim.keymap.set('n', '<leader>ge', ':Gedit<CR>', { noremap = true, silent = true, desc = 'Git: return to worktree' }) -- I forgot what it's for :( vim.diagnostic.config({ |