summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorskanehira <sho19921005@gmail.com>2019-03-23 22:46:08 +0900
committerJesse Duffield <jessedduffield@gmail.com>2019-04-06 13:02:20 +1100
commitc350cdba4337fa8961e5fbe16e70d73fae7ccc20 (patch)
treed0445a56f0d964f6d50f200042851ec8b3c02e7f /docs
parent1a933eaa731e910cc22e361b93cba8fd5603016f (diff)
add feature of display diff between specific commits #397
Diffstat (limited to 'docs')
-rw-r--r--docs/keybindings/Keybindings_en.md32
-rw-r--r--docs/keybindings/Keybindings_nl.md6
-rw-r--r--docs/keybindings/Keybindings_pl.md6
3 files changed, 22 insertions, 22 deletions
diff --git a/docs/keybindings/Keybindings_en.md b/docs/keybindings/Keybindings_en.md
index 9d9d1471e..3f393610d 100644
--- a/docs/keybindings/Keybindings_en.md
+++ b/docs/keybindings/Keybindings_en.md
@@ -25,16 +25,15 @@
<kbd>A</kbd>: amend last commit
<kbd>C</kbd>: commit changes using git editor
<kbd>space</kbd>: toggle staged
- <kbd>d</kbd>: delete if untracked / checkout if tracked
+ <kbd>d</kbd>: view 'discard changes' options
<kbd>e</kbd>: edit file
<kbd>o</kbd>: open file
<kbd>i</kbd>: add to .gitignore
<kbd>r</kbd>: refresh files
<kbd>S</kbd>: stash files
- <kbd>s</kbd>: soft reset to last commit
<kbd>a</kbd>: stage/unstage all
<kbd>t</kbd>: add patch
- <kbd>D</kbd>: reset hard and remove untracked files
+ <kbd>D</kbd>: view reset options
<kbd>enter</kbd>: stage individual hunks/lines
<kbd>f</kbd>: fetch
</pre>
@@ -72,6 +71,7 @@
<kbd>C</kbd>: copy commit range (cherry-pick)
<kbd>v</kbd>: paste commits (cherry-pick)
<kbd>enter</kbd>: view commit's files
+ <kbd>space</kbd>: diff specific commits
</pre>
## Stash
@@ -91,19 +91,6 @@
<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>
@@ -122,3 +109,16 @@
<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/Keybindings_nl.md b/docs/keybindings/Keybindings_nl.md
index dfa45df2c..3b5f250ec 100644
--- a/docs/keybindings/Keybindings_nl.md
+++ b/docs/keybindings/Keybindings_nl.md
@@ -25,16 +25,15 @@
<kbd>A</kbd>: wijzig laatste commit
<kbd>C</kbd>: commit veranderingen met de git editor
<kbd>space</kbd>: toggle staged
- <kbd>d</kbd>: Verwijder als untracked / uitchecken wordt gevolgd (ga weg)
+ <kbd>d</kbd>: view 'discard changes' options
<kbd>e</kbd>: verander bestand
<kbd>o</kbd>: open bestand
<kbd>i</kbd>: voeg toe aan .gitignore
<kbd>r</kbd>: refresh bestanden
<kbd>S</kbd>: stash-bestanden
- <kbd>s</kbd>: soft reset to last commit
<kbd>a</kbd>: toggle staged alle
<kbd>t</kbd>: bewerkingen toevoegen
- <kbd>D</kbd>: harde reset and verwijderen ongevolgde bestanden
+ <kbd>D</kbd>: view reset options
<kbd>enter</kbd>: stage individuele hunks/lijnen
<kbd>f</kbd>: fetch
</pre>
@@ -72,6 +71,7 @@
<kbd>C</kbd>: copy commit range (cherry-pick)
<kbd>v</kbd>: paste commits (cherry-pick)
<kbd>enter</kbd>: view commit's files
+ <kbd>space</kbd>: diff specific commits
</pre>
## Stash
diff --git a/docs/keybindings/Keybindings_pl.md b/docs/keybindings/Keybindings_pl.md
index 9e60e9657..f4394af58 100644
--- a/docs/keybindings/Keybindings_pl.md
+++ b/docs/keybindings/Keybindings_pl.md
@@ -25,16 +25,15 @@
<kbd>A</kbd>: zmień ostatnie zatwierdzenie
<kbd>C</kbd>: commituj zmiany używając edytora z gita
<kbd>space</kbd>: przełącz zatwierdzenie
- <kbd>d</kbd>: usuń jeśli nie śledzony / przełącz jeśli śledzony
+ <kbd>d</kbd>: view 'discard changes' options
<kbd>e</kbd>: edytuj plik
<kbd>o</kbd>: otwórz plik
<kbd>i</kbd>: dodaj do .gitignore
<kbd>r</kbd>: odśwież pliki
<kbd>S</kbd>: przechowaj pliki
- <kbd>s</kbd>: soft reset to last commit
<kbd>a</kbd>: przełącz wszystkie zatwierdzenia
<kbd>t</kbd>: dodaj łatkę
- <kbd>D</kbd>: zresetuj twardo i usuń niepotwierdzone pliki
+ <kbd>D</kbd>: view reset options
<kbd>enter</kbd>: zatwierdź pojedyncze linie
<kbd>f</kbd>: fetch
</pre>
@@ -72,6 +71,7 @@
<kbd>C</kbd>: copy commit range (cherry-pick)
<kbd>v</kbd>: paste commits (cherry-pick)
<kbd>enter</kbd>: view commit's files
+ <kbd>space</kbd>: diff specific commits
</pre>
## Schowek