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

@@ -584,6 +584,8 @@ builtin.git_branches({opts}) *builtin.git_branches()*
- `<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
Parameters: ~
@@ -1488,6 +1490,14 @@ actions.git_delete_branch({prompt_bufnr}) *actions.git_delete_branch()*
{prompt_bufnr} (number) The prompt bufnr
actions.git_merge_branch({prompt_bufnr}) *actions.git_merge_branch()*
Merge the currently selected branch
Parameters: ~
{prompt_bufnr} (number) The prompt bufnr
actions.git_rebase_branch({prompt_bufnr}) *actions.git_rebase_branch()*
Rebase to selected git branch