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/keybindings.go | |
| parent | 55ff0c0dee09b505ecd123f3f893e143651947bf (diff) | |
support merging remote branches into checked out branch
Diffstat (limited to 'pkg/gui/keybindings.go')
| -rw-r--r-- | pkg/gui/keybindings.go | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go index b74281df7..19d2191f5 100644 --- a/pkg/gui/keybindings.go +++ b/pkg/gui/keybindings.go @@ -1066,6 +1066,14 @@ func (gui *Gui) GetInitialKeybindings() []*Binding { Description: gui.Tr.SLocalize("checkout"), }, { + ViewName: "branches", + Contexts: []string{"remote-branches"}, + Key: 'M', + Modifier: gocui.ModNone, + Handler: gui.handleMergeRemoteBranch, + Description: gui.Tr.SLocalize("mergeIntoCurrentBranch"), + }, + { ViewName: "commits", Key: gocui.MouseLeft, Modifier: gocui.ModNone, |