From 8638342fa91d2db8966c6fd9d621e95097b48307 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Gremaud?= <loic.gremaud@arcanite.ch>
Date: Wed, 3 Apr 2024 15:40:42 +0200
Subject: [PATCH] Add more git shortcut

---
 lua/core/mappings.lua    | 12 +++++++++---
 lua/custom/telescope.lua |  1 +
 lua/plugins/init.lua     | 10 ++++++++++
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/lua/core/mappings.lua b/lua/core/mappings.lua
index 0ed79d3..8d41649 100644
--- a/lua/core/mappings.lua
+++ b/lua/core/mappings.lua
@@ -94,12 +94,18 @@ M.customstuffs = {
     ["<C-t>"] = { "<cmd> TagbarToggle<CR>", "Show tagbar" },
     ["<leader>ra"] = { "<cmd> call VrcQuery()<CR>", "Call REST endpoint" },
     ["<leader>dl"] = { "0d$", "Delete line from start" },
-    ["<leader>gp"] = { "<cmd> Git pull<CR>", "Git pull" },
+    ["<leader>gpu"] = { "<cmd> Git pull<CR>", "Git pull" },
+    ["<leader>gpf"] = { ":Git push ", "Git push with option" },
+    ["<leader>gmm"] = { "<cmd> Git merge master<CR>", "Git merge master" },
+    ["<leader>gmi"] = { ":Git merge ", "Git merge ..." },
     ["<leader>ga"] = { ":Git commit -a --amend --no-edit --no-verify", "Git commit -a --amend --no-edit --no-verify" },
     ["<leader>gnb"] = { ":Git checkout -b ", "Checkout to a new branch" },
     ["<leader>gri"] = { ":Git rebase -i HEAD~", "Git rebase interactive from HEAD" },
-    ["<leader>mkd"] = { "<cmd>lua vim.api.nvim_create_user_command('PeekOpen', require('peek').open, {})<CR>", "Open markdown preview" },
-    ["<leader>mkc"] = { "<cmd>lua vim.api.nvim_create_user_command('PeekClose', require('peek').close, {})<CR>", "Open markdown preview" },
+    ["<leader>grm"] = { ":Git rebase -i master", "Git rebase interactive from master" },
+    ["<leader>grr"] = { ":Git rebase -i ", "Git rebase interactive from <select>" },
+
+    -- ["<leader>mkd"] = { "<cmd>lua vim.api.nvim_create_user_command('PeekOpen', require('peek').open, {})<CR>", "Open markdown preview" },
+    -- ["<leader>mkc"] = { "<cmd>lua vim.api.nvim_create_user_command('PeekClose', require('peek').close, {})<CR>", "Open markdown preview" },
 
     ["n"] = { "nzz", "Next + auto center" },
     ["N"] = { "Nzz", "Previous + auto center" },
diff --git a/lua/custom/telescope.lua b/lua/custom/telescope.lua
index 8b5fa02..4005ac2 100644
--- a/lua/custom/telescope.lua
+++ b/lua/custom/telescope.lua
@@ -2,6 +2,7 @@
 
 local previewers = require('telescope.previewers')
 local builtin = require('telescope.builtin')
+
 local E = {}
 
 local delta = previewers.new_termopen_previewer {
diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua
index 071807d..3417571 100644
--- a/lua/plugins/init.lua
+++ b/lua/plugins/init.lua
@@ -413,6 +413,16 @@ local default_plugins = {
       "MunifTanjim/nui.nvim",
       -- "rcarriga/nvim-notify",
     },
+  },
+  {
+    "folke/todo-comments.nvim",
+    lazy=false,
+    dependencies = { "nvim-lua/plenary.nvim" },
+    opts = {
+      -- your configuration comes here
+      -- or leave it empty to use the default settings
+      -- refer to the configuration section below
+    }
   }
 }