diff --git a/docs/keybindings/Keybindings_en.md b/docs/keybindings/Keybindings_en.md
index 84db949eb..3c426a314 100644
--- a/docs/keybindings/Keybindings_en.md
+++ b/docs/keybindings/Keybindings_en.md
@@ -3,6 +3,7 @@
## Global Keybindings
+ ctrl+r: switch to a recent repo ()
pgup: scroll up main panel (fn+up)
pgdown: scroll down main panel (fn+down)
m: view merge/rebase options
@@ -19,6 +20,7 @@
|: view filter-by-path options
W: open diff menu
ctrl+e: open diff menu
+ @: open command log menu
## List Panel Navigation
@@ -122,7 +124,7 @@
g: reset to this commit
f: fixup commit
F: create fixup commit for this commit
- S: squash above commits
+ S: squash all 'fixup!' commits above selected commit (autosquash)
d: delete commit
ctrl+j: move commit down one
ctrl+k: move commit up one
@@ -154,6 +156,12 @@
ctrl+o: copy commit SHA to clipboard
+## Extras Panel
+
+
+ @: open command log menu
+
+
## Files Panel (Files)
@@ -176,6 +184,7 @@
ctrl+o: copy the file name to the clipboard
g: view upstream reset options
`: toggle file tree view
+ M: open external merge tool (git mergetool)
## Files Panel (Submodules)
@@ -195,6 +204,7 @@
esc: return to files panel
+ M: open external merge tool (git mergetool)
space: pick hunk
b: pick both hunks
◄: select previous conflict
diff --git a/docs/keybindings/Keybindings_nl.md b/docs/keybindings/Keybindings_nl.md
index 8c4882648..1777e6e2a 100644
--- a/docs/keybindings/Keybindings_nl.md
+++ b/docs/keybindings/Keybindings_nl.md
@@ -3,6 +3,7 @@
## Globale Sneltoetsen
+ ctrl+r: wissel naar een recente repo ()
pgup: scroll naar beneden vanaf hoofdpaneel (fn+up)
pgdown: scroll naar beneden vanaf hoofdpaneel (fn+down)
m: bekijk merge/rebase opties
@@ -19,6 +20,7 @@
|: bekijk scoping opties
W: open diff menu
ctrl+e: open diff menu
+ @: open command log menu
## Lijstpaneel Navigatie
@@ -109,8 +111,8 @@
o: open bestand
e: verander bestand
space: toggle bestand inbegrepen in patch
- enter: enter bestand to add selecteered lines to the patch
- `: toggle file tree view
+ enter: enter bestand om geselecteerde regels toe te voegen aan de patch
+ `: toggle bestandsboom weergave
## Commits Paneel (Commits)
@@ -154,6 +156,12 @@
ctrl+o: kopieer commit SHA naar klembord
+## Extras Paneel
+
+
+ @: open command log menu
+
+
## Bestanden Paneel (Bestanden)
@@ -176,6 +184,7 @@
ctrl+o: kopieer de bestandsnaam naar het klembord
g: bekijk upstream reset opties
`: toggle bestandsboom weergave
+ M: open external merge tool (git mergetool)
## Bestanden Paneel (Submodules)
@@ -195,6 +204,7 @@
esc: ga terug naar het bestanden paneel
+ M: open external merge tool (git mergetool)
space: kies hunk
b: kies bijde hunks
◄: selecteer voorgaand conflict
diff --git a/docs/keybindings/Keybindings_pl.md b/docs/keybindings/Keybindings_pl.md
index 9094985a5..8ab01ff73 100644
--- a/docs/keybindings/Keybindings_pl.md
+++ b/docs/keybindings/Keybindings_pl.md
@@ -3,6 +3,7 @@
## Globalne
+ ctrl+r: switch to a recent repo ()
pgup: scroll up main panel (fn+up)
pgdown: scroll down main panel (fn+down)
m: view merge/rebase options
@@ -19,6 +20,7 @@
|: view filter-by-path options
W: open diff menu
ctrl+e: open diff menu
+ @: open command log menu
## List Panel Navigation
@@ -122,7 +124,7 @@
g: zresetuj do tego commita
f: napraw commit
F: create fixup commit for this commit
- S: squash above commits
+ S: squash all 'fixup!' commits above selected commits (autosquash)
d: delete commit
ctrl+j: move commit down one
ctrl+k: move commit up one
@@ -154,6 +156,12 @@
ctrl+o: copy commit SHA to clipboard
+## Extras Panel
+
+
+ @: open command log menu
+
+
## Pliki Panel (Pliki)
@@ -176,6 +184,7 @@
ctrl+o: copy the file name to the clipboard
g: view upstream reset options
`: toggle file tree view
+ M: open external merge tool (git mergetool)
## Pliki Panel (Submodules)
@@ -195,6 +204,7 @@
esc: wróć do panelu plików
+ M: open external merge tool (git mergetool)
space: pick hunk
b: pick both hunks
◄: select previous conflict
diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go
index 317572b81..fc7d59ebb 100644
--- a/pkg/i18n/english.go
+++ b/pkg/i18n/english.go
@@ -437,6 +437,7 @@ type TranslationSet struct {
SubmodulesTitle string
NavigationTitle string
SuggestionsTitle string
+ ExtrasTitle string
PushingTagStatus string
PullRequestURLCopiedToClipboard string
CommitMessageCopiedToClipboard string
@@ -980,6 +981,7 @@ func englishTranslationSet() TranslationSet {
SubmodulesTitle: "Submodules",
NavigationTitle: "List Panel Navigation",
SuggestionsTitle: "Suggestions",
+ ExtrasTitle: "Extras",
PushingTagStatus: "pushing tag",
PullRequestURLCopiedToClipboard: "Pull request URL copied to clipboard",
CommitMessageCopiedToClipboard: "Commit message copied to clipboard",
diff --git a/scripts/generate_cheatsheet.go b/scripts/generate_cheatsheet.go
index 14076a6ce..6120d4899 100644
--- a/scripts/generate_cheatsheet.go
+++ b/scripts/generate_cheatsheet.go
@@ -82,6 +82,7 @@ func localisedTitle(mApp *app.App, str string) string {
"secondary": tr.SecondaryTitle,
"stash": tr.StashTitle,
"suggestions": tr.SuggestionsTitle,
+ "extras": tr.ExtrasTitle,
}
title, ok := contextTitleMap[str]