summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2024-01-13 16:55:06 +1100
committerJesse Duffield <jessedduffield@gmail.com>2024-01-19 10:47:21 +1100
commit8840c1a2b75749724b2dc6e329c2e150db93bc5a (patch)
tree5b6f05b0e9e77ae9bb3b7bbea4e9623b16048aec
parentd08fafb1c446572c40151e88f8025e28a62bd819 (diff)
Remove 'v' menu keys
We can no longer use this because 'v' is globally reserved for range select. Conveniently it was the first item in the menu anyway for both of these.
-rw-r--r--pkg/gui/controllers/branches_controller.go1
-rw-r--r--pkg/gui/controllers/helpers/merge_and_rebase_helper.go1
2 files changed, 0 insertions, 2 deletions
diff --git a/pkg/gui/controllers/branches_controller.go b/pkg/gui/controllers/branches_controller.go
index e0a38d463..866f3eae3 100644
--- a/pkg/gui/controllers/branches_controller.go
+++ b/pkg/gui/controllers/branches_controller.go
@@ -165,7 +165,6 @@ func (self *BranchesController) viewUpstreamOptions(selectedBranch *models.Branc
ShowBranchHeads: false,
})
},
- Key: 'v',
}
unsetUpstreamItem := &types.MenuItem{
diff --git a/pkg/gui/controllers/helpers/merge_and_rebase_helper.go b/pkg/gui/controllers/helpers/merge_and_rebase_helper.go
index de34f2193..2b94dfa7a 100644
--- a/pkg/gui/controllers/helpers/merge_and_rebase_helper.go
+++ b/pkg/gui/controllers/helpers/merge_and_rebase_helper.go
@@ -169,7 +169,6 @@ func (self *MergeAndRebaseHelper) PromptForConflictHandling() error {
OnPress: func() error {
return self.c.PushContext(self.c.Contexts().Files)
},
- Key: 'v',
},
{
Label: fmt.Sprintf(self.c.Tr.AbortMenuItem, mode),