summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2019-03-22 20:13:48 +1100
committerJesse Duffield <jessedduffield@gmail.com>2019-03-22 20:20:06 +1100
commite68dbeb7ebdd42a48e0a35ad436ef86be50569d7 (patch)
tree8e092cf0f8f18332928b55040c14ab8191fbba43 /docs
parent32ddf0c2960e1076c526b542332f8233d916e2dd (diff)
organise keybindings better
Diffstat (limited to 'docs')
-rw-r--r--docs/keybindings/Keybindings_en.md (renamed from docs/Keybindings_en.md)26
-rw-r--r--docs/keybindings/Keybindings_nl.md (renamed from docs/Keybindings_nl.md)0
-rw-r--r--docs/keybindings/Keybindings_pl.md (renamed from docs/Keybindings_pl.md)0
3 files changed, 13 insertions, 13 deletions
diff --git a/docs/Keybindings_en.md b/docs/keybindings/Keybindings_en.md
index 108b6ba73..9d9d1471e 100644
--- a/docs/Keybindings_en.md
+++ b/docs/keybindings/Keybindings_en.md
@@ -91,6 +91,19 @@
<kbd>o</kbd>: open file
</pre>
+## Main (Merging)
+
+<pre>
+ <kbd>esc</kbd>: return to files panel
+ <kbd>space</kbd>: pick hunk
+ <kbd>b</kbd>: pick both hunks
+ <kbd>◄</kbd>: select previous conflict
+ <kbd>►</kbd>: select next conflict
+ <kbd>▲</kbd>: select top hunk
+ <kbd>▼</kbd>: select bottom hunk
+ <kbd>z</kbd>: undo
+</pre>
+
## Main (Normal)
<pre>
@@ -109,16 +122,3 @@
<kbd>space</kbd>: stage line
<kbd>a</kbd>: stage hunk
</pre>
-
-## Main (Merging)
-
-<pre>
- <kbd>esc</kbd>: return to files panel
- <kbd>space</kbd>: pick hunk
- <kbd>b</kbd>: pick both hunks
- <kbd>◄</kbd>: select previous conflict
- <kbd>►</kbd>: select next conflict
- <kbd>▲</kbd>: select top hunk
- <kbd>▼</kbd>: select bottom hunk
- <kbd>z</kbd>: undo
-</pre>
diff --git a/docs/Keybindings_nl.md b/docs/keybindings/Keybindings_nl.md
index dfa45df2c..dfa45df2c 100644
--- a/docs/Keybindings_nl.md
+++ b/docs/keybindings/Keybindings_nl.md
diff --git a/docs/Keybindings_pl.md b/docs/keybindings/Keybindings_pl.md
index 9e60e9657..9e60e9657 100644
--- a/docs/Keybindings_pl.md
+++ b/docs/keybindings/Keybindings_pl.md