feat: git merge branch action (#1220)

2021-09-10 08:50:58 +02:00
parent d2b768983c
commit b4d6eb9a23
4 changed files with 74 additions and 50 deletions
--- a/lua/telescope/builtin/git.lua
+++ b/lua/telescope/builtin/git.lua
@@ -297,6 +297,9 @@ git.branches = function(opts)

      map("i", "<c-d>", actions.git_delete_branch)
      map("n", "<c-d>", actions.git_delete_branch)
+
+      map("i", "<c-y>", actions.git_merge_branch)
+      map("n", "<c-y>", actions.git_merge_branch)
      return true
    end,
  }):find()