summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2018-12-12 22:33:42 +1100
committerJesse Duffield <jessedduffield@gmail.com>2018-12-12 22:33:42 +1100
commitc71bcc64ed7e3a5dc921b14df53dbe9d2837a20a (patch)
treeeddf9e4fb8f9eaae7976f39f84c192f8fd475b4f
parente20d8366e1fb971dfb8d8cb2f8aebd17366f14a5 (diff)
move fetch keybinding to files view to make way for branch-specific fetched
-rw-r--r--pkg/gui/keybindings.go12
-rw-r--r--pkg/i18n/english.go2
2 files changed, 7 insertions, 7 deletions
diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go
index 1823c2955..b996e2e95 100644
--- a/pkg/gui/keybindings.go
+++ b/pkg/gui/keybindings.go
@@ -220,6 +220,12 @@ func (gui *Gui) GetKeybindings() []*Binding {
Description: gui.Tr.SLocalize("StageLines"),
KeyReadable: "enter",
}, {
+ ViewName: "files",
+ Key: 'f',
+ Modifier: gocui.ModNone,
+ Handler: gui.handleGitFetch,
+ Description: gui.Tr.SLocalize("fetch"),
+ }, {
ViewName: "main",
Key: gocui.KeyEsc,
Modifier: gocui.ModNone,
@@ -306,12 +312,6 @@ func (gui *Gui) GetKeybindings() []*Binding {
Description: gui.Tr.SLocalize("forceCheckout"),
}, {
ViewName: "branches",
- Key: 'f',
- Modifier: gocui.ModNone,
- Handler: gui.handleGitFetch,
- Description: gui.Tr.SLocalize("fetch"),
- }, {
- ViewName: "branches",
Key: 'n',
Modifier: gocui.ModNone,
Handler: gui.handleNewBranch,
diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go
index 26186c6d9..15179ccbc 100644
--- a/pkg/i18n/english.go
+++ b/pkg/i18n/english.go
@@ -431,7 +431,7 @@ func addEnglish(i18nObject *i18n.Bundle) error {
Other: `No automatic git fetch`,
}, &i18n.Message{
ID: "NoAutomaticGitFetchBody",
- Other: `Lazygit can't use "git fetch" in a private repo use f in the branches panel to run "git fetch" manually`,
+ Other: `Lazygit can't use "git fetch" in a private repo; use 'f' in the files panel to run "git fetch" manually`,
}, &i18n.Message{
ID: "StageLines",
Other: `stage individual hunks/lines`,