diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2019-02-19 23:36:29 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2019-02-19 23:36:36 +1100 |
| commit | 0228e250847d042730038281f435b0b21d992c42 (patch) | |
| tree | 9f15ef6444c6215852a301a3286dcddf8a2b0cb3 /pkg/gui/keybindings.go | |
| parent | 935f77483443a12ab159e19a958dfdf61a947b36 (diff) | |
work towards more interactive rebase options
Diffstat (limited to 'pkg/gui/keybindings.go')
| -rw-r--r-- | pkg/gui/keybindings.go | 40 |
1 files changed, 32 insertions, 8 deletions
diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go index c0becfe2b..ab70616ea 100644 --- a/pkg/gui/keybindings.go +++ b/pkg/gui/keybindings.go @@ -84,6 +84,12 @@ func (gui *Gui) GetInitialKeybindings() []*Binding { Handler: gui.scrollDownMain, }, { ViewName: "", + Key: 'm', + Modifier: gocui.ModNone, + Handler: gui.handleCreateRebaseOptionsMenu, + Description: gui.Tr.SLocalize("ViewMergeRebaseOptions"), + }, { + ViewName: "", Key: 'P', Modifier: gocui.ModNone, Handler: gui.pushFiles, @@ -161,12 +167,6 @@ func (gui *Gui) GetInitialKeybindings() []*Binding { Handler: gui.handleFileRemove, Description: gui.Tr.SLocalize("removeFile"), }, { - ViewName: "files", // TODO: might make this for more views as well - Key: 'm', - Modifier: gocui.ModNone, - Handler: gui.handleCreateRebaseOptionsMenu, - Description: gui.Tr.SLocalize("ViewMergeRebaseOptions"), - }, { ViewName: "files", Key: 'e', Modifier: gocui.ModNone, @@ -192,12 +192,18 @@ func (gui *Gui) GetInitialKeybindings() []*Binding { Description: gui.Tr.SLocalize("refreshFiles"), }, { ViewName: "files", - Key: 'S', + Key: 's', Modifier: gocui.ModNone, Handler: gui.handleStashSave, Description: gui.Tr.SLocalize("stashFiles"), }, { ViewName: "files", + Key: 'S', + Modifier: gocui.ModNone, + Handler: gui.handleSoftReset, + Description: gui.Tr.SLocalize("softReset"), + }, { + ViewName: "files", Key: 'a', Modifier: gocui.ModNone, Handler: gui.handleStageAll, @@ -270,7 +276,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding { Description: gui.Tr.SLocalize("rebaseBranch"), }, { ViewName: "branches", - Key: 'm', + Key: 'M', Modifier: gocui.ModNone, Handler: gui.handleMerge, Description: gui.Tr.SLocalize("mergeIntoCurrentBranch"), @@ -335,6 +341,24 @@ func (gui *Gui) GetInitialKeybindings() []*Binding { Handler: gui.handleCommitEdit, Description: gui.Tr.SLocalize("editCommit"), }, { + ViewName: "commits", + Key: 'A', + Modifier: gocui.ModNone, + Handler: gui.handleCommitAmendTo, + Description: gui.Tr.SLocalize("amendToCommit"), + }, { + ViewName: "commits", + Key: 'p', + Modifier: gocui.ModNone, + Handler: gui.handleCommitPick, + Description: gui.Tr.SLocalize("pickCommit"), + }, { + ViewName: "commits", + Key: 't', + Modifier: gocui.ModNone, + Handler: gui.handleCommitRevert, + Description: gui.Tr.SLocalize("revertCommit"), + }, { ViewName: "stash", Key: gocui.KeySpace, Modifier: gocui.ModNone, |