diff options
| author | Kyren223 <ulmliad223@gmail.com> | 2024-07-13 23:14:32 +0300 |
|---|---|---|
| committer | Kyren223 <ulmliad223@gmail.com> | 2024-07-13 23:14:32 +0300 |
| commit | 01b75ee53b38b5778afe300f913eab96e6dcbe4b (patch) | |
| tree | 22ea4be8b367d1602831e87748ae4b3064742569 /.config | |
| parent | 025c3f55b7cd3e9313b13e84e1943e680e52f02a (diff) | |
Neovim: added merge and rebase keymaps for git
Diffstat (limited to '.config')
| -rw-r--r-- | .config/nvim/lua/custom/git.lua | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/.config/nvim/lua/custom/git.lua b/.config/nvim/lua/custom/git.lua index 34caa04..6db68cf 100644 --- a/.config/nvim/lua/custom/git.lua +++ b/.config/nvim/lua/custom/git.lua @@ -58,12 +58,8 @@ set('n', '<leader>gs', '<cmd>Neogit<cr>', { desc = '[G]it [S]tatus' }) set('n', '<leader>gc', '<cmd>Neogit commit<cr>', { desc = '[G]it [C]ommit' }) set('n', '<leader>gp', '<cmd>Neogit push<cr>', { desc = '[G]it [P]ush' }) set('n', '<leader>gP', '<cmd>Neogit pull<cr>', { desc = '[G]it [P]ull' }) --- NOTE: Waiting to actually have my next merge conflict and --- see how diffview handles and then deciding if I want to use --- neogit or diffview for merge (prob diffview), same with rebase --- althoug I don't think I will use rebase anytime soon -set('n', '<leader>gr', 'TODO:', { desc = '[G]it [R]ebase' }) -set('n', '<leader>gm', 'TODO:', { desc = '[G]it [M]erge' }) +set('n', '<leader>gr', '<cmd>Neogit rebase<cr>', { desc = '[G]it [R]ebase' }) +set('n', '<leader>gm', '<cmd>Neogit merge<cr>', { desc = '[G]it [M]erge' }) -- Hunk Keymaps local function stage_visual_chunk() |