summaryrefslogtreecommitdiffstats
path: root/pkg
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2022-03-27 18:48:37 +1100
committerJesse Duffield <jessedduffield@gmail.com>2022-03-27 18:50:29 +1100
commit7c3d14ee198be1bb330cdbb70bae81dd89bb7502 (patch)
tree4f56c8d38f54d921ea702b1f9ef25a7bd6e87e30 /pkg
parent897c4402a4c29e38a1d00a37cd3fd1dec164cc8a (diff)
allow amending and reverting commits when filtering by file
Diffstat (limited to 'pkg')
-rw-r--r--pkg/gui/controllers/local_commits_controller.go28
1 files changed, 14 insertions, 14 deletions
diff --git a/pkg/gui/controllers/local_commits_controller.go b/pkg/gui/controllers/local_commits_controller.go
index 1df223365..dee876bf3 100644
--- a/pkg/gui/controllers/local_commits_controller.go
+++ b/pkg/gui/controllers/local_commits_controller.go
@@ -91,16 +91,6 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [
Description: self.c.Tr.LcMoveUpCommit,
},
{
- Key: opts.GetKey(opts.Config.Commits.AmendToCommit),
- Handler: self.checkSelected(self.amendTo),
- Description: self.c.Tr.LcAmendToCommit,
- },
- {
- Key: opts.GetKey(opts.Config.Commits.RevertCommit),
- Handler: self.checkSelected(self.revert),
- Description: self.c.Tr.LcRevertCommit,
- },
- {
Key: opts.GetKey(opts.Config.Commits.PasteCommits),
Handler: opts.Guards.OutsideFilterMode(self.paste),
Description: self.c.Tr.LcPasteCommits,
@@ -127,16 +117,26 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [
bindings := append(outsideFilterModeBindings, []*types.Binding{
{
- Key: opts.GetKey(opts.Config.Commits.OpenLogMenu),
- Handler: self.handleOpenLogMenu,
- Description: self.c.Tr.LcOpenLogMenu,
- OpensMenu: true,
+ Key: opts.GetKey(opts.Config.Commits.AmendToCommit),
+ Handler: self.checkSelected(self.amendTo),
+ Description: self.c.Tr.LcAmendToCommit,
+ },
+ {
+ Key: opts.GetKey(opts.Config.Commits.RevertCommit),
+ Handler: self.checkSelected(self.revert),
+ Description: self.c.Tr.LcRevertCommit,
},
{
Key: opts.GetKey(opts.Config.Commits.TagCommit),
Handler: self.checkSelected(self.createTag),
Description: self.c.Tr.LcTagCommit,
},
+ {
+ Key: opts.GetKey(opts.Config.Commits.OpenLogMenu),
+ Handler: self.handleOpenLogMenu,
+ Description: self.c.Tr.LcOpenLogMenu,
+ OpensMenu: true,
+ },
}...)
return bindings