diff --git a/pkg/config/user_config.go b/pkg/config/user_config.go index c0b9a1468..6aea0dc64 100644 --- a/pkg/config/user_config.go +++ b/pkg/config/user_config.go @@ -178,8 +178,8 @@ type KeybindingUniversalConfig struct { ScrollDownMainAlt2 string `yaml:"scrollDownMain-alt2"` ExecuteCustomCommand string `yaml:"executeCustomCommand"` CreateRebaseOptionsMenu string `yaml:"createRebaseOptionsMenu"` - PushFiles string `yaml:"pushFiles"` - PullFiles string `yaml:"pullFiles"` + Push string `yaml:"pushFiles"` // 'Files' appended for legacy reasons + Pull string `yaml:"pullFiles"` // 'Files' appended for legacy reasons Refresh string `yaml:"refresh"` CreatePatchOptionsMenu string `yaml:"createPatchOptionsMenu"` NextTab string `yaml:"nextTab"` @@ -468,8 +468,8 @@ func GetDefaultConfig() *UserConfig { ScrollDownMainAlt2: "", ExecuteCustomCommand: ":", CreateRebaseOptionsMenu: "m", - PushFiles: "P", - PullFiles: "p", + Push: "P", + Pull: "p", Refresh: "R", CreatePatchOptionsMenu: "", NextTab: "]", diff --git a/pkg/gui/command_log_panel.go b/pkg/gui/command_log_panel.go index dbee7febb..859f86203 100644 --- a/pkg/gui/command_log_panel.go +++ b/pkg/gui/command_log_panel.go @@ -79,7 +79,7 @@ func (gui *Gui) getRandomTip() string { // keybindings and lazygit-specific advice fmt.Sprintf( "To force push, press '%s' and then if the push is rejected you will be asked if you want to force push", - formattedKey(config.Universal.PushFiles), + formattedKey(config.Universal.Push), ), fmt.Sprintf( "To filter commits by path, press '%s'", diff --git a/pkg/gui/controllers/sync_controller.go b/pkg/gui/controllers/sync_controller.go index 9eb4ae16a..5add485c4 100644 --- a/pkg/gui/controllers/sync_controller.go +++ b/pkg/gui/controllers/sync_controller.go @@ -28,12 +28,12 @@ func NewSyncController( func (self *SyncController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { bindings := []*types.Binding{ { - Key: opts.GetKey(opts.Config.Universal.PushFiles), + Key: opts.GetKey(opts.Config.Universal.Push), Handler: opts.Guards.NoPopupPanel(self.HandlePush), Description: self.c.Tr.LcPush, }, { - Key: opts.GetKey(opts.Config.Universal.PullFiles), + Key: opts.GetKey(opts.Config.Universal.Pull), Handler: opts.Guards.NoPopupPanel(self.HandlePull), Description: self.c.Tr.LcPull, }, diff --git a/pkg/integration/tests/sync/rename_branch_and_pull.go b/pkg/integration/tests/sync/rename_branch_and_pull.go index 93e28dfc3..9c60988e9 100644 --- a/pkg/integration/tests/sync/rename_branch_and_pull.go +++ b/pkg/integration/tests/sync/rename_branch_and_pull.go @@ -46,7 +46,7 @@ var RenameBranchAndPull = NewIntegrationTest(NewIntegrationTestArgs{ Type("-local"). Confirm() }). - Press(keys.Universal.PullFiles) + Press(keys.Universal.Pull) t.Views().Commits(). Lines(