leigh/telescope.nvim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: git merge branch action (#1220)

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

1
lua/telescope/builtin/init.lua
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