diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2019-11-17 13:21:38 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2019-11-21 22:07:14 +1100 |
| commit | 2afbd7ba7fcd3668d7c70b831e525741e6214bd5 (patch) | |
| tree | ba81a610920249818773befbfe0d051802244910 /pkg/gui/remote_branches_panel.go | |
| parent | 55ff0c0dee09b505ecd123f3f893e143651947bf (diff) | |
support merging remote branches into checked out branch
Diffstat (limited to 'pkg/gui/remote_branches_panel.go')
| -rw-r--r-- | pkg/gui/remote_branches_panel.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkg/gui/remote_branches_panel.go b/pkg/gui/remote_branches_panel.go index 771a7a9ad..b8959e12f 100644 --- a/pkg/gui/remote_branches_panel.go +++ b/pkg/gui/remote_branches_panel.go @@ -92,3 +92,8 @@ func (gui *Gui) handleCheckoutRemoteBranch(g *gocui.Gui, v *gocui.View) error { } return gui.switchBranchesPanelContext("local-branches") } + +func (gui *Gui) handleMergeRemoteBranch(g *gocui.Gui, v *gocui.View) error { + selectedBranchName := gui.getSelectedRemoteBranch().Name + return gui.mergeBranchIntoCheckedOutBranch(selectedBranchName) +} |