From b4d6eb9a232dab48ce658470a980e7a15edb500f Mon Sep 17 00:00:00 2001
From: thibthib18 <37300147+thibthib18@users.noreply.github.com>
Date: Fri, 10 Sep 2021 08:50:58 +0200
Subject: feat: git merge branch action (#1220)

---
 lua/telescope/builtin/git.lua | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'lua/telescope/builtin/git.lua')

diff --git a/lua/telescope/builtin/git.lua b/lua/telescope/builtin/git.lua
index a2be2fb..a4da679 100644
--- 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()
-- 
cgit v1.2.3