diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2024-01-04 13:17:45 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2024-01-28 08:12:01 +1100 |
| commit | 0aa6109d4d767cf77d4fb3eeefd0ac477d718ccf (patch) | |
| tree | 57f329144b24ff1bfd67a3c82c7c192b175e9c3c | |
| parent | cb1b13e95e09232cced846d167dae6cb21ba696e (diff) | |
Render keybinding cheatsheet as markdown table
We're going to be adding tooltips to the cheatsheet to better explain what each actions
does. As such, we're switching to a table format rather than a list.
I'm also changing how the keys are represented, using a markdown approach rather than
an html approach
| -rw-r--r-- | docs/keybindings/Keybindings_en.md | 581 | ||||
| -rw-r--r-- | docs/keybindings/Keybindings_ja.md | 581 | ||||
| -rw-r--r-- | docs/keybindings/Keybindings_ko.md | 581 | ||||
| -rw-r--r-- | docs/keybindings/Keybindings_nl.md | 581 | ||||
| -rw-r--r-- | docs/keybindings/Keybindings_pl.md | 581 | ||||
| -rw-r--r-- | docs/keybindings/Keybindings_ru.md | 581 | ||||
| -rw-r--r-- | docs/keybindings/Keybindings_zh-CN.md | 581 | ||||
| -rw-r--r-- | docs/keybindings/Keybindings_zh-TW.md | 581 | ||||
| -rw-r--r-- | pkg/cheatsheet/generate.go | 21 |
9 files changed, 2336 insertions, 2333 deletions
diff --git a/docs/keybindings/Keybindings_en.md b/docs/keybindings/Keybindings_en.md index be109f5ca..3417b9f19 100644 --- a/docs/keybindings/Keybindings_en.md +++ b/docs/keybindings/Keybindings_en.md @@ -6,356 +6,357 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ ## Global keybindings -<pre> - <kbd><c-r></kbd>: Switch to a recent repo - <kbd><pgup></kbd>: Scroll up main panel (fn+up/shift+k) - <kbd><pgdown></kbd>: Scroll down main panel (fn+down/shift+j) - <kbd>@</kbd>: Open command log menu - <kbd>}</kbd>: Increase the size of the context shown around changes in the diff view - <kbd>{</kbd>: Decrease the size of the context shown around changes in the diff view - <kbd>:</kbd>: Execute custom command - <kbd><c-p></kbd>: View custom patch options - <kbd>m</kbd>: View merge/rebase options - <kbd>R</kbd>: Refresh - <kbd>+</kbd>: Next screen mode (normal/half/fullscreen) - <kbd>_</kbd>: Prev screen mode - <kbd>?</kbd>: Open menu - <kbd><c-s></kbd>: View filter-by-path options - <kbd>W</kbd>: Open diff menu - <kbd><c-e></kbd>: Open diff menu - <kbd><c-w></kbd>: Toggle whether or not whitespace changes are shown in the diff view - <kbd>z</kbd>: Undo - <kbd><c-z></kbd>: Redo - <kbd>P</kbd>: Push - <kbd>p</kbd>: Pull -</pre> +| Key | Action | Info | +|-----|--------|-------------| +| `` <c-r> `` | Switch to a recent repo | | +| `` <pgup> (fn+up/shift+k) `` | Scroll up main panel | | +| `` <pgdown> (fn+down/shift+j) `` | Scroll down main panel | | +| `` @ `` | Open command log menu | | +| `` } `` | Increase the size of the context shown around changes in the diff view | | +| `` { `` | Decrease the size of the context shown around changes in the diff view | | +| `` : `` | Execute custom command | | +| `` <c-p> `` | View custom patch options | | +| `` m `` | View merge/rebase options | | +| `` R `` | Refresh | | +| `` + `` | Next screen mode (normal/half/fullscreen) | | +| `` _ `` | Prev screen mode | | +| `` ? `` | Open menu | | +| `` <c-s> `` | View filter-by-path options | | +| `` W `` | Open diff menu | | +| `` <c-e> `` | Open diff menu | | +| `` <c-w> `` | Toggle whether or not whitespace changes are shown in the diff view | | +| `` z `` | Undo | The reflog will be used to determine what git command to run to undo the last git command. This does not include changes to the working tree; only commits are taken into consideration. | +| `` <c-z> `` | Redo | The reflog will be used to determine what git command to run to redo the last git command. This does not include changes to the working tree; only commits are taken into consideration. | +| `` P `` | Push | | +| `` p `` | Pull | | ## List panel navigation -<pre> - <kbd>,</kbd>: Previous page - <kbd>.</kbd>: Next page - <kbd><</kbd>: Scroll to top - <kbd>></kbd>: Scroll to bottom - <kbd>v</kbd>: Toggle range select - <kbd><s-down></kbd>: Range select down - <kbd><s-up></kbd>: Range select up - <kbd>/</kbd>: Search the current view by text - <kbd>H</kbd>: Scroll left - <kbd>L</kbd>: Scroll right - <kbd>]</kbd>: Next tab - <kbd>[</kbd>: Previous tab -</pre> +| Key | Action | Info | +|-----|--------|-------------| +| `` , `` | Previous page | | +| `` . `` | Next page | | +| `` < `` | Scroll to top | | +| `` > `` | Scroll to bottom | | +| `` v `` | Toggle range select | | +| `` <s-down> `` | Range select down | | +| `` <s-up> `` | Range select up | | +| `` / `` | Search the current view by text | | +| `` H `` | Scroll left | | +| `` L `` | Scroll right | | +| `` ] `` | Next tab | | +| `` [ `` | Previous tab | | ## Commit files -<pre> - <kbd><c-o></kbd>: Copy the committed file name to the clipboard - <kbd>c</kbd>: Checkout file - <kbd>d</kbd>: Discard this commit's changes to this file - <kbd>o</kbd>: Open file - <kbd>e</kbd>: Edit file - <kbd><c-t></kbd>: Open external diff tool (git difftool) - <kbd><space></kbd>: Toggle file included in patch - <kbd>a</kbd>: Toggle all files included in patch - <kbd><enter></kbd>: Enter file to add selected lines to the patch (or toggle directory collapsed) - <kbd>`</kbd>: Toggle file tree view - <kbd>/</kbd>: Search the current view by text -</pre> +| Key | Action | Info | +|-----|--------|-------------| +| `` <c-o> `` | Copy the committed file name to the clipboard | | +| `` c `` | Checkout file | | +| `` d `` | Discard this commit's changes to this file | | +| `` o `` | Open file | | +| `` e `` | Edit file | | +| `` <c-t> `` | Open external diff tool (git difftool) | | +| `` <space> `` | Toggle file included in patch | | +| `` a `` | Toggle all files included in patch | | +| `` <enter> `` | Enter file to add selected lines to the patch (or toggle directory collapsed) | | +| `` ` `` | Toggle file tree view | | +| `` / `` | Search the current view by text | | ## Commit summary -<pre> - <kbd><enter></kbd>: Confirm - <kbd><esc></kbd>: Close -</pre> +| Key | Action | Info | +|-----|--------|-------------| +| `` <enter> `` | Confirm | | +| `` <esc> `` | Close | | ## Commits -<pre> - <kbd><c-o></kbd>: Copy commit SHA to clipboard - <kbd><c-r></kbd>: Reset cherry-picked (copied) commits selection - <kbd>b</kbd>: View bisect options - <kbd>s</kbd>: Squash down - <kbd>f</kbd>: Fixup commit - <kbd>r</kbd>: Reword commit - <kbd>R</kbd>: Reword commit with editor - <kbd>d</kbd>: Delete commit - <kbd>e</kbd>: Edit commit - <kbd>i</kbd>: Start interactive rebase - <kbd>p</kbd>: Pick commit (when mid-rebase) - <kbd>F</kbd>: Create fixup commit for this commit - <kbd>S</kbd>: Squash all 'fixup!' commits above selected commit (autosquash) - <kbd><c-j></kbd>: Move commit down one - <kbd><c-k></kbd>: Move commit up one - <kbd>V</kbd>: Paste commits (cherry-pick) - <kbd>B</kbd>: Mark commit as base commit for rebase - <kbd>A</kbd>: Amend commit with staged changes - <kbd>a</kbd>: Set/Reset commit author - <kbd>t</kbd>: Revert commit - <kbd>T</kbd>: Tag commit - <kbd><c-l></kbd>: Open log menu - <kbd>w</kbd>: View worktree options - <kbd><space></kbd>: Checkout commit - <kbd>y</kbd>: Copy commit attribute - <kbd>o</kbd>: Open commit in browser - <kbd>n</kbd>: Create new branch off of commit - <kbd>g</kbd>: View reset options - <kbd>C</kbd>: Copy commit (cherry-pick) - <kbd><c-t></kbd>: Open external diff tool (git difftool) - <kbd><enter></kbd>: View selected item's files - <kbd>/</kbd>: Search the current view by text -</pre> +| Key | Action | Info | +|-----|--------|-------------| +| `` <c-o> `` | Copy commit SHA to clipboard | | +| `` <c-r> `` | Reset cherry-picked (copied) commits selection | | +| `` b `` | View bisect options | | +| `` s `` | Squash down | | +| `` f `` | Fixup commit | | +| `` r `` | Reword commit | | +| `` R `` | Reword commit with editor | | +| `` d `` | Delete commit | | +| `` e `` | Edit commit | | +| `` i `` | Start interactive rebase | Start an interactive rebase for the commits on your branch. This will include all commits from the HEAD commit down to the first merge commit or main branch commit. +If you would instead like to start an interactive rebase from the selected commit, press `e`. | +| `` p `` | Pick commit (when mid-rebase) | | +| `` F `` | Create fixup commit for this commit | | +| `` S `` | Squash all 'fixup!' commits above selected commit (autosquash) | | +| `` <c-j> `` | Move commit down one | | +| `` <c-k> `` | Move commit up one | | +| `` V `` | Paste commits (cherry-pick) | | +| `` B `` | Mark commit as base commit for rebase | Select a base commit for the next rebase; this will effectively perform a 'git rebase --onto'. | +| `` A `` | Amend commit with staged changes | | +| `` a `` | Set/Reset commit author | | +| `` t `` | Revert commit | | +| `` T `` | Tag commit | | +| `` <c-l> `` | Open log menu | | +| `` w `` | View worktree options | | +| `` <space> `` | Checkout commit | | +| `` y `` | Copy commit attribute | | +| `` o `` | Open commit in browser | | +| `` n `` | Create new branch off of commit | | +| `` g `` | View reset options | | +| `` C `` | Copy commit (cherry-pick) | | +| `` <c-t> `` | Open external diff tool (git difftool) | | +| `` <enter> `` | View selected item's files | | +| `` / `` | Search the current view by text | | ## Confirmation panel -<pre> - <kbd><enter></kbd>: Confirm - <kbd><esc></kbd>: Close/Cancel -</pre> +| Key | Action | Info | +|-----|--------|-------------| +| `` <enter> `` | Confirm | | +| `` <esc> `` | Close/Cancel | | ## Files -<pre> - <kbd><c-o></kbd>: Copy the file name to the clipboard - <kbd><space></kbd>: Toggle staged - <kbd><c-b></kbd>: Filter files by status - <kbd>y</kbd>: Copy to clipboard - <kbd>c</kbd>: Commit changes - <kbd>w</kbd>: Commit changes without pre-commit hook - <kbd>A</kbd>: Amend last commit - <kbd>C</kbd>: Commit changes using git editor - <kbd><c-f></kbd>: Find base commit for fixup - <kbd>e</kbd>: Edit file - <kbd>o</kbd>: Open file - <kbd>i</kbd>: Ignore or exclude file - <kbd>r</kbd>: Refresh files - <kbd>s</kbd>: Stash all changes - <kbd>S</kbd>: View stash options - <kbd>a</kbd>: Stage/unstage all - <kbd><enter></kbd>: Stage individual hunks/lines for file, or collapse/expand for directory - <kbd>d</kbd>: View 'discard changes' options - <kbd>g</kbd>: View upstream reset options - <kbd>D</kbd>: View reset options - <kbd>`</kbd>: Toggle file tree view - <kbd><c-t></kbd>: Open external diff tool (git difftool) - <kbd>M</kbd>: Open external merge tool (git mergetool) - <kbd>f</kbd>: Fetch - <kbd>/</kbd>: Search the current view by text -</pre> +| Key | Action | Info | +|-----|--------|-------------| +| `` <c-o> `` | Copy the file name to the clipboard | | +| `` <space> `` | Toggle staged | | +| `` <c-b> `` | Filter files by status | | +| `` y `` | Copy to clipboard | | +| `` c `` | Commit changes | | +| `` w `` | Commit changes without pre-commit hook | | +| `` A `` | Amend last commit | | +| `` C `` | Commit changes using git editor | | +| `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> | +| `` e `` | Edit file | | +| `` o `` | Open file | | +| `` i `` | Ignore or exclude file | | +| `` r `` | Refresh files | | +| `` s `` | Stash all changes | | +| `` S `` | View stash options | | +| `` a `` | Stage/unstage all | | +| `` <enter> `` | Stage individual hunks/lines for file, or collapse/expand for directory | | +| `` d `` | View 'discard changes' options | | +| `` g `` | View upstream reset options | | +| `` D `` | View reset options | | +| `` ` `` | Toggle file tree view | | +| `` <c-t> `` | Open external diff tool (git difftool) | | +| `` M `` | Open external merge tool (git mergetool) | | +| `` f `` | Fetch | | +| `` / `` | Search the current view by text | | ## Local branches -<pre> - <kbd><c-o></kbd>: Copy branch name to clipboard - <kbd>i</kbd>: Show git-flow options - <kbd><space></kbd>: Checkout - <kbd>n</kbd>: New branch - <kbd>o</kbd>: Create pull request - <kbd>O</kbd>: Create pull request options - <kbd><c-y></kbd>: Copy pull request URL to clipboard - <kbd>c</kbd>: Checkout by name, enter '-' to switch to last - <kbd>F</kbd>: Force checkout - <kbd>d</kbd>: View delete options - <kbd>r</kbd>: Rebase checked-out branch onto this branch - <kbd>M</kbd>: Merge into currently checked out branch - <kbd>f</kbd>: Fast-forward this branch from its upstream - <kbd>T</kbd>: Create tag - <kbd>s</kbd>: Sort order - <kbd>g</kbd>: View reset options - <kbd>R</kbd>: Rename branch - <kbd>u</kbd>: View upstream options - <kbd>w</kbd>: View worktree options - <kbd><enter></kbd>: View commits - <kbd>/</kbd>: Filter the current view by text -</pre> +| Key | Action | Info | +|-----|--------|-------------| +| `` <c-o> `` | Copy branch name to clipboard | | +| `` i `` | Show git-flow options | | +| `` <space> `` | Checkout | | +| `` n `` | New branch | | +| `` o `` | Create pull request | | +| `` O `` | Create pull request options | | +| `` <c-y> `` | Copy pull request URL to clipboard | | +| `` c `` | Checkout by name, enter '-' to switch to last | | +| `` F `` | Force checkout | | +| `` d `` | View delete options | | +| `` r `` | Rebase checked-out branch onto this branch | | +| `` M `` | Merge into currently checked out branch | | +| `` f `` | Fast-forward this branch from its upstream | | +| `` T `` | Create tag | | +| `` s `` | Sort order | | +| `` g `` | View reset options | | +| `` R `` | Rename branch | | +| `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream | +| `` w `` | View worktree options | | +| `` <enter> `` | View commits | | +| `` / `` | Filter the current view by text | | ## Main panel (merging) -<pre> - <kbd>e</kbd>: Edit file - <kbd>o</kbd>: Open file - <kbd><left></kbd>: Select previous conflict - <kbd><right></kbd>: Select next conflict - <kbd><up></kbd>: Select previous hunk - <kbd><down></kbd>: Select next hunk - <kbd>z</kbd>: Undo - <kbd>M</kbd>: Open external merge tool (git mergetool) - <kbd><space></kbd>: Pick hunk - <kbd>b</kbd>: Pick all hunks - <kbd><esc></kbd>: Return to files panel -</pre> +| Key | Action | Info | +|-----|--------|-------------| +| `` e `` | Edit file | | +| `` o `` | Open file | | +| `` <left> `` | Select previous conflict | | +| `` <right> `` | Select next conflict | | +| `` <up> `` | Select previous hunk | | +| `` <down> `` | Select next hunk | | +| `` z `` | Undo | | +| `` M `` | Open external merge tool (git mergetool) | | +| `` <space> `` | Pick hunk | | +| `` b `` | Pick all hunks | | +| `` <esc> `` | Return to files panel | | ## Main panel (normal) -<pre> - <kbd>mouse wheel down</kbd>: Scroll down (fn+up) - <kbd>mouse wheel up</kbd>: Scroll up (fn+down) -</pre> +| Key | Action | Info | +|-----|--------|-------------| +| `` mouse wheel down (fn+up) `` | Scroll down | | +| `` mouse wheel up (fn+down) `` | Scroll up | | ## Main panel (patch building) -<pre> - <kbd><left></kbd>: Select previous hunk - <kbd><right></kbd>: Select next hunk - <kbd>v</kbd>: Toggle range select - <kbd>a</kbd>: Toggle select hunk - <kbd><c-o></kbd>: Copy the selected text to the clipboard - <kbd>o</kbd>: Open file - <kbd>e</kbd>: Edit file - <kbd><space></kbd>: Add/Remove line(s) to patch - <kbd><esc></kbd>: Exit custom patch builder - <kbd>/</kbd>: Search the current view by text -</pre> +| Key | Action | Info | +|-----|--------|-------------| +| `` <left> `` | Select previous hunk | | +| `` <right> `` | Select next hunk | | +| `` v `` | Toggle range select | | +| `` a `` | Toggle select hunk | | +| `` <c-o> `` | Copy the selected text to the clipboard | | +| `` o `` | Open file | | +| `` e `` | Edit file | | +| `` <space> `` | Add/Remove line(s) to patch | | +| `` <esc> `` | Exit custom patch builder | | +| `` / `` | Search the current view by text | | ## Main panel (staging) -<pre> - <kbd><left></kbd>: Select previous hunk - <kbd><right></kbd>: Select next hunk - <kbd>v</kbd>: Toggle range select - <kbd>a</kbd>: Toggle select hunk - <kbd><c-o></kbd>: Copy the selected text to the clipboard - <kbd>o</kbd>: Open file - <kbd>e</kbd>: Edit file - <kbd><esc></kbd>: Return to files panel - <kbd><tab></kbd>: Switch to other panel (staged/unstaged changes) - <kbd><space></kbd>: Toggle line staged / unstaged - <kbd>d</kbd>: Discard change (git reset) - <kbd>E</kbd>: Edit hunk - <kbd>c</kbd>: Commit changes - <kbd>w</kbd>: Commit changes without pre-commit hook - <kbd>C</kbd>: Commit changes using git editor - <kbd>/</kbd>: Search the current view by text -</pre> +| Key | Action | Info | +|-----|--------|-------------| +| `` <left> `` | Select previous hunk | | +| `` <right> `` | Select next hunk | | +| `` v `` | Toggle range select | | +| `` a `` | Toggle select hunk | | +| `` <c-o> `` | Copy the selected text to the clipboard | | +| `` o `` | Open file | | +| `` e `` | Edit file | | +| `` <esc> `` | Return to files panel | | +| `` <tab> `` | Switch to other panel (staged/unstaged changes) | | +| `` <space> `` | Toggle line staged / unstaged | | +| `` d `` | Discard change (git reset) | | +| `` E `` | Edit hunk | | +| `` c `` | Commit changes | | +| `` w `` | Commit changes without pre-commit hook | | +| `` C `` | Commit changes using git editor | | +| `` / `` | Search the current view by text | | ## Menu -<pre> - <kbd><enter></kbd>: Execute - <kbd><esc></kbd>: Close - <kbd>/</kbd>: Filter the current view by text -</pre> +| Key | Action | Info | +|-----|--------|-------------| +| `` <enter> `` | Execute | | +| `` <esc> `` | Close | | +| `` / `` | Filter the current view by text | | ## Reflog -<pre> - <kbd><c-o></kbd>: Copy commit SHA to clipboard - <kbd>w</kbd>: View worktree options - <kbd><space></kbd>: Checkout commit - <kbd>y</kbd>: Copy commit attribute - <kbd>o</kbd>: Open commit in browser - <kbd>n</kbd>: Create new branch off of commit - <kbd>g</kbd>: View reset options - <kbd>C</kbd>: Copy commit (cherry-pick) - <kbd><c-r></kbd>: Reset cherry-picked (copied) commits selection - <kbd><c-t></kbd>: Open external diff tool (git difftool) - <kbd><enter></kbd>: View commits - <kbd>/</kbd>: Filter the current view by text -</pre> +| Key | Action | Info | +|-----|--------|-------------| +| `` <c-o> `` | Copy commit SHA to clipboard | | +| `` w `` | View worktree options | | +| `` <space> `` | Checkout commit | | +| `` y `` | Copy commit attribute | | +| `` o `` | Open commit in browser | | +| `` n `` | Create new branch off of commit | | +| `` g `` | View reset options | | +| `` C `` | Copy commit (cherry-pick) | | +| `` <c-r> `` | Reset cherry-picked (copied) commits selection | | +| `` <c-t> `` | Open external diff tool (git difftool) | | +| `` <enter> `` | View commits | | +| `` / `` | Filter the current view by text | | ## Remote branches -<pre> - <kbd><c-o></kbd>: Copy branch name to clipboard - <kbd><space></kbd>: Checkout - <kbd>n</kbd>: New branch - <kbd>M</kbd>: Merge into currently checked out branch - <kbd>r</kbd>: Rebase checked-out branch onto this branch - <kbd>d</kbd>: Delete remote tag - <kbd>u</kbd>: Set as upstream of checked-out branch - <kbd>s</kbd>: Sort order - <kbd>g</kbd>: View reset options - <kbd>w</kbd>: View worktree options - <kbd><enter></kbd>: View commits - <kbd>/</kbd>: Filter the current view by text -</pre> +| Key | Action | Info | +|-----|--------|-------------| +| `` <c-o> `` | Copy branch name to clipboard | | +| `` <space> `` | Checkout | | +| `` n `` | New branch | | +| `` M `` | Merge into currently checked out branch | | +| `` r `` | Rebase checked-out branch onto this branch | | +| `` d `` | Delete remote tag | | +| `` u `` | Set as upstream of checked-out branch | | +| `` s `` | Sort order | | +| `` g `` | View reset options | | +| `` w `` | View worktree options | | +| `` <enter> `` | View commits | | +| `` / `` | Filter the current view by text | | ## Remotes -<pre> - <kbd>f</kbd>: Fetch remote - <kbd>n</kbd>: Add new remote - <kbd>d</kbd>: Remove remote - <kbd>e</kbd>: Edit remote - <kbd>/</kbd>: Filter the current view by text -</pre> +| Key | Action | Info | +|-----|--------|-------------| +| `` f `` | Fetch remote | | +| `` n `` | Add new remote | | +| `` d `` | Remove remote | | +| `` e `` | Edit remote | | +| `` / `` | Filter the current view by text | | ## Stash -<pre> - <kbd><space></kbd>: Apply - <kbd>g</kbd>: Pop - <kbd>d</kbd>: Drop - <kbd>n</kbd>: New branch - <kbd>r</kbd>: Rename stash - <kbd>w</kbd>: View worktree options - <kbd><enter></kbd>: View selected item's files - <kbd>/</kbd>: Filter the current view by text -</pre> +| Key | Action | Info | +|-----|--------|-------------| +| `` <space> `` | Apply | | +| `` g `` | Pop | | +| `` d `` | Drop | | +| `` n `` | New branch | | +| `` r `` | Rename stash | | +| `` w `` | View worktree options | | +| `` <enter> `` | View selected item's files | | +| `` / `` | Filter the current view by text | | ## Status -<pre> - <kbd>o</kbd>: Open config file - <kbd>e</kbd>: Edit config file - <kbd>u</kbd>: Check for update - <kbd><enter></kbd>: Switch to a recent repo - <kbd>a</kbd>: Show all branch logs -</pre> +| Key | Action | Info | +|-----|--------|-------------| +| `` o `` | Open config file | | +| `` e `` | Edit config file | | +| `` u `` | Check for update | | +| `` <enter> `` | Switch to a recent repo | | +| `` a `` | Show all branch logs | | ## Sub-commits -<pre> - <kbd><c-o></kbd>: Copy commit SHA to clipboard - <kbd>w</kbd>: View worktree options - <kbd><space></kbd>: Checkout commit - <kbd>y</kbd>: Copy commit attribute - <kbd>o</kbd>: Open commit in browser - <kbd>n</kbd>: Create new branch off of commit - <kbd>g</kbd>: View reset options - <kbd>C</kbd>: Copy commit (cherry-pick) - <kbd><c-r></kbd>: Reset cherry-picked (copied) commits selection - <kbd><c-t></kbd>: Open external diff tool (git difftool) - <kbd><enter></kbd>: View selected item's files - <kbd>/</kbd>: Search the current view by text -</pre> +| Key | Action | Info | +|-----|--------|-------------| +| `` <c-o> `` | Copy commit SHA to clipboard | | +| `` w `` | View worktree options | | +| `` <space> `` | Checkout commit | | +| `` y `` | Copy commit attribute | | +| `` o `` | Open commit in browser | | +| `` n `` | Create new branch off of commit | | +| `` g `` | View reset options | | +| `` C `` | Copy commit (cherry-pick) | | +| `` <c-r> `` | Reset cherry-picked (copied) commits selection | | +| `` <c-t> `` | Open external diff tool (git difftool) | | +| `` <enter> `` | View selected item's files | | +| `` / `` | Search the current view by text | | ## Submodules -<pre> - <kbd><c-o></kbd>: Copy submodule name to clipboard - <kbd><enter></kbd>: Enter submodule - <kbd><space></kbd>: Enter submodule - <kbd>d</kbd>: Remove submodule - <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 - <kbd>/</kbd>: Filter the current view by text -</pre> +| Key | Action | Info | +|-----|--------|-------------| +| `` <c-o> `` | Copy submodule name to clipboard | | +| `` <enter> `` | Enter submodule | | +| `` <space> `` | Enter submodule | | +| `` d `` | Remove submodule | | +| `` u `` | Update submodule | | +| `` n `` | Add new submodule | | +| `` e `` | Update submodule URL | | +| `` i `` | Initialize submodule | | +| `` b `` | View bulk submodule options | | +| `` / `` | Filter the current view by text | | ## Tags -<pre> - <kbd><space></kbd>: Checkout - <kbd>d</kbd>: View delete options - <kbd>P</kbd>: Push tag - <kbd>n</kbd>: Create tag - <kbd>g</kbd>: View reset options - <kbd>w</kbd>: View worktree options - <kbd><enter></kbd>: View commits - <kbd>/</kbd>: Filter the current view by text -</pre> +| Key | Action | Info | +|-----|--------|-------------| +| `` <space> `` | Checkout | | +| `` d `` | View delete options | | +| `` P `` | Push tag | | +| `` n `` | Create tag | | +| `` g `` | View reset options | | +| `` w `` | View worktree options | | +| `` <enter> `` | View commits | | +| `` / `` | Filter the current view by text | | ## Worktrees -<pre> - <kbd>n</kbd>: Create worktree - <kbd><space></kbd>: Switch to worktree - <kbd><enter></kbd>: Switch to worktree - <kbd>o</kbd>: Open in editor - <kbd>d</kbd>: Remove worktree - <kbd>/</kbd>: Filter the current view by text -</pre> +| Key | Action | Info | +|-----|--------|-------------| +| `` n `` | Create worktree | | +| `` <space> `` | Switch to worktree | | +| `` <enter> `` | Switch to worktree | | +| `` o `` | Open in editor | | +| `` d `` | Remove worktree | | +| `` / `` | Filter the current view by text | | diff --git a/docs/keybindings/Keybindings_ja.md b/docs/keybindings/Keybindings_ja.md index 60193614f..1ea3d9cfd 100644 --- a/docs/keybindings/Keybindings_ja.md +++ b/docs/keybindings/Keybindings_ja.md @@ -6,356 +6,357 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ ## グローバルキーバインド -<pre> - <kbd><c-r></kbd>: 最近使用したリポジトリに切り替え - <kbd><pgup></kbd>: メインパネルを上にスクロール (fn+up/shift+k) - <kbd><pgdown></kbd>: メインパネルを下にスクロール (fn+down/shift+j) - <kbd>@</kbd>: コマンドログメニューを開く - <kbd>}</kbd>: Increase the size of the context shown around changes in the diff view - <kbd>{</kbd>: Decrease the size of the context shown around changes in the diff view - <kbd>:</kbd>: カスタムコマンドを実行 - <kbd><c-p></kbd>: View custom patch options - <kbd>m</kbd>: View merge/rebase options - <kbd>R</kbd>: リフレッシュ - <kbd>+</kbd>: 次のスクリーンモード (normal/half/fullscreen) - <kbd>_</kbd>: 前のスクリーンモード - <kbd>?</kbd>: メニューを開く - <kbd><c-s></kbd>: View filter-by-path options - <kbd>W</kbd>: 差分メニューを開く - <kbd><c-e></kbd>: 差分メニューを開く - <kbd><c-w></kbd>: 空白文字の差分の表示有無を切り替え - <kbd>z</kbd>: アンドゥ (via reflog) (experimental) - <kbd><c-z></kbd>: リドゥ (via reflog) (experimental) - <kbd>P</kbd>: Push - <kbd>p</kbd>: Pull -</pre> +| Key | Action | Info | +|-----|--------|-------------| +| `` <c-r> `` | 最近使用したリポジトリに切り替え | | +| `` <pgup> (fn+up/shift+k) `` | メインパネルを上にスクロール | | +| `` <pgdown> (fn+down/shift+j) `` | メインパネルを下にスクロール | | +| `` @ `` | コマンドログメニューを開く | | +| `` } `` | Increase the size of the context shown around changes in the diff view | | +| `` { `` | Decrease the size of the context shown around changes in the diff view | | +| `` : `` | カスタムコマンドを実行 | | +| `` <c-p> `` | View custom patch options | | +| `` m `` | View merge/rebase options | | +| `` R `` | リフレッシュ | | +| `` + `` | 次のスクリーンモード (normal/half/fullscreen) | | +| `` _ `` | 前のスクリーンモード | | +| `` ? `` | メニューを開く | | +| `` <c-s> `` | View filter-by-path options | | +| `` W `` | 差分メニューを開く | | +| `` <c-e> `` | 差分メニューを開く | | +| `` <c-w> `` | 空白文字の差分の表示有無を切り替え | | +| `` z `` | アンドゥ (via reflog) (experimental) | The reflog will be used to determine what git command to run to undo the last git command. This does not include changes to the working tree; only commits are taken into consideration. | +| `` <c-z> `` | リドゥ (via reflog) (experimental) | The reflog will be used to determine what git command to run to redo the last git command. This does not include changes to the working tree; only commits are taken into consideration. | +| `` P `` | Push | | +| `` p `` | Pull | | ## 一覧パネルの操作 -<pre> - <kbd>,</kbd>: 前のページ - <kbd>.</kbd>: 次のページ - <kbd><</kbd>: 最上部までスクロール - <kbd>></kbd>: 最下部までスクロール - <kbd>v</kbd>: 範囲選択を切り替え - <kbd><s-down></kbd>: Range select down - <kbd><s-up></kbd>: Range select up - <kbd>/</kbd>: 検索を開始 - <kbd>H</kbd>: 左スクロール - <kbd>L</kbd>: 右スクロール - <kbd>]</kbd>: 次のタブ - <kbd>[</kbd>: 前のタブ -</pre> +| Key | Action | Info | +|-----|--------|-------------| +| `` , `` | 前のページ | | +| `` . `` | 次のページ | | +| `` < `` | 最上部までスクロール | | +| `` > `` | 最下部までスクロール | | +| `` v `` | 範囲選択を切り替え | | +| `` <s-down> `` | Range select down | | +| `` <s-up> `` | Range select up | | +| `` / `` | 検索を開始 | | +| `` H `` | 左スクロール | | +| `` L `` | 右スクロール | | +| `` ] `` | 次のタブ | | +| `` [ `` | 前のタブ | | ## Stash -<pre> - <kbd><space></kbd>: 適用 - <kbd>g</kbd>: Pop - <kbd>d</kbd>: Drop - <kbd>n</kbd>: 新しいブランチを作成 - <kbd>r</kbd>: Stashを変更 - <kbd>w</kbd>: View worktree options - <kbd><enter></kbd>: View selected item's files - <kbd>/</kbd>: Filter the current view by text -</pre> +| Key | Action | Info | +|-----|--------|-------------| +| `` <space> `` | 適用 | | +| `` g `` | Pop | | +| `` d `` | Drop | |