From 01b75ee53b38b5778afe300f913eab96e6dcbe4b Mon Sep 17 00:00:00 2001
From: Kyren223 <ulmliad223@gmail.com>
Date: Sat, 13 Jul 2024 23:14:32 +0300
Subject: Neovim: added merge and rebase keymaps for git

---
 .config/nvim/lua/custom/git.lua | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to '.config')

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()
-- 
cgit v1.3.1