Neovim: finished git configuration, other than waiting for merge conflicts to see how the mrging works

1 files changed, 9 insertions, 4 deletions

diff --git a/.config/nvim/lua/custom/git.lua b/.config/nvim/lua/custom/git.lua
index b30deb5..34320aa 100644
--- a/.config/nvim/lua/custom/git.lua
+++ b/.config/nvim/lua/custom/git.lua
@@ -40,10 +40,15 @@ set('n', '<leader>gD', gitsigns.toggle_deleted, { desc = '[G]it [D]eleted' })
 set('n', '<leader>gd', '<cmd>DiffviewOpen<cr>', { desc = '[G]it [D]iff' })
 set('n', '<leader>gl', '<cmd>DiffviewFileHistory<cr>', { desc = '[G]it [L]og' })
 set('n', '<leader>gs', '<cmd>Neogit<cr>', { desc = '[G]it [S]tatus' })
-set('n', '<leader>ga', 'TODO:', { desc = '[G]it [A]dd' })
-set('n', '<leader>gc', 'TODO:', { desc = '[G]it [C]ommit' })
-set('n', '<leader>gp', 'TODO:', { desc = '[G]it [P]ush' })
-set('n', '<leader>gP', 'TODO:', { desc = '[G]it [P]ull' })
+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' })
 
 -- Hunk Keymaps
 local function stage_visual_chunk()