mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-11 04:15:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

update keybindings

Browse source
This commit is contained in:
Jesse Duffield 2020-10-02 07:32:48 +10:00
parent 30b3478611
commit 7be474bd83
8 changed files with 229 additions and 252 deletions
Download patch file Download diff file Expand all files Collapse all files

110
docs/keybindings/Keybindings_en.md
View file

@ -17,14 +17,20 @@
<kbd>_</kbd>: prev screen mode <kbd>_</kbd>: prev screen mode
<kbd>:</kbd>: execute custom command <kbd>:</kbd>: execute custom command
<kbd>|</kbd>: view scoping options <kbd>|</kbd>: view scoping options
<kbd>∂</kbd>: open diff menu <kbd>W</kbd>: open diff menu
<kbd>ctrl+e</kbd>: open diff menu
</pre> </pre>
## Branches Panel ## List Panel Navigation
<pre> <pre>
<kbd>]</kbd>: next tab <kbd>]</kbd>: next tab
<kbd>[</kbd>: previous tab <kbd>[</kbd>: previous tab
<kbd>,</kbd>: previous page
<kbd>.</kbd>: next page
<kbd><</kbd>: scroll to top
<kbd>/</kbd>: start search
<kbd>></kbd>: scroll to bottom
</pre> </pre>
## Branches Panel (Branches Tab) ## Branches Panel (Branches Tab)
@ -43,11 +49,7 @@
<kbd>g</kbd>: view reset options <kbd>g</kbd>: view reset options
<kbd>R</kbd>: rename branch <kbd>R</kbd>: rename branch
<kbd>ctrl+o</kbd>: copy branch name to clipboard <kbd>ctrl+o</kbd>: copy branch name to clipboard
<kbd>,</kbd>: previous page <kbd>enter</kbd>: view commits
<kbd>.</kbd>: next page
<kbd><</kbd>: scroll to top
<kbd>/</kbd>: start search
<kbd>></kbd>: scroll to bottom
</pre> </pre>
## Branches Panel (Remote Branches (in Remotes tab)) ## Branches Panel (Remote Branches (in Remotes tab))
@ -55,17 +57,13 @@
<pre> <pre>
<kbd>esc</kbd>: Return to remotes list <kbd>esc</kbd>: Return to remotes list
<kbd>g</kbd>: view reset options <kbd>g</kbd>: view reset options
<kbd>enter</kbd>: view commits
<kbd>space</kbd>: checkout <kbd>space</kbd>: checkout
<kbd>n</kbd>: new branch <kbd>n</kbd>: new branch
<kbd>M</kbd>: merge into currently checked out branch <kbd>M</kbd>: merge into currently checked out branch
<kbd>d</kbd>: delete branch <kbd>d</kbd>: delete branch
<kbd>r</kbd>: rebase checked-out branch onto this branch <kbd>r</kbd>: rebase checked-out branch onto this branch
<kbd>u</kbd>: set as upstream of checked-out branch <kbd>u</kbd>: set as upstream of checked-out branch
<kbd>,</kbd>: previous page
<kbd>.</kbd>: next page
<kbd><</kbd>: scroll to top
<kbd>/</kbd>: start search
<kbd>></kbd>: scroll to bottom
</pre> </pre>
## Branches Panel (Remotes Tab) ## Branches Panel (Remotes Tab)
@ -75,11 +73,19 @@
<kbd>n</kbd>: add new remote <kbd>n</kbd>: add new remote
<kbd>d</kbd>: remove remote <kbd>d</kbd>: remove remote
<kbd>e</kbd>: edit remote <kbd>e</kbd>: edit remote
<kbd>,</kbd>: previous page </pre>
<kbd>.</kbd>: next page
<kbd><</kbd>: scroll to top ## Branches Panel (Sub-commits)
<kbd>/</kbd>: start search
<kbd>></kbd>: scroll to bottom <pre>
<kbd>enter</kbd>: view commit's files
<kbd>space</kbd>: checkout commit
<kbd>g</kbd>: view reset options
<kbd>n</kbd>: new branch
<kbd>c</kbd>: copy commit (cherry-pick)
<kbd>C</kbd>: copy commit range (cherry-pick)
<kbd>ctrl+r</kbd>: reset cherry-picked (copied) commits selection
<kbd>ctrl+o</kbd>: copy commit SHA to clipboard
</pre> </pre>
## Branches Panel (Tags Tab) ## Branches Panel (Tags Tab)
@ -90,38 +96,22 @@
<kbd>P</kbd>: push tag <kbd>P</kbd>: push tag
<kbd>n</kbd>: create tag <kbd>n</kbd>: create tag
<kbd>g</kbd>: view reset options <kbd>g</kbd>: view reset options
<kbd>,</kbd>: previous page <kbd>enter</kbd>: view commits
<kbd>.</kbd>: next page
<kbd><</kbd>: scroll to top
<kbd>/</kbd>: start search
<kbd>></kbd>: scroll to bottom
</pre> </pre>
## Commit Files Panel ## Commit Files Panel
<pre> <pre>
<kbd>esc</kbd>: go back <kbd>ctrl+o</kbd>: copy the committed file name to the clipboard
<kbd>c</kbd>: checkout file <kbd>c</kbd>: checkout file
<kbd>d</kbd>: discard this commit's changes to this file <kbd>d</kbd>: discard this commit's changes to this file
<kbd>o</kbd>: open file <kbd>o</kbd>: open file
<kbd>e</kbd>: edit file <kbd>e</kbd>: edit file
<kbd>space</kbd>: toggle file included in patch <kbd>space</kbd>: toggle file included in patch
<kbd>enter</kbd>: enter file to add selected lines to the patch <kbd>enter</kbd>: enter file to add selected lines to the patch
<kbd>,</kbd>: previous page
<kbd>.</kbd>: next page
<kbd><</kbd>: scroll to top
<kbd>/</kbd>: start search
<kbd>></kbd>: scroll to bottom
</pre> </pre>
## Commits Panel ## Commits Panel (Commits)
<pre>
<kbd>]</kbd>: next tab
<kbd>[</kbd>: previous tab
</pre>
## Commits Panel (Commits Tab)
<pre> <pre>
<kbd>s</kbd>: squash down <kbd>s</kbd>: squash down
@ -147,26 +137,21 @@
<kbd>n</kbd>: create new branch off of commit <kbd>n</kbd>: create new branch off of commit
<kbd>T</kbd>: tag commit <kbd>T</kbd>: tag commit
<kbd>ctrl+r</kbd>: reset cherry-picked (copied) commits selection <kbd>ctrl+r</kbd>: reset cherry-picked (copied) commits selection
<kbd>,</kbd>: previous page
<kbd>.</kbd>: next page
<kbd><</kbd>: scroll to top
<kbd>/</kbd>: start search
<kbd>></kbd>: scroll to bottom
</pre> </pre>
## Commits Panel (Reflog Tab) ## Commits Panel (Reflog Tab)
<pre> <pre>
<kbd>enter</kbd>: view commit's files
<kbd>space</kbd>: checkout commit <kbd>space</kbd>: checkout commit
<kbd>g</kbd>: view reset options <kbd>g</kbd>: view reset options
<kbd>,</kbd>: previous page <kbd>c</kbd>: copy commit (cherry-pick)
<kbd>.</kbd>: next page <kbd>C</kbd>: copy commit range (cherry-pick)
<kbd><</kbd>: scroll to top <kbd>ctrl+r</kbd>: reset cherry-picked (copied) commits selection
<kbd>/</kbd>: start search <kbd>ctrl+o</kbd>: copy commit SHA to clipboard
<kbd>></kbd>: scroll to bottom
</pre> </pre>
## Files Panel ## Files Panel (Files)
<pre> <pre>
<kbd>c</kbd>: commit changes <kbd>c</kbd>: commit changes
@ -185,12 +170,21 @@
<kbd>D</kbd>: view reset options <kbd>D</kbd>: view reset options
<kbd>enter</kbd>: stage individual hunks/lines <kbd>enter</kbd>: stage individual hunks/lines
<kbd>f</kbd>: fetch <kbd>f</kbd>: fetch
<kbd>ctrl+o</kbd>: copy the file name to the clipboard
<kbd>g</kbd>: view upstream reset options <kbd>g</kbd>: view upstream reset options
<kbd>,</kbd>: previous page </pre>
<kbd>.</kbd>: next page
<kbd><</kbd>: scroll to top ## Files Panel (Submodules)
<kbd>/</kbd>: start search
<kbd>></kbd>: scroll to bottom <pre>
<kbd>ctrl+o</kbd>: copy submodule name to clipboard
<kbd>enter</kbd>: enter submodule
<kbd>d</kbd>: view reset and remove submodule options
<kbd>u</kbd>: update submodule
<kbd>n</kbd>: add new submodule
<kbd>e</kbd>: update submodule URL
<kbd>i</kbd>: initialize submodule
<kbd>b</kbd>: view bulk submodule options
</pre> </pre>
## Main Panel (Merging) ## Main Panel (Merging)
@ -254,24 +248,16 @@
<pre> <pre>
<kbd>esc</kbd>: close menu <kbd>esc</kbd>: close menu
<kbd>,</kbd>: previous page
<kbd>.</kbd>: next page
<kbd><</kbd>: scroll to top
<kbd>/</kbd>: start search
<kbd>></kbd>: scroll to bottom
</pre> </pre>
## Stash Panel ## Stash Panel
<pre> <pre>
<kbd>enter</kbd>: view stash entry's files
<kbd>space</kbd>: apply <kbd>space</kbd>: apply
<kbd>g</kbd>: pop <kbd>g</kbd>: pop
<kbd>d</kbd>: drop <kbd>d</kbd>: drop
<kbd>,</kbd>: previous page <kbd>n</kbd>: new branch
<kbd>.</kbd>: next page
<kbd><</kbd>: scroll to top
<kbd>/</kbd>: start search
<kbd>></kbd>: scroll to bottom
</pre> </pre>
## Status Panel ## Status Panel

110
docs/keybindings/Keybindings_nl.md
View file

@ -17,14 +17,20 @@
<kbd>_</kbd>: vorige schermmode <kbd>_</kbd>: vorige schermmode
<kbd>:</kbd>: voor aangepast commando uit <kbd>:</kbd>: voor aangepast commando uit
<kbd>|</kbd>: bekijk scoping opties <kbd>|</kbd>: bekijk scoping opties
<kbd>∂</kbd>: open diff menu <kbd>W</kbd>: open diff menu
<kbd>ctrl+e</kbd>: open diff menu
</pre> </pre>
## Branches Paneel ## List Panel Navigation
<pre> <pre>
<kbd>]</kbd>: volgende tab <kbd>]</kbd>: volgende tab
<kbd>[</kbd>: vorige tab <kbd>[</kbd>: vorige tab
<kbd>,</kbd>: vorige pagina
<kbd>.</kbd>: volgende pagina
<kbd><</kbd>: scroll naar boven
<kbd>/</kbd>: start met zoekken
<kbd>></kbd>: scroll naar beneden
</pre> </pre>
## Branches Paneel (Branches Tab) ## Branches Paneel (Branches Tab)
@ -43,11 +49,7 @@
<kbd>g</kbd>: bekijk reset opties <kbd>g</kbd>: bekijk reset opties
<kbd>R</kbd>: hernoem branch <kbd>R</kbd>: hernoem branch
<kbd>ctrl+o</kbd>: copieer branch name naar clipboard <kbd>ctrl+o</kbd>: copieer branch name naar clipboard
<kbd>,</kbd>: vorige pagina <kbd>enter</kbd>: view commits
<kbd>.</kbd>: volgende pagina
<kbd><</kbd>: scroll naar boven
<kbd>/</kbd>: start met zoekken
<kbd>></kbd>: scroll naar beneden
</pre> </pre>
## Branches Paneel (Remote Branches (in Remotes tab)) ## Branches Paneel (Remote Branches (in Remotes tab))
@ -55,17 +57,13 @@
<pre> <pre>
<kbd>esc</kbd>: Ga terug naar remotes lijst <kbd>esc</kbd>: Ga terug naar remotes lijst
<kbd>g</kbd>: bekijk reset opties <kbd>g</kbd>: bekijk reset opties
<kbd>enter</kbd>: view commits
<kbd>space</kbd>: uitchecken <kbd>space</kbd>: uitchecken
<kbd>n</kbd>: nieuwe branch <kbd>n</kbd>: nieuwe branch
<kbd>M</kbd>: merge in met huidige checked out branch <kbd>M</kbd>: merge in met huidige checked out branch
<kbd>d</kbd>: verwijder branch <kbd>d</kbd>: verwijder branch
<kbd>r</kbd>: rebase branch <kbd>r</kbd>: rebase branch
<kbd>u</kbd>: stel in als upstream van uitgecheckte branch <kbd>u</kbd>: stel in als upstream van uitgecheckte branch
<kbd>,</kbd>: vorige pagina
<kbd>.</kbd>: volgende pagina
<kbd><</kbd>: scroll naar boven
<kbd>/</kbd>: start met zoekken
<kbd>></kbd>: scroll naar beneden
</pre> </pre>
## Branches Paneel (Remotes Tab) ## Branches Paneel (Remotes Tab)
@ -75,11 +73,19 @@
<kbd>n</kbd>: voeg een nieuwe remote toe <kbd>n</kbd>: voeg een nieuwe remote toe
<kbd>d</kbd>: verwijder remote <kbd>d</kbd>: verwijder remote
<kbd>e</kbd>: wijzig remote <kbd>e</kbd>: wijzig remote
<kbd>,</kbd>: vorige pagina </pre>
<kbd>.</kbd>: volgende pagina
<kbd><</kbd>: scroll naar boven ## Branches Paneel (Sub-commits)
<kbd>/</kbd>: start met zoekken
<kbd>></kbd>: scroll naar beneden <pre>
<kbd>enter</kbd>: bekijk gecommite bestanden
<kbd>space</kbd>: checkout commit
<kbd>g</kbd>: bekijk reset opties
<kbd>n</kbd>: nieuwe branch
<kbd>c</kbd>: kopiëer commit (cherry-pick)
<kbd>C</kbd>: kopiëer commit reeks (cherry-pick)
<kbd>ctrl+r</kbd>: reset cherry-picked (gecopieerde) commits selectie
<kbd>ctrl+o</kbd>: copieer commit SHA naar clipboard
</pre> </pre>
## Branches Paneel (Tags Tab) ## Branches Paneel (Tags Tab)
@ -90,38 +96,22 @@
<kbd>P</kbd>: push tag <kbd>P</kbd>: push tag
<kbd>n</kbd>: creëer tag <kbd>n</kbd>: creëer tag
<kbd>g</kbd>: bekijk reset opties <kbd>g</kbd>: bekijk reset opties
<kbd>,</kbd>: vorige pagina <kbd>enter</kbd>: view commits
<kbd>.</kbd>: volgende pagina
<kbd><</kbd>: scroll naar boven
<kbd>/</kbd>: start met zoekken
<kbd>></kbd>: scroll naar beneden
</pre> </pre>
## Commit bestanden Paneel ## Commit bestanden Paneel
<pre> <pre>
<kbd>esc</kbd>: ga terug <kbd>ctrl+o</kbd>: kopieer de vastgelegde bestandsnaam naar het klembord
<kbd>c</kbd>: bestand uitchecken <kbd>c</kbd>: bestand uitchecken
<kbd>d</kbd>: uitsluit deze commit zijn veranderingen aan dit bestand <kbd>d</kbd>: uitsluit deze commit zijn veranderingen aan dit bestand
<kbd>o</kbd>: open bestand <kbd>o</kbd>: open bestand
<kbd>e</kbd>: verander bestand <kbd>e</kbd>: verander bestand
<kbd>space</kbd>: toggle bestand inbegrepen in patch <kbd>space</kbd>: toggle bestand inbegrepen in patch
<kbd>enter</kbd>: enter bestand to add selecteered lines to the patch <kbd>enter</kbd>: enter bestand to add selecteered lines to the patch
<kbd>,</kbd>: vorige pagina
<kbd>.</kbd>: volgende pagina
<kbd><</kbd>: scroll naar boven
<kbd>/</kbd>: start met zoekken
<kbd>></kbd>: scroll naar beneden
</pre> </pre>
## Commits Paneel ## Commits Paneel (Commits)
<pre>
<kbd>]</kbd>: volgende tab
<kbd>[</kbd>: vorige tab
</pre>
## Commits Paneel (Commits Tab)
<pre> <pre>
<kbd>s</kbd>: squash beneden <kbd>s</kbd>: squash beneden
@ -147,26 +137,21 @@
<kbd>n</kbd>: create new branch off of commit <kbd>n</kbd>: create new branch off of commit
<kbd>T</kbd>: tag commit <kbd>T</kbd>: tag commit
<kbd>ctrl+r</kbd>: reset cherry-picked (gecopieerde) commits selectie <kbd>ctrl+r</kbd>: reset cherry-picked (gecopieerde) commits selectie
<kbd>,</kbd>: vorige pagina
<kbd>.</kbd>: volgende pagina
<kbd><</kbd>: scroll naar boven
<kbd>/</kbd>: start met zoekken
<kbd>></kbd>: scroll naar beneden
</pre> </pre>
## Commits Paneel (Reflog Tab) ## Commits Paneel (Reflog Tab)
<pre> <pre>
<kbd>enter</kbd>: bekijk gecommite bestanden
<kbd>space</kbd>: checkout commit <kbd>space</kbd>: checkout commit
<kbd>g</kbd>: bekijk reset opties <kbd>g</kbd>: bekijk reset opties
<kbd>,</kbd>: vorige pagina <kbd>c</kbd>: kopiëer commit (cherry-pick)
<kbd>.</kbd>: volgende pagina <kbd>C</kbd>: kopiëer commit reeks (cherry-pick)
<kbd><</kbd>: scroll naar boven <kbd>ctrl+r</kbd>: reset cherry-picked (gecopieerde) commits selectie
<kbd>/</kbd>: start met zoekken <kbd>ctrl+o</kbd>: copieer commit SHA naar clipboard
<kbd>></kbd>: scroll naar beneden
</pre> </pre>
## Bestanden Paneel ## Bestanden Paneel (Bestanden)
<pre> <pre>
<kbd>c</kbd>: Commit veranderingen <kbd>c</kbd>: Commit veranderingen
@ -185,12 +170,21 @@
<kbd>D</kbd>: bekijk reset opties <kbd>D</kbd>: bekijk reset opties
<kbd>enter</kbd>: stage individuele hunks/lijnen <kbd>enter</kbd>: stage individuele hunks/lijnen
<kbd>f</kbd>: fetch <kbd>f</kbd>: fetch
<kbd>ctrl+o</kbd>: kopieer de bestandsnaam naar het klembord
<kbd>g</kbd>: bekijk upstream reset opties <kbd>g</kbd>: bekijk upstream reset opties
<kbd>,</kbd>: vorige pagina </pre>
<kbd>.</kbd>: volgende pagina
<kbd><</kbd>: scroll naar boven ## Bestanden Paneel (Submodules)
<kbd>/</kbd>: start met zoekken
<kbd>></kbd>: scroll naar beneden <pre>
<kbd>ctrl+o</kbd>: copy submodule name to clipboard
<kbd>enter</kbd>: enter submodule
<kbd>d</kbd>: view reset and remove submodule options
<kbd>u</kbd>: update submodule
<kbd>n</kbd>: add new submodule
<kbd>e</kbd>: update submodule URL
<kbd>i</kbd>: initialize submodule
<kbd>b</kbd>: view bulk submodule options
</pre> </pre>
## Hooft Paneel (Merggen) ## Hooft Paneel (Merggen)
@ -254,24 +248,16 @@
<pre> <pre>
<kbd>esc</kbd>: sluit menu <kbd>esc</kbd>: sluit menu
<kbd>,</kbd>: vorige pagina
<kbd>.</kbd>: volgende pagina
<kbd><</kbd>: scroll naar boven
<kbd>/</kbd>: start met zoekken
<kbd>></kbd>: scroll naar beneden
</pre> </pre>
## Stash Paneel ## Stash Paneel
<pre> <pre>
<kbd>enter</kbd>: view stash entry's files
<kbd>space</kbd>: toepassen <kbd>space</kbd>: toepassen
<kbd>g</kbd>: pop <kbd>g</kbd>: pop
<kbd>d</kbd>: laten vallen <kbd>d</kbd>: laten vallen
<kbd>,</kbd>: vorige pagina <kbd>n</kbd>: nieuwe branch
<kbd>.</kbd>: volgende pagina
<kbd><</kbd>: scroll naar boven
<kbd>/</kbd>: start met zoekken
<kbd>></kbd>: scroll naar beneden
</pre> </pre>
## Status Paneel ## Status Paneel

110
docs/keybindings/Keybindings_pl.md
View file

@ -17,14 +17,20 @@
<kbd>_</kbd>: prev screen mode <kbd>_</kbd>: prev screen mode
<kbd>:</kbd>: execute custom command <kbd>:</kbd>: execute custom command
<kbd>|</kbd>: view scoping options <kbd>|</kbd>: view scoping options
<kbd>∂</kbd>: open diff menu <kbd>W</kbd>: open diff menu
<kbd>ctrl+e</kbd>: open diff menu
</pre> </pre>
## Gałęzie Panel ## List Panel Navigation
<pre> <pre>
<kbd>]</kbd>: next tab <kbd>]</kbd>: next tab
<kbd>[</kbd>: previous tab <kbd>[</kbd>: previous tab
<kbd>,</kbd>: previous page
<kbd>.</kbd>: next page
<kbd><</kbd>: scroll to top
<kbd>/</kbd>: start search
<kbd>></kbd>: scroll to bottom
</pre> </pre>
## Gałęzie Panel (Branches Tab) ## Gałęzie Panel (Branches Tab)
@ -43,11 +49,7 @@
<kbd>g</kbd>: view reset options <kbd>g</kbd>: view reset options
<kbd>R</kbd>: rename branch <kbd>R</kbd>: rename branch
<kbd>ctrl+o</kbd>: copy branch name to clipboard <kbd>ctrl+o</kbd>: copy branch name to clipboard
<kbd>,</kbd>: previous page <kbd>enter</kbd>: view commits
<kbd>.</kbd>: next page
<kbd><</kbd>: scroll to top
<kbd>/</kbd>: start search
<kbd>></kbd>: scroll to bottom
</pre> </pre>
## Gałęzie Panel (Remote Branches (in Remotes tab)) ## Gałęzie Panel (Remote Branches (in Remotes tab))
@ -55,17 +57,13 @@
<pre> <pre>
<kbd>esc</kbd>: return to remotes list <kbd>esc</kbd>: return to remotes list
<kbd>g</kbd>: view reset options <kbd>g</kbd>: view reset options
<kbd>enter</kbd>: view commits
<kbd>space</kbd>: przełącz <kbd>space</kbd>: przełącz
<kbd>n</kbd>: nowa gałąź <kbd>n</kbd>: nowa gałąź
<kbd>M</kbd>: scal do obecnej gałęzi <kbd>M</kbd>: scal do obecnej gałęzi
<kbd>d</kbd>: usuń gałąź <kbd>d</kbd>: usuń gałąź
<kbd>r</kbd>: rebase branch <kbd>r</kbd>: rebase branch
<kbd>u</kbd>: set as upstream of checked-out branch <kbd>u</kbd>: set as upstream of checked-out branch
<kbd>,</kbd>: previous page
<kbd>.</kbd>: next page
<kbd><</kbd>: scroll to top
<kbd>/</kbd>: start search
<kbd>></kbd>: scroll to bottom
</pre> </pre>
## Gałęzie Panel (Remotes Tab) ## Gałęzie Panel (Remotes Tab)
@ -75,11 +73,19 @@
<kbd>n</kbd>: add new remote <kbd>n</kbd>: add new remote
<kbd>d</kbd>: remove remote <kbd>d</kbd>: remove remote
<kbd>e</kbd>: edit remote <kbd>e</kbd>: edit remote
<kbd>,</kbd>: previous page </pre>
<kbd>.</kbd>: next page
<kbd><</kbd>: scroll to top ## Gałęzie Panel (Sub-commits)
<kbd>/</kbd>: start search
<kbd>></kbd>: scroll to bottom <pre>
<kbd>enter</kbd>: view commit's files
<kbd>space</kbd>: checkout commit
<kbd>g</kbd>: view reset options
<kbd>n</kbd>: nowa gałąź
<kbd>c</kbd>: copy commit (cherry-pick)
<kbd>C</kbd>: copy commit range (cherry-pick)
<kbd>ctrl+r</kbd>: reset cherry-picked (copied) commits selection
<kbd>ctrl+o</kbd>: copy commit SHA to clipboard
</pre> </pre>
## Gałęzie Panel (Tags Tab) ## Gałęzie Panel (Tags Tab)
@ -90,38 +96,22 @@
<kbd>P</kbd>: push tag <kbd>P</kbd>: push tag
<kbd>n</kbd>: create tag <kbd>n</kbd>: create tag
<kbd>g</kbd>: view reset options <kbd>g</kbd>: view reset options
<kbd>,</kbd>: previous page <kbd>enter</kbd>: view commits
<kbd>.</kbd>: next page
<kbd><</kbd>: scroll to top
<kbd>/</kbd>: start search
<kbd>></kbd>: scroll to bottom
</pre> </pre>
## Commit files Panel ## Commit files Panel
<pre> <pre>
<kbd>esc</kbd>: go back <kbd>ctrl+o</kbd>: copy the committed file name to the clipboard
<kbd>c</kbd>: checkout file <kbd>c</kbd>: checkout file
<kbd>d</kbd>: discard this commit's changes to this file <kbd>d</kbd>: discard this commit's changes to this file
<kbd>o</kbd>: otwórz plik <kbd>o</kbd>: otwórz plik
<kbd>e</kbd>: edytuj plik <kbd>e</kbd>: edytuj plik
<kbd>space</kbd>: toggle file included in patch <kbd>space</kbd>: toggle file included in patch
<kbd>enter</kbd>: enter file to add selected lines to the patch <kbd>enter</kbd>: enter file to add selected lines to the patch
<kbd>,</kbd>: previous page
<kbd>.</kbd>: next page
<kbd><</kbd>: scroll to top
<kbd>/</kbd>: start search
<kbd>></kbd>: scroll to bottom
</pre> </pre>
## Commity Panel ## Commity Panel (Commity)
<pre>
<kbd>]</kbd>: next tab
<kbd>[</kbd>: previous tab
</pre>
## Commity Panel (Commits Tab)
<pre> <pre>
<kbd>s</kbd>: ściśnij w dół <kbd>s</kbd>: ściśnij w dół
@ -147,26 +137,21 @@
<kbd>n</kbd>: create new branch off of commit <kbd>n</kbd>: create new branch off of commit
<kbd>T</kbd>: tag commit <kbd>T</kbd>: tag commit
<kbd>ctrl+r</kbd>: reset cherry-picked (copied) commits selection <kbd>ctrl+r</kbd>: reset cherry-picked (copied) commits selection
<kbd>,</kbd>: previous page
<kbd>.</kbd>: next page
<kbd><</kbd>: scroll to top
<kbd>/</kbd>: start search
<kbd>></kbd>: scroll to bottom
</pre> </pre>
## Commity Panel (Reflog Tab) ## Commity Panel (Reflog Tab)
<pre> <pre>
<kbd>enter</kbd>: view commit's files
<kbd>space</kbd>: checkout commit <kbd>space</kbd>: checkout commit
<kbd>g</kbd>: view reset options <kbd>g</kbd>: view reset options
<kbd>,</kbd>: previous page <kbd>c</kbd>: copy commit (cherry-pick)
<kbd>.</kbd>: next page <kbd>C</kbd>: copy commit range (cherry-pick)
<kbd><</kbd>: scroll to top <kbd>ctrl+r</kbd>: reset cherry-picked (copied) commits selection
<kbd>/</kbd>: start search <kbd>ctrl+o</kbd>: copy commit SHA to clipboard
<kbd>></kbd>: scroll to bottom
</pre> </pre>
## Pliki Panel ## Pliki Panel (Pliki)
<pre> <pre>
<kbd>c</kbd>: commituj zmiany <kbd>c</kbd>: commituj zmiany
@ -185,12 +170,21 @@
<kbd>D</kbd>: view reset options <kbd>D</kbd>: view reset options
<kbd>enter</kbd>: zatwierdź pojedyncze linie <kbd>enter</kbd>: zatwierdź pojedyncze linie
<kbd>f</kbd>: fetch <kbd>f</kbd>: fetch
<kbd>ctrl+o</kbd>: copy the file name to the clipboard
<kbd>g</kbd>: view upstream reset options <kbd>g</kbd>: view upstream reset options
<kbd>,</kbd>: previous page </pre>
<kbd>.</kbd>: next page
<kbd><</kbd>: scroll to top ## Pliki Panel (Submodules)
<kbd>/</kbd>: start search
<kbd>></kbd>: scroll to bottom <pre>
<kbd>ctrl+o</kbd>: copy submodule name to clipboard
<kbd>enter</kbd>: enter submodule
<kbd>d</kbd>: view reset and remove submodule options
<kbd>u</kbd>: update submodule
<kbd>n</kbd>: add new submodule
<kbd>e</kbd>: update submodule URL
<kbd>i</kbd>: initialize submodule
<kbd>b</kbd>: view bulk submodule options
</pre> </pre>
## Main Panel (Merging) ## Main Panel (Merging)
@ -254,24 +248,16 @@
<pre> <pre>
<kbd>esc</kbd>: close menu <kbd>esc</kbd>: close menu
<kbd>,</kbd>: previous page
<kbd>.</kbd>: next page
<kbd><</kbd>: scroll to top
<kbd>/</kbd>: start search
<kbd>></kbd>: scroll to bottom
</pre> </pre>
## Schowek Panel ## Schowek Panel
<pre> <pre>
<kbd>enter</kbd>: view stash entry's files
<kbd>space</kbd>: zastosuj <kbd>space</kbd>: zastosuj
<kbd>g</kbd>: wyciągnij <kbd>g</kbd>: wyciągnij
<kbd>d</kbd>: porzuć <kbd>d</kbd>: porzuć
<kbd>,</kbd>: previous page <kbd>n</kbd>: nowa gałąź
<kbd>.</kbd>: next page
<kbd><</kbd>: scroll to top
<kbd>/</kbd>: start search
<kbd>></kbd>: scroll to bottom
</pre> </pre>
## Status Panel ## Status Panel

56
pkg/gui/keybindings.go
View file

@ -21,6 +21,7 @@ type Binding struct {
Modifier gocui.Modifier Modifier gocui.Modifier
Description string Description string
Alternative string Alternative string
Tag string // e.g. 'navigation'. Used for grouping things in the cheatsheet
} }
// GetDisplayStrings returns the display string of a file // GetDisplayStrings returns the display string of a file
@ -633,18 +634,6 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
Handler: gui.wrappedHandler(gui.handleSwitchToSubCommits), Handler: gui.wrappedHandler(gui.handleSwitchToSubCommits),
Description: gui.Tr.SLocalize("viewCommits"), Description: gui.Tr.SLocalize("viewCommits"),
}, },
{
ViewName: "branches",
Key: gui.getKey("universal.nextTab"),
Handler: gui.handleNextTab,
Description: gui.Tr.SLocalize("nextTab"),
},
{
ViewName: "branches",
Key: gui.getKey("universal.prevTab"),
Handler: gui.handlePrevTab,
Description: gui.Tr.SLocalize("prevTab"),
},
{ {
ViewName: "branches", ViewName: "branches",
Contexts: []string{REMOTE_BRANCHES_CONTEXT_KEY}, Contexts: []string{REMOTE_BRANCHES_CONTEXT_KEY},
@ -673,18 +662,6 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
Handler: gui.handleFetchRemote, Handler: gui.handleFetchRemote,
Description: gui.Tr.SLocalize("fetchRemote"), Description: gui.Tr.SLocalize("fetchRemote"),
}, },
{
ViewName: "commits",
Key: gui.getKey("universal.nextTab"),
Handler: gui.handleNextTab,
Description: gui.Tr.SLocalize("nextTab"),
},
{
ViewName: "commits",
Key: gui.getKey("universal.prevTab"),
Handler: gui.handlePrevTab,
Description: gui.Tr.SLocalize("prevTab"),
},
{ {
ViewName: "commits", ViewName: "commits",
Contexts: []string{BRANCH_COMMITS_CONTEXT_KEY}, Contexts: []string{BRANCH_COMMITS_CONTEXT_KEY},
@ -1560,18 +1537,6 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
Modifier: gocui.ModNone, Modifier: gocui.ModNone,
Handler: gui.wrappedHandler(gui.onMenuPress), Handler: gui.wrappedHandler(gui.onMenuPress),
}, },
{
ViewName: "files",
Key: gui.getKey("universal.nextTab"),
Handler: gui.handleNextTab,
Description: gui.Tr.SLocalize("nextTab"),
},
{
ViewName: "files",
Key: gui.getKey("universal.prevTab"),
Handler: gui.handlePrevTab,
Description: gui.Tr.SLocalize("prevTab"),
},
{ {
ViewName: "files", ViewName: "files",
Contexts: []string{SUBMODULES_CONTEXT_KEY}, Contexts: []string{SUBMODULES_CONTEXT_KEY},
@ -1644,6 +1609,25 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
bindings = append(bindings, &Binding{ViewName: "", Key: rune(i+1) + '0', Modifier: gocui.ModNone, Handler: gui.goToSideWindow(window)}) bindings = append(bindings, &Binding{ViewName: "", Key: rune(i+1) + '0', Modifier: gocui.ModNone, Handler: gui.goToSideWindow(window)})
} }
for viewName := range gui.viewTabContextMap() {
bindings = append(bindings, []*Binding{
{
ViewName: viewName,
Key: gui.getKey("universal.nextTab"),
Handler: gui.handleNextTab,
Description: gui.Tr.SLocalize("nextTab"),
Tag: "navigation",
},
{
ViewName: viewName,
Key: gui.getKey("universal.prevTab"),
Handler: gui.handlePrevTab,
Description: gui.Tr.SLocalize("prevTab"),
Tag: "navigation",
},
}...)
}
bindings = append(bindings, gui.getListContextKeyBindings()...) bindings = append(bindings, gui.getListContextKeyBindings()...)
return bindings return bindings

20
pkg/gui/list_context.go
View file

@ -510,15 +510,15 @@ func (gui *Gui) getListContextKeyBindings() []*Binding {
for _, listContext := range gui.getListContexts() { for _, listContext := range gui.getListContexts() {
bindings = append(bindings, []*Binding{ bindings = append(bindings, []*Binding{
{ViewName: listContext.ViewName, Contexts: []string{listContext.ContextKey}, Key: gui.getKey("universal.prevItem-alt"), Modifier: gocui.ModNone, Handler: listContext.handlePrevLine}, {ViewName: listContext.ViewName, Tag: "navigation", Contexts: []string{listContext.ContextKey}, Key: gui.getKey("universal.prevItem-alt"), Modifier: gocui.ModNone, Handler: listContext.handlePrevLine},
{ViewName: listContext.ViewName, Contexts: []string{listContext.ContextKey}, Key: gui.getKey("universal.prevItem"), Modifier: gocui.ModNone, Handler: listContext.handlePrevLine}, {ViewName: listContext.ViewName, Tag: "navigation", Contexts: []string{listContext.ContextKey}, Key: gui.getKey("universal.prevItem"), Modifier: gocui.ModNone, Handler: listContext.handlePrevLine},
{ViewName: listContext.ViewName, Contexts: []string{listContext.ContextKey}, Key: gocui.MouseWheelUp, Modifier: gocui.ModNone, Handler: listContext.handlePrevLine}, {ViewName: listContext.ViewName, Tag: "navigation", Contexts: []string{listContext.ContextKey}, Key: gocui.MouseWheelUp, Modifier: gocui.ModNone, Handler: listContext.handlePrevLine},
{ViewName: listContext.ViewName, Contexts: []string{listContext.ContextKey}, Key: gui.getKey("universal.nextItem-alt"), Modifier: gocui.ModNone, Handler: listContext.handleNextLine}, {ViewName: listContext.ViewName, Tag: "navigation", Contexts: []string{listContext.ContextKey}, Key: gui.getKey("universal.nextItem-alt"), Modifier: gocui.ModNone, Handler: listContext.handleNextLine},
{ViewName: listContext.ViewName, Contexts: []string{listContext.ContextKey}, Key: gui.getKey("universal.nextItem"), Modifier: gocui.ModNone, Handler: listContext.handleNextLine}, {ViewName: listContext.ViewName, Tag: "navigation", Contexts: []string{listContext.ContextKey}, Key: gui.getKey("universal.nextItem"), Modifier: gocui.ModNone, Handler: listContext.handleNextLine},
{ViewName: listContext.ViewName, Contexts: []string{listContext.ContextKey}, Key: gui.getKey("universal.prevPage"), Modifier: gocui.ModNone, Handler: listContext.handlePrevPage, Description: gui.Tr.SLocalize("prevPage")}, {ViewName: listContext.ViewName, Tag: "navigation", Contexts: []string{listContext.ContextKey}, Key: gui.getKey("universal.prevPage"), Modifier: gocui.ModNone, Handler: listContext.handlePrevPage, Description: gui.Tr.SLocalize("prevPage")},
{ViewName: listContext.ViewName, Contexts: []string{listContext.ContextKey}, Key: gui.getKey("universal.nextPage"), Modifier: gocui.ModNone, Handler: listContext.handleNextPage, Description: gui.Tr.SLocalize("nextPage")}, {ViewName: listContext.ViewName, Tag: "navigation", Contexts: []string{listContext.ContextKey}, Key: gui.getKey("universal.nextPage"), Modifier: gocui.ModNone, Handler: listContext.handleNextPage, Description: gui.Tr.SLocalize("nextPage")},
{ViewName: listContext.ViewName, Contexts: []string{listContext.ContextKey}, Key: gui.getKey("universal.gotoTop"), Modifier: gocui.ModNone, Handler: listContext.handleGotoTop, Description: gui.Tr.SLocalize("gotoTop")}, {ViewName: listContext.ViewName, Tag: "navigation", Contexts: []string{listContext.ContextKey}, Key: gui.getKey("universal.gotoTop"), Modifier: gocui.ModNone, Handler: listContext.handleGotoTop, Description: gui.Tr.SLocalize("gotoTop")},
{ViewName: listContext.ViewName, Contexts: []string{listContext.ContextKey}, Key: gocui.MouseWheelDown, Modifier: gocui.ModNone, Handler: listContext.handleNextLine}, {ViewName: listContext.ViewName, Tag: "navigation", Contexts: []string{listContext.ContextKey}, Key: gocui.MouseWheelDown, Modifier: gocui.ModNone, Handler: listContext.handleNextLine},
{ViewName: listContext.ViewName, Contexts: []string{listContext.ContextKey}, Key: gocui.MouseLeft, Modifier: gocui.ModNone, Handler: listContext.handleClick}, {ViewName: listContext.ViewName, Contexts: []string{listContext.ContextKey}, Key: gocui.MouseLeft, Modifier: gocui.ModNone, Handler: listContext.handleClick},
}...) }...)
@ -537,6 +537,7 @@ func (gui *Gui) getListContextKeyBindings() []*Binding {
Key: gui.getKey("universal.startSearch"), Key: gui.getKey("universal.startSearch"),
Handler: openSearchHandler, Handler: openSearchHandler,
Description: gui.Tr.SLocalize("startSearch"), Description: gui.Tr.SLocalize("startSearch"),
Tag: "navigation",
}, },
{ {
ViewName: listContext.ViewName, ViewName: listContext.ViewName,
@ -544,6 +545,7 @@ func (gui *Gui) getListContextKeyBindings() []*Binding {
Key: gui.getKey("universal.gotoBottom"), Key: gui.getKey("universal.gotoBottom"),
Handler: gotoBottomHandler, Handler: gotoBottomHandler,
Description: gui.Tr.SLocalize("gotoBottom"), Description: gui.Tr.SLocalize("gotoBottom"),
Tag: "navigation",
}, },
}...) }...)
} }

10
pkg/i18n/dutch.go
View file

@ -572,7 +572,7 @@ func addDutch(i18nObject *i18n.Bundle) error {
ID: "CommitMessageTitle", ID: "CommitMessageTitle",
Other: "Commit Bericht", Other: "Commit Bericht",
}, &i18n.Message{ }, &i18n.Message{
ID: "Local-BranchesTitle", ID: "LocalBranchesTitle",
Other: "Branches Tab", Other: "Branches Tab",
}, &i18n.Message{ }, &i18n.Message{
ID: "SearchTitle", ID: "SearchTitle",
@ -581,7 +581,7 @@ func addDutch(i18nObject *i18n.Bundle) error {
ID: "TagsTitle", ID: "TagsTitle",
Other: "Tags Tab", Other: "Tags Tab",
}, &i18n.Message{ }, &i18n.Message{
ID: "Branch-CommitsTitle", ID: "BranchCommitsTitle",
Other: "Commits Tab", Other: "Commits Tab",
}, &i18n.Message{ }, &i18n.Message{
ID: "MenuTitle", ID: "MenuTitle",
@ -593,10 +593,10 @@ func addDutch(i18nObject *i18n.Bundle) error {
ID: "CredentialsTitle", ID: "CredentialsTitle",
Other: "Credentials", Other: "Credentials",
}, &i18n.Message{ }, &i18n.Message{
ID: "Remote-BranchesTitle", ID: "RemoteBranchesTitle",
Other: "Remote Branches (in Remotes tab)", Other: "Remote Branches (in Remotes tab)",
}, &i18n.Message{ }, &i18n.Message{
ID: "Patch-BuildingTitle", ID: "PatchBuildingTitle",
Other: "Patch Bouwen", Other: "Patch Bouwen",
}, &i18n.Message{ }, &i18n.Message{
ID: "InformationTitle", ID: "InformationTitle",
@ -605,7 +605,7 @@ func addDutch(i18nObject *i18n.Bundle) error {
ID: "SecondaryTitle", ID: "SecondaryTitle",
Other: "Secondary", Other: "Secondary",
}, &i18n.Message{ }, &i18n.Message{
ID: "Reflog-CommitsTitle", ID: "ReflogCommitsTitle",
Other: "Reflog Tab", Other: "Reflog Tab",
}, &i18n.Message{ }, &i18n.Message{
ID: "Title", ID: "Title",

19
pkg/i18n/english.go
View file

@ -580,7 +580,7 @@ func addEnglish(i18nObject *i18n.Bundle) error {
ID: "CommitMessageTitle", ID: "CommitMessageTitle",
Other: "Commit Message", Other: "Commit Message",
}, &i18n.Message{ }, &i18n.Message{
ID: "Local-BranchesTitle", ID: "LocalBranchesTitle",
Other: "Branches Tab", Other: "Branches Tab",
}, &i18n.Message{ }, &i18n.Message{
ID: "SearchTitle", ID: "SearchTitle",
@ -589,7 +589,7 @@ func addEnglish(i18nObject *i18n.Bundle) error {
ID: "TagsTitle", ID: "TagsTitle",
Other: "Tags Tab", Other: "Tags Tab",
}, &i18n.Message{ }, &i18n.Message{
ID: "Branch-CommitsTitle", ID: "BranchCommitsTitle",
Other: "Commits Tab", Other: "Commits Tab",
}, &i18n.Message{ }, &i18n.Message{
ID: "MenuTitle", ID: "MenuTitle",
@ -601,10 +601,10 @@ func addEnglish(i18nObject *i18n.Bundle) error {
ID: "CredentialsTitle", ID: "CredentialsTitle",
Other: "Credentials", Other: "Credentials",
}, &i18n.Message{ }, &i18n.Message{
ID: "Remote-BranchesTitle", ID: "RemoteBranchesTitle",
Other: "Remote Branches (in Remotes tab)", Other: "Remote Branches (in Remotes tab)",
}, &i18n.Message{ }, &i18n.Message{
ID: "Patch-BuildingTitle", ID: "PatchBuildingTitle",
Other: "Patch Building", Other: "Patch Building",
}, &i18n.Message{ }, &i18n.Message{
ID: "InformationTitle", ID: "InformationTitle",
@ -613,7 +613,7 @@ func addEnglish(i18nObject *i18n.Bundle) error {
ID: "SecondaryTitle", ID: "SecondaryTitle",
Other: "Secondary", Other: "Secondary",
}, &i18n.Message{ }, &i18n.Message{
ID: "Reflog-CommitsTitle", ID: "ReflogCommitsTitle",
Other: "Reflog Tab", Other: "Reflog Tab",
}, &i18n.Message{ }, &i18n.Message{
ID: "Title", ID: "Title",
@ -1272,6 +1272,15 @@ func addEnglish(i18nObject *i18n.Bundle) error {
}, &i18n.Message{ }, &i18n.Message{
ID: "runningCommand", ID: "runningCommand",
Other: "running command", Other: "running command",
}, &i18n.Message{
ID: "SubCommitsTitle",
Other: "Sub-commits",
}, &i18n.Message{
ID: "SubmodulesTitle",
Other: "Submodules",
}, &i18n.Message{
ID: "NavigationTitle",
Other: "List Panel Navigation",
}, },
) )
} }

46
scripts/generate_cheatsheet.go
View file

@ -72,13 +72,31 @@ func getBindingSections(mApp *app.App) []*bindingSection {
bindings := mApp.Gui.GetInitialKeybindings() bindings := mApp.Gui.GetInitialKeybindings()
type contextAndViewType struct { type contextAndViewType struct {
context string subtitle string
viewName string title string
} }
contextAndViewBindingMap := map[contextAndViewType][]*gui.Binding{} contextAndViewBindingMap := map[contextAndViewType][]*gui.Binding{}
outer:
for _, binding := range bindings { for _, binding := range bindings {
if binding.Tag == "navigation" {
key := contextAndViewType{subtitle: "", title: "navigation"}
existing := contextAndViewBindingMap[key]
if existing == nil {
contextAndViewBindingMap[key] = []*gui.Binding{binding}
} else {
for _, navBinding := range contextAndViewBindingMap[key] {
if navBinding.Description == binding.Description {
continue outer
}
}
contextAndViewBindingMap[key] = append(contextAndViewBindingMap[key], binding)
}
continue outer
}
contexts := []string{} contexts := []string{}
if len(binding.Contexts) == 0 { if len(binding.Contexts) == 0 {
contexts = append(contexts, "") contexts = append(contexts, "")
@ -87,7 +105,7 @@ func getBindingSections(mApp *app.App) []*bindingSection {
} }
for _, context := range contexts { for _, context := range contexts {
key := contextAndViewType{context: context, viewName: binding.ViewName} key := contextAndViewType{subtitle: context, title: binding.ViewName}
existing := contextAndViewBindingMap[key] existing := contextAndViewBindingMap[key]
if existing == nil { if existing == nil {
contextAndViewBindingMap[key] = []*gui.Binding{binding} contextAndViewBindingMap[key] = []*gui.Binding{binding}
@ -111,33 +129,39 @@ func getBindingSections(mApp *app.App) []*bindingSection {
sort.Slice(groupedBindings, func(i, j int) bool { sort.Slice(groupedBindings, func(i, j int) bool {
first := groupedBindings[i].contextAndView first := groupedBindings[i].contextAndView
second := groupedBindings[j].contextAndView second := groupedBindings[j].contextAndView
if first.viewName == "" { if first.title == "" {
return true return true
} }
if second.viewName == "" { if second.title == "" {
return false return false
} }
return first.viewName < second.viewName || (first.viewName == second.viewName && first.context < second.context) if first.title == "navigation" {
return true
}
if second.title == "navigation" {
return false
}
return first.title < second.title || (first.title == second.title && first.subtitle < second.subtitle)
}) })
for _, group := range groupedBindings { for _, group := range groupedBindings {
contextAndView := group.contextAndView contextAndView := group.contextAndView
contextBindings := group.bindings contextBindings := group.bindings
mApp.Log.Info("viewname: " + contextAndView.viewName + ", context: " + contextAndView.context) mApp.Log.Info("viewname: " + contextAndView.title + ", context: " + contextAndView.subtitle)
viewName := contextAndView.viewName viewName := contextAndView.title
if viewName == "" { if viewName == "" {
viewName = "global" viewName = "global"
} }
translatedView := localisedTitle(mApp, viewName) translatedView := localisedTitle(mApp, viewName)
var title string var title string
if contextAndView.context == "" { if contextAndView.subtitle == "" {
addendum := " " + mApp.Tr.SLocalize("Panel") addendum := " " + mApp.Tr.SLocalize("Panel")
if viewName == "global" { if viewName == "global" || viewName == "navigation" {
addendum = "" addendum = ""
} }
title = fmt.Sprintf("%s%s", translatedView, addendum) title = fmt.Sprintf("%s%s", translatedView, addendum)
} else { } else {
translatedContextName := localisedTitle(mApp, contextAndView.context) translatedContextName := localisedTitle(mApp, contextAndView.subtitle)
title = fmt.Sprintf("%s %s (%s)", translatedView, mApp.Tr.SLocalize("Panel"), translatedContextName) title = fmt.Sprintf("%s %s (%s)", translatedView, mApp.Tr.SLocalize("Panel"), translatedContextName)
} }