summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2021-06-15 08:37:56 +1000
committerJesse Duffield <jessedduffield@gmail.com>2021-06-15 08:37:56 +1000
commit2b9df0ea061982639dcea51dbe09f60ef3ad7c15 (patch)
tree1b67f649c86af76adc262a25d9308bd4eae6ef59 /docs
parentb7b30191f1c510762bbe6d44dc87dea8b0690af9 (diff)
fix up cheatsheet
Diffstat (limited to 'docs')
-rw-r--r--docs/keybindings/Keybindings_en.md12
-rw-r--r--docs/keybindings/Keybindings_nl.md14
-rw-r--r--docs/keybindings/Keybindings_pl.md12
3 files changed, 34 insertions, 4 deletions
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
<pre>
+ <kbd>ctrl+r</kbd>: switch to a recent repo (<c-r>)
<kbd>pgup</kbd>: scroll up main panel (fn+up)
<kbd>pgdown</kbd>: scroll down main panel (fn+down)
<kbd>m</kbd>: view merge/rebase options
@@ -19,6 +20,7 @@
<kbd>|</kbd>: view filter-by-path options
<kbd>W</kbd>: open diff menu
<kbd>ctrl+e</kbd>: open diff menu
+ <kbd>@</kbd>: open command log menu
</pre>
## List Panel Navigation
@@ -122,7 +124,7 @@
<kbd>g</kbd>: reset to this commit
<kbd>f</kbd>: fixup commit
<kbd>F</kbd>: create fixup commit for this commit
- <kbd>S</kbd>: squash above commits
+ <kbd>S</kbd>: squash all 'fixup!' commits above selected commit (autosquash)
<kbd>d</kbd>: delete commit
<kbd>ctrl+j</kbd>: move commit down one
<kbd>ctrl+k</kbd>: move commit up one
@@ -154,6 +156,12 @@
<kbd>ctrl+o</kbd>: copy commit SHA to clipboard
</pre>
+## Extras Panel
+
+<pre>
+ <kbd>@</kbd>: open command log menu
+</pre>
+
## Files Panel (Files)
<pre>
@@ -176,6 +184,7 @@
<kbd>ctrl+o</kbd>: copy the file name to the clipboard
<kbd>g</kbd>: view upstream reset options
<kbd>`</kbd>: toggle file tree view
+ <kbd>M</kbd>: open external merge tool (git mergetool)
</pre>
## Files Panel (Submodules)
@@ -195,6 +204,7 @@
<pre>
<kbd>esc</kbd>: return to files panel
+ <kbd>M</kbd>: open external merge tool (git mergetool)
<kbd>space</kbd>: pick hunk
<kbd>b</kbd>: pick both hunks
<kbd>◄</kbd>: 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
<pre>
+ <kbd>ctrl+r</kbd>: wissel naar een recente repo (<c-r>)
<kbd>pgup</kbd>: scroll naar beneden vanaf hoofdpaneel (fn+up)
<kbd>pgdown</kbd>: scroll naar beneden vanaf hoofdpaneel (fn+down)
<kbd>m</kbd>: bekijk merge/rebase opties
@@ -19,6 +20,7 @@
<kbd>|</kbd>: bekijk scoping opties
<kbd>W</kbd>: open diff menu
<kbd>ctrl+e</kbd>: open diff menu
+ <kbd>@</kbd>: open command log menu
</pre>
## Lijstpaneel Navigatie
@@ -109,8 +111,8 @@
<kbd>o</kbd>: open bestand
<kbd>e</kbd>: verander bestand
<kbd>space</kbd>: toggle bestand inbegrepen in patch
- <kbd>enter</kbd>: enter bestand to add selecteered lines to the patch
- <kbd>`</kbd>: toggle file tree view
+ <kbd>enter</kbd>: enter bestand om geselecteerde regels toe te voegen aan de patch
+ <kbd>`</kbd>: toggle bestandsboom weergave
</pre>
## Commits Paneel (Commits)
@@ -154,6 +156,12 @@
<kbd>ctrl+o</kbd>: kopieer commit SHA naar klembord
</pre>
+## Extras Paneel
+
+<pre>
+ <kbd>@</kbd>: open command log menu
+</pre>
+
## Bestanden Paneel (Bestanden)
<pre>
@@ -176,6 +184,7 @@
<kbd>ctrl+o</kbd>: kopieer de bestandsnaam naar het klembord
<kbd>g</kbd>: bekijk upstream reset opties
<kbd>`</kbd>: toggle bestandsboom weergave
+ <kbd>M</kbd>: open external merge tool (git mergetool)
</pre>
## Bestanden Paneel (Submodules)
@@ -195,6 +204,7 @@
<pre>
<kbd>esc</kbd>: ga terug naar het bestanden paneel
+ <kbd>M</kbd>: open external merge tool (git mergetool)
<kbd>space</kbd>: kies hunk
<kbd>b</kbd>: kies bijde hunks
<kbd>◄</kbd>: 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
<pre>
+ <kbd>ctrl+r</kbd>: switch to a recent repo (<c-r>)
<kbd>pgup</kbd>: scroll up main panel (fn+up)
<kbd>pgdown</kbd>: scroll down main panel (fn+down)
<kbd>m</kbd>: view merge/rebase options
@@ -19,6 +20,7 @@
<kbd>|</kbd>: view filter-by-path options
<kbd>W</kbd>: open diff menu
<kbd>ctrl+e</kbd>: open diff menu
+ <kbd>@</kbd>: open command log menu
</pre>
## List Panel Navigation
@@ -122,7 +124,7 @@
<kbd>g</kbd>: zresetuj do tego commita
<kbd>f</kbd>: napraw commit
<kbd>F</kbd>: create fixup commit for this commit
- <kbd>S</kbd>: squash above commits
+ <kbd>S</kbd>: squash all 'fixup!' commits above selected commits (autosquash)
<kbd>d</kbd>: delete commit
<kbd>ctrl+j</kbd>: move commit down one
<kbd>ctrl+k</kbd>: move commit up one
@@ -154,6 +156,12 @@
<kbd>ctrl+o</kbd>: copy commit SHA to clipboard
</pre>
+## Extras Panel
+
+<pre>
+ <kbd>@</kbd>: open command log menu
+</pre>
+
## Pliki Panel (Pliki)
<pre>
@@ -176,6 +184,7 @@
<kbd>ctrl+o</kbd>: copy the file name to the clipboard
<kbd>g</kbd>: view upstream reset options
<kbd>`</kbd>: toggle file tree view
+ <kbd>M</kbd>: open external merge tool (git mergetool)
</pre>
## Pliki Panel (Submodules)
@@ -195,6 +204,7 @@
<pre>
<kbd>esc</kbd>: wróć do panelu plików
+ <kbd>M</kbd>: open external merge tool (git mergetool)
<kbd>space</kbd>: pick hunk
<kbd>b</kbd>: pick both hunks
<kbd>◄</kbd>: select previous conflict