feat: git merge branch action (#1220)

This commit is contained in:
thibthib18
2021-09-10 08:50:58 +02:00
committed by GitHub
parent d2b768983c
commit b4d6eb9a23
4 changed files with 74 additions and 50 deletions

View File

@@ -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()

View File

@@ -186,6 +186,7 @@ builtin.git_bcommits = require_on_exported_call("telescope.builtin.git").bcommit
--- - `<C-r>`: rebases currently selected branch
--- - `<C-a>`: creates a new branch, with confirmation prompt before creation
--- - `<C-d>`: deletes the currently selected branch, with confirmation prompt before deletion
--- - `<C-y>`: merges the currently selected branch, with confirmation prompt before deletion
---@param opts table: options to pass to the picker
builtin.git_branches = require_on_exported_call("telescope.builtin.git").branches