diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2019-11-17 14:04:57 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2019-11-21 22:07:14 +1100 |
| commit | dcb52857976762378b0e69bd45581231aa334482 (patch) | |
| tree | bb8bd788b151d503f3b3a3cbc93aaeef93bec2b4 /pkg/gui/keybindings.go | |
| parent | a9cd647075119c760ca22cceba8c4ad14687b732 (diff) | |
support rebasing onto remote branch
Diffstat (limited to 'pkg/gui/keybindings.go')
| -rw-r--r-- | pkg/gui/keybindings.go | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go index 88e35bc5c..85678b6ad 100644 --- a/pkg/gui/keybindings.go +++ b/pkg/gui/keybindings.go @@ -383,7 +383,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding { Contexts: []string{"local-branches"}, Key: 'r', Modifier: gocui.ModNone, - Handler: gui.handleRebase, + Handler: gui.handleRebaseOntoLocalBranch, Description: gui.Tr.SLocalize("rebaseBranch"), }, { @@ -1082,6 +1082,14 @@ func (gui *Gui) GetInitialKeybindings() []*Binding { Description: gui.Tr.SLocalize("deleteBranch"), }, { + ViewName: "branches", + Contexts: []string{"remote-branches"}, + Key: 'r', + Modifier: gocui.ModNone, + Handler: gui.handleRebaseOntoRemoteBranch, + Description: gui.Tr.SLocalize("rebaseBranch"), + }, + { ViewName: "commits", Key: gocui.MouseLeft, Modifier: gocui.ModNone, |