1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00

rename key to Pull

This commit is contained in:
Jesse Duffield
2023-02-19 11:42:00 +11:00
parent 979c3d6278
commit bff076c70a
4 changed files with 8 additions and 8 deletions

View File

@ -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: "<c-d>",
ExecuteCustomCommand: ":",
CreateRebaseOptionsMenu: "m",
PushFiles: "P",
PullFiles: "p",
Push: "P",
Pull: "p",
Refresh: "R",
CreatePatchOptionsMenu: "<c-p>",
NextTab: "]",

View File

@ -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'",

View File

@ -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,
},

View File

@ -46,7 +46,7 @@ var RenameBranchAndPull = NewIntegrationTest(NewIntegrationTestArgs{
Type("-local").
Confirm()
}).
Press(keys.Universal.PullFiles)
Press(keys.Universal.Pull)
t.Views().Commits().
Lines(