summaryrefslogtreecommitdiff
path: root/lua/telescope/builtin/git.lua
diff options
context:
space:
mode:
Diffstat (limited to 'lua/telescope/builtin/git.lua')
-rw-r--r--lua/telescope/builtin/git.lua3
1 files changed, 3 insertions, 0 deletions
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()