1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-13 22:17:05 +02:00

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
This commit is contained in:
Jesse Duffield 2024-01-04 13:17:45 +11:00
parent cb1b13e95e
commit 0aa6109d4d
9 changed files with 2336 additions and 2333 deletions

View File

@ -6,356 +6,357 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
## Global keybindings ## Global keybindings
<pre> | Key | Action | Info |
<kbd>&lt;c-r&gt;</kbd>: Switch to a recent repo |-----|--------|-------------|
<kbd>&lt;pgup&gt;</kbd>: Scroll up main panel (fn+up/shift+k) | `` <c-r> `` | Switch to a recent repo | |
<kbd>&lt;pgdown&gt;</kbd>: Scroll down main panel (fn+down/shift+j) | `` <pgup> (fn+up/shift+k) `` | Scroll up main panel | |
<kbd>@</kbd>: Open command log menu | `` <pgdown> (fn+down/shift+j) `` | Scroll down main panel | |
<kbd>}</kbd>: Increase the size of the context shown around changes in the diff view | `` @ `` | Open command log menu | |
<kbd>{</kbd>: Decrease the size of the context shown around changes in the diff view | `` } `` | Increase the size of the context shown around changes in the diff view | |
<kbd>:</kbd>: Execute custom command | `` { `` | Decrease the size of the context shown around changes in the diff view | |
<kbd>&lt;c-p&gt;</kbd>: View custom patch options | `` : `` | Execute custom command | |
<kbd>m</kbd>: View merge/rebase options | `` <c-p> `` | View custom patch options | |
<kbd>R</kbd>: Refresh | `` m `` | View merge/rebase options | |
<kbd>+</kbd>: Next screen mode (normal/half/fullscreen) | `` R `` | Refresh | |
<kbd>_</kbd>: Prev screen mode | `` + `` | Next screen mode (normal/half/fullscreen) | |
<kbd>?</kbd>: Open menu | `` _ `` | Prev screen mode | |
<kbd>&lt;c-s&gt;</kbd>: View filter-by-path options | `` ? `` | Open menu | |
<kbd>W</kbd>: Open diff menu | `` <c-s> `` | View filter-by-path options | |
<kbd>&lt;c-e&gt;</kbd>: Open diff menu | `` W `` | Open diff menu | |
<kbd>&lt;c-w&gt;</kbd>: Toggle whether or not whitespace changes are shown in the diff view | `` <c-e> `` | Open diff menu | |
<kbd>z</kbd>: Undo | `` <c-w> `` | Toggle whether or not whitespace changes are shown in the diff view | |
<kbd>&lt;c-z&gt;</kbd>: Redo | `` 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. |
<kbd>P</kbd>: Push | `` <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. |
<kbd>p</kbd>: Pull | `` P `` | Push | |
</pre> | `` p `` | Pull | |
## List panel navigation ## List panel navigation
<pre> | Key | Action | Info |
<kbd>,</kbd>: Previous page |-----|--------|-------------|
<kbd>.</kbd>: Next page | `` , `` | Previous page | |
<kbd>&lt;</kbd>: Scroll to top | `` . `` | Next page | |
<kbd>&gt;</kbd>: Scroll to bottom | `` < `` | Scroll to top | |
<kbd>v</kbd>: Toggle range select | `` > `` | Scroll to bottom | |
<kbd>&lt;s-down&gt;</kbd>: Range select down | `` v `` | Toggle range select | |
<kbd>&lt;s-up&gt;</kbd>: Range select up | `` <s-down> `` | Range select down | |
<kbd>/</kbd>: Search the current view by text | `` <s-up> `` | Range select up | |
<kbd>H</kbd>: Scroll left | `` / `` | Search the current view by text | |
<kbd>L</kbd>: Scroll right | `` H `` | Scroll left | |
<kbd>]</kbd>: Next tab | `` L `` | Scroll right | |
<kbd>[</kbd>: Previous tab | `` ] `` | Next tab | |
</pre> | `` [ `` | Previous tab | |
## Commit files ## Commit files
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: Copy the committed file name to the clipboard |-----|--------|-------------|
<kbd>c</kbd>: Checkout file | `` <c-o> `` | Copy the committed file name to the clipboard | |
<kbd>d</kbd>: Discard this commit's changes to this file | `` c `` | Checkout file | |
<kbd>o</kbd>: Open file | `` d `` | Discard this commit's changes to this file | |
<kbd>e</kbd>: Edit file | `` o `` | Open file | |
<kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool) | `` e `` | Edit file | |
<kbd>&lt;space&gt;</kbd>: Toggle file included in patch | `` <c-t> `` | Open external diff tool (git difftool) | |
<kbd>a</kbd>: Toggle all files included in patch | `` <space> `` | Toggle file included in patch | |
<kbd>&lt;enter&gt;</kbd>: Enter file to add selected lines to the patch (or toggle directory collapsed) | `` a `` | Toggle all files included in patch | |
<kbd>`</kbd>: Toggle file tree view | `` <enter> `` | Enter file to add selected lines to the patch (or toggle directory collapsed) | |
<kbd>/</kbd>: Search the current view by text | `` ` `` | Toggle file tree view | |
</pre> | `` / `` | Search the current view by text | |
## Commit summary ## Commit summary
<pre> | Key | Action | Info |
<kbd>&lt;enter&gt;</kbd>: Confirm |-----|--------|-------------|
<kbd>&lt;esc&gt;</kbd>: Close | `` <enter> `` | Confirm | |
</pre> | `` <esc> `` | Close | |
## Commits ## Commits
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: Copy commit SHA to clipboard |-----|--------|-------------|
<kbd>&lt;c-r&gt;</kbd>: Reset cherry-picked (copied) commits selection | `` <c-o> `` | Copy commit SHA to clipboard | |
<kbd>b</kbd>: View bisect options | `` <c-r> `` | Reset cherry-picked (copied) commits selection | |
<kbd>s</kbd>: Squash down | `` b `` | View bisect options | |
<kbd>f</kbd>: Fixup commit | `` s `` | Squash down | |
<kbd>r</kbd>: Reword commit | `` f `` | Fixup commit | |
<kbd>R</kbd>: Reword commit with editor | `` r `` | Reword commit | |
<kbd>d</kbd>: Delete commit | `` R `` | Reword commit with editor | |
<kbd>e</kbd>: Edit commit | `` d `` | Delete commit | |
<kbd>i</kbd>: Start interactive rebase | `` e `` | Edit commit | |
<kbd>p</kbd>: Pick commit (when mid-rebase) | `` 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.
<kbd>F</kbd>: Create fixup commit for this commit If you would instead like to start an interactive rebase from the selected commit, press `e`. |
<kbd>S</kbd>: Squash all 'fixup!' commits above selected commit (autosquash) | `` p `` | Pick commit (when mid-rebase) | |
<kbd>&lt;c-j&gt;</kbd>: Move commit down one | `` F `` | Create fixup commit for this commit | |
<kbd>&lt;c-k&gt;</kbd>: Move commit up one | `` S `` | Squash all 'fixup!' commits above selected commit (autosquash) | |
<kbd>V</kbd>: Paste commits (cherry-pick) | `` <c-j> `` | Move commit down one | |
<kbd>B</kbd>: Mark commit as base commit for rebase | `` <c-k> `` | Move commit up one | |
<kbd>A</kbd>: Amend commit with staged changes | `` V `` | Paste commits (cherry-pick) | |
<kbd>a</kbd>: Set/Reset commit author | `` B `` | Mark commit as base commit for rebase | Select a base commit for the next rebase; this will effectively perform a 'git rebase --onto'. |
<kbd>t</kbd>: Revert commit | `` A `` | Amend commit with staged changes | |
<kbd>T</kbd>: Tag commit | `` a `` | Set/Reset commit author | |
<kbd>&lt;c-l&gt;</kbd>: Open log menu | `` t `` | Revert commit | |
<kbd>w</kbd>: View worktree options | `` T `` | Tag commit | |
<kbd>&lt;space&gt;</kbd>: Checkout commit | `` <c-l> `` | Open log menu | |
<kbd>y</kbd>: Copy commit attribute | `` w `` | View worktree options | |
<kbd>o</kbd>: Open commit in browser | `` <space> `` | Checkout commit | |
<kbd>n</kbd>: Create new branch off of commit | `` y `` | Copy commit attribute | |
<kbd>g</kbd>: View reset options | `` o `` | Open commit in browser | |
<kbd>C</kbd>: Copy commit (cherry-pick) | `` n `` | Create new branch off of commit | |
<kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool) | `` g `` | View reset options | |
<kbd>&lt;enter&gt;</kbd>: View selected item's files | `` C `` | Copy commit (cherry-pick) | |
<kbd>/</kbd>: Search the current view by text | `` <c-t> `` | Open external diff tool (git difftool) | |
</pre> | `` <enter> `` | View selected item's files | |
| `` / `` | Search the current view by text | |
## Confirmation panel ## Confirmation panel
<pre> | Key | Action | Info |
<kbd>&lt;enter&gt;</kbd>: Confirm |-----|--------|-------------|
<kbd>&lt;esc&gt;</kbd>: Close/Cancel | `` <enter> `` | Confirm | |
</pre> | `` <esc> `` | Close/Cancel | |
## Files ## Files
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: Copy the file name to the clipboard |-----|--------|-------------|
<kbd>&lt;space&gt;</kbd>: Toggle staged | `` <c-o> `` | Copy the file name to the clipboard | |
<kbd>&lt;c-b&gt;</kbd>: Filter files by status | `` <space> `` | Toggle staged | |
<kbd>y</kbd>: Copy to clipboard | `` <c-b> `` | Filter files by status | |
<kbd>c</kbd>: Commit changes | `` y `` | Copy to clipboard | |
<kbd>w</kbd>: Commit changes without pre-commit hook | `` c `` | Commit changes | |
<kbd>A</kbd>: Amend last commit | `` w `` | Commit changes without pre-commit hook | |
<kbd>C</kbd>: Commit changes using git editor | `` A `` | Amend last commit | |
<kbd>&lt;c-f&gt;</kbd>: Find base commit for fixup | `` C `` | Commit changes using git editor | |
<kbd>e</kbd>: Edit file | `` <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> |
<kbd>o</kbd>: Open file | `` e `` | Edit file | |
<kbd>i</kbd>: Ignore or exclude file | `` o `` | Open file | |
<kbd>r</kbd>: Refresh files | `` i `` | Ignore or exclude file | |
<kbd>s</kbd>: Stash all changes | `` r `` | Refresh files | |
<kbd>S</kbd>: View stash options | `` s `` | Stash all changes | |
<kbd>a</kbd>: Stage/unstage all | `` S `` | View stash options | |
<kbd>&lt;enter&gt;</kbd>: Stage individual hunks/lines for file, or collapse/expand for directory | `` a `` | Stage/unstage all | |
<kbd>d</kbd>: View 'discard changes' options | `` <enter> `` | Stage individual hunks/lines for file, or collapse/expand for directory | |
<kbd>g</kbd>: View upstream reset options | `` d `` | View 'discard changes' options | |
<kbd>D</kbd>: View reset options | `` g `` | View upstream reset options | |
<kbd>`</kbd>: Toggle file tree view | `` D `` | View reset options | |
<kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool) | `` ` `` | Toggle file tree view | |
<kbd>M</kbd>: Open external merge tool (git mergetool) | `` <c-t> `` | Open external diff tool (git difftool) | |
<kbd>f</kbd>: Fetch | `` M `` | Open external merge tool (git mergetool) | |
<kbd>/</kbd>: Search the current view by text | `` f `` | Fetch | |
</pre> | `` / `` | Search the current view by text | |
## Local branches ## Local branches
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: Copy branch name to clipboard |-----|--------|-------------|
<kbd>i</kbd>: Show git-flow options | `` <c-o> `` | Copy branch name to clipboard | |
<kbd>&lt;space&gt;</kbd>: Checkout | `` i `` | Show git-flow options | |
<kbd>n</kbd>: New branch | `` <space> `` | Checkout | |
<kbd>o</kbd>: Create pull request | `` n `` | New branch | |
<kbd>O</kbd>: Create pull request options | `` o `` | Create pull request | |
<kbd>&lt;c-y&gt;</kbd>: Copy pull request URL to clipboard | `` O `` | Create pull request options | |
<kbd>c</kbd>: Checkout by name, enter '-' to switch to last | `` <c-y> `` | Copy pull request URL to clipboard | |
<kbd>F</kbd>: Force checkout | `` c `` | Checkout by name, enter '-' to switch to last | |
<kbd>d</kbd>: View delete options | `` F `` | Force checkout | |
<kbd>r</kbd>: Rebase checked-out branch onto this branch | `` d `` | View delete options | |
<kbd>M</kbd>: Merge into currently checked out branch | `` r `` | Rebase checked-out branch onto this branch | |
<kbd>f</kbd>: Fast-forward this branch from its upstream | `` M `` | Merge into currently checked out branch | |
<kbd>T</kbd>: Create tag | `` f `` | Fast-forward this branch from its upstream | |
<kbd>s</kbd>: Sort order | `` T `` | Create tag | |
<kbd>g</kbd>: View reset options | `` s `` | Sort order | |
<kbd>R</kbd>: Rename branch | `` g `` | View reset options | |
<kbd>u</kbd>: View upstream options | `` R `` | Rename branch | |
<kbd>w</kbd>: View worktree options | `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream |
<kbd>&lt;enter&gt;</kbd>: View commits | `` w `` | View worktree options | |
<kbd>/</kbd>: Filter the current view by text | `` <enter> `` | View commits | |
</pre> | `` / `` | Filter the current view by text | |
## Main panel (merging) ## Main panel (merging)
<pre> | Key | Action | Info |
<kbd>e</kbd>: Edit file |-----|--------|-------------|
<kbd>o</kbd>: Open file | `` e `` | Edit file | |
<kbd>&lt;left&gt;</kbd>: Select previous conflict | `` o `` | Open file | |
<kbd>&lt;right&gt;</kbd>: Select next conflict | `` <left> `` | Select previous conflict | |
<kbd>&lt;up&gt;</kbd>: Select previous hunk | `` <right> `` | Select next conflict | |
<kbd>&lt;down&gt;</kbd>: Select next hunk | `` <up> `` | Select previous hunk | |
<kbd>z</kbd>: Undo | `` <down> `` | Select next hunk | |
<kbd>M</kbd>: Open external merge tool (git mergetool) | `` z `` | Undo | |
<kbd>&lt;space&gt;</kbd>: Pick hunk | `` M `` | Open external merge tool (git mergetool) | |
<kbd>b</kbd>: Pick all hunks | `` <space> `` | Pick hunk | |
<kbd>&lt;esc&gt;</kbd>: Return to files panel | `` b `` | Pick all hunks | |
</pre> | `` <esc> `` | Return to files panel | |
## Main panel (normal) ## Main panel (normal)
<pre> | Key | Action | Info |
<kbd>mouse wheel down</kbd>: Scroll down (fn+up) |-----|--------|-------------|
<kbd>mouse wheel up</kbd>: Scroll up (fn+down) | `` mouse wheel down (fn+up) `` | Scroll down | |
</pre> | `` mouse wheel up (fn+down) `` | Scroll up | |
## Main panel (patch building) ## Main panel (patch building)
<pre> | Key | Action | Info |
<kbd>&lt;left&gt;</kbd>: Select previous hunk |-----|--------|-------------|
<kbd>&lt;right&gt;</kbd>: Select next hunk | `` <left> `` | Select previous hunk | |
<kbd>v</kbd>: Toggle range select | `` <right> `` | Select next hunk | |
<kbd>a</kbd>: Toggle select hunk | `` v `` | Toggle range select | |
<kbd>&lt;c-o&gt;</kbd>: Copy the selected text to the clipboard | `` a `` | Toggle select hunk | |
<kbd>o</kbd>: Open file | `` <c-o> `` | Copy the selected text to the clipboard | |
<kbd>e</kbd>: Edit file | `` o `` | Open file | |
<kbd>&lt;space&gt;</kbd>: Add/Remove line(s) to patch | `` e `` | Edit file | |
<kbd>&lt;esc&gt;</kbd>: Exit custom patch builder | `` <space> `` | Add/Remove line(s) to patch | |
<kbd>/</kbd>: Search the current view by text | `` <esc> `` | Exit custom patch builder | |
</pre> | `` / `` | Search the current view by text | |
## Main panel (staging) ## Main panel (staging)
<pre> | Key | Action | Info |
<kbd>&lt;left&gt;</kbd>: Select previous hunk |-----|--------|-------------|
<kbd>&lt;right&gt;</kbd>: Select next hunk | `` <left> `` | Select previous hunk | |
<kbd>v</kbd>: Toggle range select | `` <right> `` | Select next hunk | |
<kbd>a</kbd>: Toggle select hunk | `` v `` | Toggle range select | |
<kbd>&lt;c-o&gt;</kbd>: Copy the selected text to the clipboard | `` a `` | Toggle select hunk | |
<kbd>o</kbd>: Open file | `` <c-o> `` | Copy the selected text to the clipboard | |
<kbd>e</kbd>: Edit file | `` o `` | Open file | |
<kbd>&lt;esc&gt;</kbd>: Return to files panel | `` e `` | Edit file | |
<kbd>&lt;tab&gt;</kbd>: Switch to other panel (staged/unstaged changes) | `` <esc> `` | Return to files panel | |
<kbd>&lt;space&gt;</kbd>: Toggle line staged / unstaged | `` <tab> `` | Switch to other panel (staged/unstaged changes) | |
<kbd>d</kbd>: Discard change (git reset) | `` <space> `` | Toggle line staged / unstaged | |
<kbd>E</kbd>: Edit hunk | `` d `` | Discard change (git reset) | |
<kbd>c</kbd>: Commit changes | `` E `` | Edit hunk | |
<kbd>w</kbd>: Commit changes without pre-commit hook | `` c `` | Commit changes | |
<kbd>C</kbd>: Commit changes using git editor | `` w `` | Commit changes without pre-commit hook | |
<kbd>/</kbd>: Search the current view by text | `` C `` | Commit changes using git editor | |
</pre> | `` / `` | Search the current view by text | |
## Menu ## Menu
<pre> | Key | Action | Info |
<kbd>&lt;enter&gt;</kbd>: Execute |-----|--------|-------------|
<kbd>&lt;esc&gt;</kbd>: Close | `` <enter> `` | Execute | |
<kbd>/</kbd>: Filter the current view by text | `` <esc> `` | Close | |
</pre> | `` / `` | Filter the current view by text | |
## Reflog ## Reflog
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: Copy commit SHA to clipboard |-----|--------|-------------|
<kbd>w</kbd>: View worktree options | `` <c-o> `` | Copy commit SHA to clipboard | |
<kbd>&lt;space&gt;</kbd>: Checkout commit | `` w `` | View worktree options | |
<kbd>y</kbd>: Copy commit attribute | `` <space> `` | Checkout commit | |
<kbd>o</kbd>: Open commit in browser | `` y `` | Copy commit attribute | |
<kbd>n</kbd>: Create new branch off of commit | `` o `` | Open commit in browser | |
<kbd>g</kbd>: View reset options | `` n `` | Create new branch off of commit | |
<kbd>C</kbd>: Copy commit (cherry-pick) | `` g `` | View reset options | |
<kbd>&lt;c-r&gt;</kbd>: Reset cherry-picked (copied) commits selection | `` C `` | Copy commit (cherry-pick) | |
<kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool) | `` <c-r> `` | Reset cherry-picked (copied) commits selection | |
<kbd>&lt;enter&gt;</kbd>: View commits | `` <c-t> `` | Open external diff tool (git difftool) | |
<kbd>/</kbd>: Filter the current view by text | `` <enter> `` | View commits | |
</pre> | `` / `` | Filter the current view by text | |
## Remote branches ## Remote branches
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: Copy branch name to clipboard |-----|--------|-------------|
<kbd>&lt;space&gt;</kbd>: Checkout | `` <c-o> `` | Copy branch name to clipboard | |
<kbd>n</kbd>: New branch | `` <space> `` | Checkout | |
<kbd>M</kbd>: Merge into currently checked out branch | `` n `` | New branch | |
<kbd>r</kbd>: Rebase checked-out branch onto this branch | `` M `` | Merge into currently checked out branch | |
<kbd>d</kbd>: Delete remote tag | `` r `` | Rebase checked-out branch onto this branch | |
<kbd>u</kbd>: Set as upstream of checked-out branch | `` d `` | Delete remote tag | |
<kbd>s</kbd>: Sort order | `` u `` | Set as upstream of checked-out branch | |
<kbd>g</kbd>: View reset options | `` s `` | Sort order | |
<kbd>w</kbd>: View worktree options | `` g `` | View reset options | |
<kbd>&lt;enter&gt;</kbd>: View commits | `` w `` | View worktree options | |
<kbd>/</kbd>: Filter the current view by text | `` <enter> `` | View commits | |
</pre> | `` / `` | Filter the current view by text | |
## Remotes ## Remotes
<pre> | Key | Action | Info |
<kbd>f</kbd>: Fetch remote |-----|--------|-------------|
<kbd>n</kbd>: Add new remote | `` f `` | Fetch remote | |
<kbd>d</kbd>: Remove remote | `` n `` | Add new remote | |
<kbd>e</kbd>: Edit remote | `` d `` | Remove remote | |
<kbd>/</kbd>: Filter the current view by text | `` e `` | Edit remote | |
</pre> | `` / `` | Filter the current view by text | |
## Stash ## Stash
<pre> | Key | Action | Info |
<kbd>&lt;space&gt;</kbd>: Apply |-----|--------|-------------|
<kbd>g</kbd>: Pop | `` <space> `` | Apply | |
<kbd>d</kbd>: Drop | `` g `` | Pop | |
<kbd>n</kbd>: New branch | `` d `` | Drop | |
<kbd>r</kbd>: Rename stash | `` n `` | New branch | |
<kbd>w</kbd>: View worktree options | `` r `` | Rename stash | |
<kbd>&lt;enter&gt;</kbd>: View selected item's files | `` w `` | View worktree options | |
<kbd>/</kbd>: Filter the current view by text | `` <enter> `` | View selected item's files | |
</pre> | `` / `` | Filter the current view by text | |
## Status ## Status
<pre> | Key | Action | Info |
<kbd>o</kbd>: Open config file |-----|--------|-------------|
<kbd>e</kbd>: Edit config file | `` o `` | Open config file | |
<kbd>u</kbd>: Check for update | `` e `` | Edit config file | |
<kbd>&lt;enter&gt;</kbd>: Switch to a recent repo | `` u `` | Check for update | |
<kbd>a</kbd>: Show all branch logs | `` <enter> `` | Switch to a recent repo | |
</pre> | `` a `` | Show all branch logs | |
## Sub-commits ## Sub-commits
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: Copy commit SHA to clipboard |-----|--------|-------------|
<kbd>w</kbd>: View worktree options | `` <c-o> `` | Copy commit SHA to clipboard | |
<kbd>&lt;space&gt;</kbd>: Checkout commit | `` w `` | View worktree options | |
<kbd>y</kbd>: Copy commit attribute | `` <space> `` | Checkout commit | |
<kbd>o</kbd>: Open commit in browser | `` y `` | Copy commit attribute | |
<kbd>n</kbd>: Create new branch off of commit | `` o `` | Open commit in browser | |
<kbd>g</kbd>: View reset options | `` n `` | Create new branch off of commit | |
<kbd>C</kbd>: Copy commit (cherry-pick) | `` g `` | View reset options | |
<kbd>&lt;c-r&gt;</kbd>: Reset cherry-picked (copied) commits selection | `` C `` | Copy commit (cherry-pick) | |
<kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool) | `` <c-r> `` | Reset cherry-picked (copied) commits selection | |
<kbd>&lt;enter&gt;</kbd>: View selected item's files | `` <c-t> `` | Open external diff tool (git difftool) | |
<kbd>/</kbd>: Search the current view by text | `` <enter> `` | View selected item's files | |
</pre> | `` / `` | Search the current view by text | |
## Submodules ## Submodules
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: Copy submodule name to clipboard |-----|--------|-------------|
<kbd>&lt;enter&gt;</kbd>: Enter submodule | `` <c-o> `` | Copy submodule name to clipboard | |
<kbd>&lt;space&gt;</kbd>: Enter submodule | `` <enter> `` | Enter submodule | |
<kbd>d</kbd>: Remove submodule | `` <space> `` | Enter submodule | |
<kbd>u</kbd>: Update submodule | `` d `` | Remove submodule | |
<kbd>n</kbd>: Add new submodule | `` u `` | Update submodule | |
<kbd>e</kbd>: Update submodule URL | `` n `` | Add new submodule | |
<kbd>i</kbd>: Initialize submodule | `` e `` | Update submodule URL | |
<kbd>b</kbd>: View bulk submodule options | `` i `` | Initialize submodule | |
<kbd>/</kbd>: Filter the current view by text | `` b `` | View bulk submodule options | |
</pre> | `` / `` | Filter the current view by text | |
## Tags ## Tags
<pre> | Key | Action | Info |
<kbd>&lt;space&gt;</kbd>: Checkout |-----|--------|-------------|
<kbd>d</kbd>: View delete options | `` <space> `` | Checkout | |
<kbd>P</kbd>: Push tag | `` d `` | View delete options | |
<kbd>n</kbd>: Create tag | `` P `` | Push tag | |
<kbd>g</kbd>: View reset options | `` n `` | Create tag | |
<kbd>w</kbd>: View worktree options | `` g `` | View reset options | |
<kbd>&lt;enter&gt;</kbd>: View commits | `` w `` | View worktree options | |
<kbd>/</kbd>: Filter the current view by text | `` <enter> `` | View commits | |
</pre> | `` / `` | Filter the current view by text | |
## Worktrees ## Worktrees
<pre> | Key | Action | Info |
<kbd>n</kbd>: Create worktree |-----|--------|-------------|
<kbd>&lt;space&gt;</kbd>: Switch to worktree | `` n `` | Create worktree | |
<kbd>&lt;enter&gt;</kbd>: Switch to worktree | `` <space> `` | Switch to worktree | |
<kbd>o</kbd>: Open in editor | `` <enter> `` | Switch to worktree | |
<kbd>d</kbd>: Remove worktree | `` o `` | Open in editor | |
<kbd>/</kbd>: Filter the current view by text | `` d `` | Remove worktree | |
</pre> | `` / `` | Filter the current view by text | |

View File

@ -6,356 +6,357 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
## グローバルキーバインド ## グローバルキーバインド
<pre> | Key | Action | Info |
<kbd>&lt;c-r&gt;</kbd>: 最近使用したリポジトリに切り替え |-----|--------|-------------|
<kbd>&lt;pgup&gt;</kbd>: メインパネルを上にスクロール (fn+up/shift+k) | `` <c-r> `` | 最近使用したリポジトリに切り替え | |
<kbd>&lt;pgdown&gt;</kbd>: メインパネルを下にスクロール (fn+down/shift+j) | `` <pgup> (fn+up/shift+k) `` | メインパネルを上にスクロール | |
<kbd>@</kbd>: コマンドログメニューを開く | `` <pgdown> (fn+down/shift+j) `` | メインパネルを下にスクロール | |
<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 | `` } `` | 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>&lt;c-p&gt;</kbd>: View custom patch options | `` : `` | カスタムコマンドを実行 | |
<kbd>m</kbd>: View merge/rebase options | `` <c-p> `` | View custom patch options | |
<kbd>R</kbd>: リフレッシュ | `` m `` | View merge/rebase options | |
<kbd>+</kbd>: 次のスクリーンモード (normal/half/fullscreen) | `` R `` | リフレッシュ | |
<kbd>_</kbd>: 前のスクリーンモード | `` + `` | 次のスクリーンモード (normal/half/fullscreen) | |
<kbd>?</kbd>: メニューを開く | `` _ `` | 前のスクリーンモード | |
<kbd>&lt;c-s&gt;</kbd>: View filter-by-path options | `` ? `` | メニューを開く | |
<kbd>W</kbd>: 差分メニューを開く | `` <c-s> `` | View filter-by-path options | |
<kbd>&lt;c-e&gt;</kbd>: 差分メニューを開く | `` W `` | 差分メニューを開く | |
<kbd>&lt;c-w&gt;</kbd>: 空白文字の差分の表示有無を切り替え | `` <c-e> `` | 差分メニューを開く | |
<kbd>z</kbd>: アンドゥ (via reflog) (experimental) | `` <c-w> `` | 空白文字の差分の表示有無を切り替え | |
<kbd>&lt;c-z&gt;</kbd>: リドゥ (via reflog) (experimental) | `` 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. |
<kbd>P</kbd>: Push | `` <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. |
<kbd>p</kbd>: Pull | `` P `` | Push | |
</pre> | `` p `` | Pull | |
## 一覧パネルの操作 ## 一覧パネルの操作
<pre> | Key | Action | Info |
<kbd>,</kbd>: 前のページ |-----|--------|-------------|
<kbd>.</kbd>: 次のページ | `` , `` | 前のページ | |
<kbd>&lt;</kbd>: 最上部までスクロール | `` . `` | 次のページ | |
<kbd>&gt;</kbd>: 最下部までスクロール | `` < `` | 最上部までスクロール | |
<kbd>v</kbd>: 範囲選択を切り替え | `` > `` | 最下部までスクロール | |
<kbd>&lt;s-down&gt;</kbd>: Range select down | `` v `` | 範囲選択を切り替え | |
<kbd>&lt;s-up&gt;</kbd>: Range select up | `` <s-down> `` | Range select down | |
<kbd>/</kbd>: 検索を開始 | `` <s-up> `` | Range select up | |
<kbd>H</kbd>: 左スクロール | `` / `` | 検索を開始 | |
<kbd>L</kbd>: 右スクロール | `` H `` | 左スクロール | |
<kbd>]</kbd>: 次のタブ | `` L `` | 右スクロール | |
<kbd>[</kbd>: 前のタブ | `` ] `` | 次のタブ | |
</pre> | `` [ `` | 前のタブ | |
## Stash ## Stash
<pre> | Key | Action | Info |
<kbd>&lt;space&gt;</kbd>: 適用 |-----|--------|-------------|
<kbd>g</kbd>: Pop | `` <space> `` | 適用 | |
<kbd>d</kbd>: Drop | `` g `` | Pop | |
<kbd>n</kbd>: 新しいブランチを作成 | `` d `` | Drop | |
<kbd>r</kbd>: Stashを変更 | `` n `` | 新しいブランチを作成 | |
<kbd>w</kbd>: View worktree options | `` r `` | Stashを変更 | |
<kbd>&lt;enter&gt;</kbd>: View selected item's files | `` w `` | View worktree options | |
<kbd>/</kbd>: Filter the current view by text | `` <enter> `` | View selected item's files | |
</pre> | `` / `` | Filter the current view by text | |
## Sub-commits ## Sub-commits
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: コミットのSHAをクリップボードにコピー |-----|--------|-------------|
<kbd>w</kbd>: View worktree options | `` <c-o> `` | コミットのSHAをクリップボードにコピー | |
<kbd>&lt;space&gt;</kbd>: コミットをチェックアウト | `` w `` | View worktree options | |
<kbd>y</kbd>: コミットの情報をコピー | `` <space> `` | コミットをチェックアウト | |
<kbd>o</kbd>: ブラウザでコミットを開く | `` y `` | コミットの情報をコピー | |
<kbd>n</kbd>: コミットにブランチを作成 | `` o `` | ブラウザでコミットを開く | |
<kbd>g</kbd>: View reset options | `` n `` | コミットにブランチを作成 | |
<kbd>C</kbd>: コミットをコピー (cherry-pick) | `` g `` | View reset options | |
<kbd>&lt;c-r&gt;</kbd>: Reset cherry-picked (copied) commits selection | `` C `` | コミットをコピー (cherry-pick) | |
<kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool) | `` <c-r> `` | Reset cherry-picked (copied) commits selection | |
<kbd>&lt;enter&gt;</kbd>: View selected item's files | `` <c-t> `` | Open external diff tool (git difftool) | |
<kbd>/</kbd>: 検索を開始 | `` <enter> `` | View selected item's files | |
</pre> | `` / `` | 検索を開始 | |
## Worktrees ## Worktrees
<pre> | Key | Action | Info |
<kbd>n</kbd>: Create worktree |-----|--------|-------------|
<kbd>&lt;space&gt;</kbd>: Switch to worktree | `` n `` | Create worktree | |
<kbd>&lt;enter&gt;</kbd>: Switch to worktree | `` <space> `` | Switch to worktree | |
<kbd>o</kbd>: Open in editor | `` <enter> `` | Switch to worktree | |
<kbd>d</kbd>: Remove worktree | `` o `` | Open in editor | |
<kbd>/</kbd>: Filter the current view by text | `` d `` | Remove worktree | |
</pre> | `` / `` | Filter the current view by text | |
## コミット ## コミット
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: コミットのSHAをクリップボードにコピー |-----|--------|-------------|
<kbd>&lt;c-r&gt;</kbd>: Reset cherry-picked (copied) commits selection | `` <c-o> `` | コミットのSHAをクリップボードにコピー | |
<kbd>b</kbd>: View bisect options | `` <c-r> `` | Reset cherry-picked (copied) commits selection | |
<kbd>s</kbd>: Squash down | `` b `` | View bisect options | |
<kbd>f</kbd>: Fixup commit | `` s `` | Squash down | |
<kbd>r</kbd>: コミットメッセージを変更 | `` f `` | Fixup commit | |
<kbd>R</kbd>: エディタでコミットメッセージを編集 | `` r `` | コミットメッセージを変更 | |
<kbd>d</kbd>: コミットを削除 | `` R `` | エディタでコミットメッセージを編集 | |
<kbd>e</kbd>: コミットを編集 | `` d `` | コミットを削除 | |
<kbd>i</kbd>: Start interactive rebase | `` e `` | コミットを編集 | |
<kbd>p</kbd>: Pick commit (when mid-rebase) | `` 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.
<kbd>F</kbd>: このコミットに対するfixupコミットを作成 If you would instead like to start an interactive rebase from the selected commit, press `e`. |
<kbd>S</kbd>: Squash all 'fixup!' commits above selected commit (autosquash) | `` p `` | Pick commit (when mid-rebase) | |
<kbd>&lt;c-j&gt;</kbd>: コミットを1つ下に移動 | `` F `` | このコミットに対するfixupコミットを作成 | |
<kbd>&lt;c-k&gt;</kbd>: コミットを1つ上に移動 | `` S `` | Squash all 'fixup!' commits above selected commit (autosquash) | |
<kbd>V</kbd>: コミットを貼り付け (cherry-pick) | `` <c-j> `` | コミットを1つ下に移動 | |
<kbd>B</kbd>: Mark commit as base commit for rebase | `` <c-k> `` | コミットを1つ上に移動 | |
<kbd>A</kbd>: ステージされた変更でamendコミット | `` V `` | コミットを貼り付け (cherry-pick) | |
<kbd>a</kbd>: Set/Reset commit author | `` B `` | Mark commit as base commit for rebase | Select a base commit for the next rebase; this will effectively perform a 'git rebase --onto'. |
<kbd>t</kbd>: コミットをrevert | `` A `` | ステージされた変更でamendコミット | |
<kbd>T</kbd>: タグを作成 | `` a `` | Set/Reset commit author | |
<kbd>&lt;c-l&gt;</kbd>: ログメニューを開く | `` t `` | コミットをrevert | |
<kbd>w</kbd>: View worktree options | `` T `` | タグを作成 | |
<kbd>&lt;space&gt;</kbd>: コミットをチェックアウト | `` <c-l> `` | ログメニューを開く | |
<kbd>y</kbd>: コミットの情報をコピー | `` w `` | View worktree options | |
<kbd>o</kbd>: ブラウザでコミットを開く | `` <space> `` | コミットをチェックアウト | |
<kbd>n</kbd>: コミットにブランチを作成 | `` y `` | コミットの情報をコピー | |
<kbd>g</kbd>: View reset options | `` o `` | ブラウザでコミットを開く | |
<kbd>C</kbd>: コミットをコピー (cherry-pick) | `` n `` | コミットにブランチを作成 | |
<kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool) | `` g `` | View reset options | |
<kbd>&lt;enter&gt;</kbd>: View selected item's files | `` C `` | コミットをコピー (cherry-pick) | |
<kbd>/</kbd>: 検索を開始 | `` <c-t> `` | Open external diff tool (git difftool) | |
</pre> | `` <enter> `` | View selected item's files | |
| `` / `` | 検索を開始 | |
## コミットファイル ## コミットファイル
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: コミットされたファイル名をクリップボードにコピー |-----|--------|-------------|
<kbd>c</kbd>: Checkout file | `` <c-o> `` | コミットされたファイル名をクリップボードにコピー | |
<kbd>d</kbd>: Discard this commit's changes to this file | `` c `` | Checkout file | |
<kbd>o</kbd>: ファイルを開く | `` d `` | Discard this commit's changes to this file | |
<kbd>e</kbd>: ファイルを編集 | `` o `` | ファイルを開く | |
<kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool) | `` e `` | ファイルを編集 | |
<kbd>&lt;space&gt;</kbd>: Toggle file included in patch | `` <c-t> `` | Open external diff tool (git difftool) | |
<kbd>a</kbd>: Toggle all files included in patch | `` <space> `` | Toggle file included in patch | |
<kbd>&lt;enter&gt;</kbd>: Enter file to add selected lines to the patch (or toggle directory collapsed) | `` a `` | Toggle all files included in patch | |
<kbd>`</kbd>: ファイルツリーの表示を切り替え | `` <enter> `` | Enter file to add selected lines to the patch (or toggle directory collapsed) | |
<kbd>/</kbd>: 検索を開始 | `` ` `` | ファイルツリーの表示を切り替え | |
</pre> | `` / `` | 検索を開始 | |
## コミットメッセージ ## コミットメッセージ
<pre> | Key | Action | Info |
<kbd>&lt;enter&gt;</kbd>: 確認 |-----|--------|-------------|
<kbd>&lt;esc&gt;</kbd>: 閉じる | `` <enter> `` | 確認 | |
</pre> | `` <esc> `` | 閉じる | |
## サブモジュール ## サブモジュール
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: サブモジュール名をクリップボードにコピー |-----|--------|-------------|
<kbd>&lt;enter&gt;</kbd>: サブモジュールを開く | `` <c-o> `` | サブモジュール名をクリップボードにコピー | |
<kbd>&lt;space&gt;</kbd>: サブモジュールを開く | `` <enter> `` | サブモジュールを開く | |
<kbd>d</kbd>: サブモジュールを削除 | `` <space> `` | サブモジュールを開く | |
<kbd>u</kbd>: サブモジュールを更新 | `` d `` | サブモジュールを削除 | |
<kbd>n</kbd>: サブモジュールを新規追加 | `` u `` | サブモジュールを更新 | |
<kbd>e</kbd>: サブモジュールのURLを更新 | `` n `` | サブモジュールを新規追加 | |
<kbd>i</kbd>: サブモジュールを初期化 | `` e `` | サブモジュールのURLを更新 | |
<kbd>b</kbd>: View bulk submodule options | `` i `` | サブモジュールを初期化 | |
<kbd>/</kbd>: Filter the current view by text | `` b `` | View bulk submodule options | |
</pre> | `` / `` | Filter the current view by text | |
## ステータス ## ステータス
<pre> | Key | Action | Info |
<kbd>o</kbd>: 設定ファイルを開く |-----|--------|-------------|
<kbd>e</kbd>: 設定ファイルを編集 | `` o `` | 設定ファイルを開く | |
<kbd>u</kbd>: 更新を確認 | `` e `` | 設定ファイルを編集 | |
<kbd>&lt;enter&gt;</kbd>: 最近使用したリポジトリに切り替え | `` u `` | 更新を確認 | |
<kbd>a</kbd>: すべてのブランチログを表示 | `` <enter> `` | 最近使用したリポジトリに切り替え | |
</pre> | `` a `` | すべてのブランチログを表示 | |
## タグ ## タグ
<pre> | Key | Action | Info |
<kbd>&lt;space&gt;</kbd>: チェックアウト |-----|--------|-------------|
<kbd>d</kbd>: View delete options | `` <space> `` | チェックアウト | |
<kbd>P</kbd>: タグをpush | `` d `` | View delete options | |
<kbd>n</kbd>: タグを作成 | `` P `` | タグをpush | |
<kbd>g</kbd>: View reset options | `` n `` | タグを作成 | |
<kbd>w</kbd>: View worktree options | `` g `` | View reset options | |
<kbd>&lt;enter&gt;</kbd>: コミットを閲覧 | `` w `` | View worktree options | |
<kbd>/</kbd>: Filter the current view by text | `` <enter> `` | コミットを閲覧 | |
</pre> | `` / `` | Filter the current view by text | |
## ファイル ## ファイル
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: ファイル名をクリップボードにコピー |-----|--------|-------------|
<kbd>&lt;space&gt;</kbd>: ステージ/アンステージ | `` <c-o> `` | ファイル名をクリップボードにコピー | |
<kbd>&lt;c-b&gt;</kbd>: ファイルをフィルタ (ステージ/アンステージ) | `` <space> `` | ステージ/アンステージ | |
<kbd>y</kbd>: Copy to clipboard | `` <c-b> `` | ファイルをフィルタ (ステージ/アンステージ) | |
<kbd>c</kbd>: 変更をコミット | `` y `` | Copy to clipboard | |
<kbd>w</kbd>: pre-commitフックを実行せずに変更をコミット | `` c `` | 変更をコミット | |
<kbd>A</kbd>: 最新のコミットにamend | `` w `` | pre-commitフックを実行せずに変更をコミット | |
<kbd>C</kbd>: gitエディタを使用して変更をコミット | `` A `` | 最新のコミットにamend | |
<kbd>&lt;c-f&gt;</kbd>: Find base commit for fixup | `` C `` | gitエディタを使用して変更をコミット | |
<kbd>e</kbd>: ファイルを編集 | `` <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> |
<kbd>o</kbd>: ファイルを開く | `` e `` | ファイルを編集 | |
<kbd>i</kbd>: ファイルをignore | `` o `` | ファイルを開く | |
<kbd>r</kbd>: ファイルをリフレッシュ | `` i `` | ファイルをignore | |
<kbd>s</kbd>: 変更をstash | `` r `` | ファイルをリフレッシュ | |
<kbd>S</kbd>: View stash options | `` s `` | 変更をstash | |
<kbd>a</kbd>: すべての変更をステージ/アンステージ | `` S `` | View stash options | |
<kbd>&lt;enter&gt;</kbd>: Stage individual hunks/lines for file, or collapse/expand for directory | `` a `` | すべての変更をステージ/アンステージ | |
<kbd>d</kbd>: View 'discard changes' options | `` <enter> `` | Stage individual hunks/lines for file, or collapse/expand for directory | |
<kbd>g</kbd>: View upstream reset options | `` d `` | View 'discard changes' options | |
<kbd>D</kbd>: View reset options | `` g `` | View upstream reset options | |
<kbd>`</kbd>: ファイルツリーの表示を切り替え | `` D `` | View reset options | |
<kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool) | `` ` `` | ファイルツリーの表示を切り替え | |
<kbd>M</kbd>: Git mergetoolを開く | `` <c-t> `` | Open external diff tool (git difftool) | |
<kbd>f</kbd>: Fetch | `` M `` | Git mergetoolを開く | |
<kbd>/</kbd>: 検索を開始 | `` f `` | Fetch | |
</pre> | `` / `` | 検索を開始 | |
## ブランチ ## ブランチ
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: ブランチ名をクリップボードにコピー |-----|--------|-------------|
<kbd>i</kbd>: Show git-flow options | `` <c-o> `` | ブランチ名をクリップボードにコピー | |
<kbd>&lt;space&gt;</kbd>: チェックアウト | `` i `` | Show git-flow options | |
<kbd>n</kbd>: 新しいブランチを作成 | `` <space> `` | チェックアウト | |
<kbd>o</kbd>: Pull Requestを作成 | `` n `` | 新しいブランチを作成 | |
<kbd>O</kbd>: Create pull request options | `` o `` | Pull Requestを作成 | |
<kbd>&lt;c-y&gt;</kbd>: Pull RequestのURLをクリップボードにコピー | `` O `` | Create pull request options | |
<kbd>c</kbd>: Checkout by name, enter '-' to switch to last | `` <c-y> `` | Pull RequestのURLをクリップボードにコピー | |
<kbd>F</kbd>: Force checkout | `` c `` | Checkout by name, enter '-' to switch to last | |
<kbd>d</kbd>: View delete options | `` F `` | Force checkout | |
<kbd>r</kbd>: Rebase checked-out branch onto this branch | `` d `` | View delete options | |
<kbd>M</kbd>: 現在のブランチにマージ | `` r `` | Rebase checked-out branch onto this branch | |
<kbd>f</kbd>: Fast-forward this branch from its upstream | `` M `` | 現在のブランチにマージ | |
<kbd>T</kbd>: タグを作成 | `` f `` | Fast-forward this branch from its upstream | |
<kbd>s</kbd>: 並び替え | `` T `` | タグを作成 | |
<kbd>g</kbd>: View reset options | `` s `` | 並び替え | |
<kbd>R</kbd>: ブランチ名を変更 | `` g `` | View reset options | |
<kbd>u</kbd>: View upstream options | `` R `` | ブランチ名を変更 | |
<kbd>w</kbd>: View worktree options | `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream |
<kbd>&lt;enter&gt;</kbd>: コミットを閲覧 | `` w `` | View worktree options | |
<kbd>/</kbd>: Filter the current view by text | `` <enter> `` | コミットを閲覧 | |
</pre> | `` / `` | Filter the current view by text | |
## メインパネル (Merging) ## メインパネル (Merging)
<pre> | Key | Action | Info |
<kbd>e</kbd>: ファイルを編集 |-----|--------|-------------|
<kbd>o</kbd>: ファイルを開く | `` e `` | ファイルを編集 | |
<kbd>&lt;left&gt;</kbd>: 前のコンフリクトを選択 | `` o `` | ファイルを開く | |
<kbd>&lt;right&gt;</kbd>: 次のコンフリクトを選択 | `` <left> `` | 前のコンフリクトを選択 | |
<kbd>&lt;up&gt;</kbd>: 前のhunkを選択 | `` <right> `` | 次のコンフリクトを選択 | |
<kbd>&lt;down&gt;</kbd>: 次のhunkを選択 | `` <up> `` | 前のhunkを選択 | |
<kbd>z</kbd>: アンドゥ | `` <down> `` | 次のhunkを選択 | |
<kbd>M</kbd>: Git mergetoolを開く | `` z `` | アンドゥ | |
<kbd>&lt;space&gt;</kbd>: Pick hunk | `` M `` | Git mergetoolを開く | |
<kbd>b</kbd>: Pick all hunks | `` <space> `` | Pick hunk | |
<kbd>&lt;esc&gt;</kbd>: ファイル一覧に戻る | `` b `` | Pick all hunks | |
</pre> | `` <esc> `` | ファイル一覧に戻る | |
## メインパネル (Normal) ## メインパネル (Normal)
<pre> | Key | Action | Info |
<kbd>mouse wheel down</kbd>: 下にスクロール (fn+up) |-----|--------|-------------|
<kbd>mouse wheel up</kbd>: 上にスクロール (fn+down) | `` mouse wheel down (fn+up) `` | 下にスクロール | |
</pre> | `` mouse wheel up (fn+down) `` | 上にスクロール | |
## メインパネル (Patch Building) ## メインパネル (Patch Building)
<pre> | Key | Action | Info |
<kbd>&lt;left&gt;</kbd>: 前のhunkを選択 |-----|--------|-------------|
<kbd>&lt;right&gt;</kbd>: 次のhunkを選択 | `` <left> `` | 前のhunkを選択 | |
<kbd>v</kbd>: 範囲選択を切り替え | `` <right> `` | 次のhunkを選択 | |
<kbd>a</kbd>: Hunk選択を切り替え | `` v `` | 範囲選択を切り替え | |
<kbd>&lt;c-o&gt;</kbd>: 選択されたテキストをクリップボードにコピー | `` a `` | Hunk選択を切り替え | |
<kbd>o</kbd>: ファイルを開く | `` <c-o> `` | 選択されたテキストをクリップボードにコピー | |
<kbd>e</kbd>: ファイルを編集 | `` o `` | ファイルを開く | |
<kbd>&lt;space&gt;</kbd>: 行をパッチに追加/削除 | `` e `` | ファイルを編集 | |
<kbd>&lt;esc&gt;</kbd>: Exit custom patch builder | `` <space> `` | 行をパッチに追加/削除 | |
<kbd>/</kbd>: 検索を開始 | `` <esc> `` | Exit custom patch builder | |
</pre> | `` / `` | 検索を開始 | |
## メインパネル (Staging) ## メインパネル (Staging)
<pre> | Key | Action | Info |
<kbd>&lt;left&gt;</kbd>: 前のhunkを選択 |-----|--------|-------------|
<kbd>&lt;right&gt;</kbd>: 次のhunkを選択 | `` <left> `` | 前のhunkを選択 | |
<kbd>v</kbd>: 範囲選択を切り替え | `` <right> `` | 次のhunkを選択 | |
<kbd>a</kbd>: Hunk選択を切り替え | `` v `` | 範囲選択を切り替え | |
<kbd>&lt;c-o&gt;</kbd>: 選択されたテキストをクリップボードにコピー | `` a `` | Hunk選択を切り替え | |
<kbd>o</kbd>: ファイルを開く | `` <c-o> `` | 選択されたテキストをクリップボードにコピー | |
<kbd>e</kbd>: ファイルを編集 | `` o `` | ファイルを開く | |
<kbd>&lt;esc&gt;</kbd>: ファイル一覧に戻る | `` e `` | ファイルを編集 | |
<kbd>&lt;tab&gt;</kbd>: パネルを切り替え | `` <esc> `` | ファイル一覧に戻る | |
<kbd>&lt;space&gt;</kbd>: 選択行をステージ/アンステージ | `` <tab> `` | パネルを切り替え | |
<kbd>d</kbd>: 変更を削除 (git reset) | `` <space> `` | 選択行をステージ/アンステージ | |
<kbd>E</kbd>: Edit hunk | `` d `` | 変更を削除 (git reset) | |
<kbd>c</kbd>: 変更をコミット | `` E `` | Edit hunk | |
<kbd>w</kbd>: pre-commitフックを実行せずに変更をコミット | `` c `` | 変更をコミット | |
<kbd>C</kbd>: gitエディタを使用して変更をコミット | `` w `` | pre-commitフックを実行せずに変更をコミット | |
<kbd>/</kbd>: 検索を開始 | `` C `` | gitエディタを使用して変更をコミット | |
</pre> | `` / `` | 検索を開始 | |
## メニュー ## メニュー
<pre> | Key | Action | Info |
<kbd>&lt;enter&gt;</kbd>: 実行 |-----|--------|-------------|
<kbd>&lt;esc&gt;</kbd>: 閉じる | `` <enter> `` | 実行 | |
<kbd>/</kbd>: Filter the current view by text | `` <esc> `` | 閉じる | |
</pre> | `` / `` | Filter the current view by text | |
## リモート ## リモート
<pre> | Key | Action | Info |
<kbd>f</kbd>: リモートをfetch |-----|--------|-------------|
<kbd>n</kbd>: リモートを新規追加 | `` f `` | リモートをfetch | |
<kbd>d</kbd>: リモートを削除 | `` n `` | リモートを新規追加 | |
<kbd>e</kbd>: リモートを編集 | `` d `` | リモートを削除 | |
<kbd>/</kbd>: Filter the current view by text | `` e `` | リモートを編集 | |
</pre> | `` / `` | Filter the current view by text | |
## リモートブランチ ## リモートブランチ
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: ブランチ名をクリップボードにコピー |-----|--------|-------------|
<kbd>&lt;space&gt;</kbd>: チェックアウト | `` <c-o> `` | ブランチ名をクリップボードにコピー | |
<kbd>n</kbd>: 新しいブランチを作成 | `` <space> `` | チェックアウト | |
<kbd>M</kbd>: 現在のブランチにマージ | `` n `` | 新しいブランチを作成 | |
<kbd>r</kbd>: Rebase checked-out branch onto this branch | `` M `` | 現在のブランチにマージ | |
<kbd>d</kbd>: Delete remote tag | `` r `` | Rebase checked-out branch onto this branch | |
<kbd>u</kbd>: Set as upstream of checked-out branch | `` d `` | Delete remote tag | |
<kbd>s</kbd>: 並び替え | `` u `` | Set as upstream of checked-out branch | |
<kbd>g</kbd>: View reset options | `` s `` | 並び替え | |
<kbd>w</kbd>: View worktree options | `` g `` | View reset options | |
<kbd>&lt;enter&gt;</kbd>: コミットを閲覧 | `` w `` | View worktree options | |
<kbd>/</kbd>: Filter the current view by text | `` <enter> `` | コミットを閲覧 | |
</pre> | `` / `` | Filter the current view by text | |
## 参照ログ ## 参照ログ
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: コミットのSHAをクリップボードにコピー |-----|--------|-------------|
<kbd>w</kbd>: View worktree options | `` <c-o> `` | コミットのSHAをクリップボードにコピー | |
<kbd>&lt;space&gt;</kbd>: コミットをチェックアウト | `` w `` | View worktree options | |
<kbd>y</kbd>: コミットの情報をコピー | `` <space> `` | コミットをチェックアウト | |
<kbd>o</kbd>: ブラウザでコミットを開く | `` y `` | コミットの情報をコピー | |
<kbd>n</kbd>: コミットにブランチを作成 | `` o `` | ブラウザでコミットを開く | |
<kbd>g</kbd>: View reset options | `` n `` | コミットにブランチを作成 | |
<kbd>C</kbd>: コミットをコピー (cherry-pick) | `` g `` | View reset options | |
<kbd>&lt;c-r&gt;</kbd>: Reset cherry-picked (copied) commits selection | `` C `` | コミットをコピー (cherry-pick) | |
<kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool) | `` <c-r> `` | Reset cherry-picked (copied) commits selection | |
<kbd>&lt;enter&gt;</kbd>: コミットを閲覧 | `` <c-t> `` | Open external diff tool (git difftool) | |
<kbd>/</kbd>: Filter the current view by text | `` <enter> `` | コミットを閲覧 | |
</pre> | `` / `` | Filter the current view by text | |
## 確認パネル ## 確認パネル
<pre> | Key | Action | Info |
<kbd>&lt;enter&gt;</kbd>: 確認 |-----|--------|-------------|
<kbd>&lt;esc&gt;</kbd>: 閉じる/キャンセル | `` <enter> `` | 確認 | |
</pre> | `` <esc> `` | 閉じる/キャンセル | |

View File

@ -6,356 +6,357 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
## 글로벌 키 바인딩 ## 글로벌 키 바인딩
<pre> | Key | Action | Info |
<kbd>&lt;c-r&gt;</kbd>: 최근에 사용한 저장소로 전환 |-----|--------|-------------|
<kbd>&lt;pgup&gt;</kbd>: 메인 패널을 위로 스크롤 (fn+up/shift+k) | `` <c-r> `` | 최근에 사용한 저장소로 전환 | |
<kbd>&lt;pgdown&gt;</kbd>: 메인 패널을 아래로로 스크롤 (fn+down/shift+j) | `` <pgup> (fn+up/shift+k) `` | 메인 패널을 위로 스크롤 | |
<kbd>@</kbd>: 명령어 로그 메뉴 열기 | `` <pgdown> (fn+down/shift+j) `` | 메인 패널을 아래로로 스크롤 | |
<kbd>}</kbd>: Diff 보기의 변경 사항 주위에 표시되는 컨텍스트의 크기를 늘리기 | `` @ `` | 명령어 로그 메뉴 열기 | |
<kbd>{</kbd>: Diff 보기의 변경 사항 주위에 표시되는 컨텍스트 크기 줄이기 | `` } `` | Diff 보기의 변경 사항 주위에 표시되는 컨텍스트의 크기를 늘리기 | |
<kbd>:</kbd>: Execute custom command | `` { `` | Diff 보기의 변경 사항 주위에 표시되는 컨텍스트 크기 줄이기 | |
<kbd>&lt;c-p&gt;</kbd>: 커스텀 Patch 옵션 보기 | `` : `` | Execute custom command | |
<kbd>m</kbd>: View merge/rebase options | `` <c-p> `` | 커스텀 Patch 옵션 보기 | |
<kbd>R</kbd>: 새로고침 | `` m `` | View merge/rebase options | |
<kbd>+</kbd>: 다음 스크린 모드 (normal/half/fullscreen) | `` R `` | 새로고침 | |
<kbd>_</kbd>: 이전 스크린 모드 | `` + `` | 다음 스크린 모드 (normal/half/fullscreen) | |
<kbd>?</kbd>: 매뉴 열기 | `` _ `` | 이전 스크린 모드 | |
<kbd>&lt;c-s&gt;</kbd>: View filter-by-path options | `` ? `` | 매뉴 열기 | |
<kbd>W</kbd>: Diff 메뉴 열기 | `` <c-s> `` | View filter-by-path options | |
<kbd>&lt;c-e&gt;</kbd>: Diff 메뉴 열기 | `` W `` | Diff 메뉴 열기 | |
<kbd>&lt;c-w&gt;</kbd>: 공백문자를 Diff 뷰에서 표시 여부 전환 | `` <c-e> `` | Diff 메뉴 열기 | |
<kbd>z</kbd>: 되돌리기 (reflog) (실험적) | `` <c-w> `` | 공백문자를 Diff 뷰에서 표시 여부 전환 | |
<kbd>&lt;c-z&gt;</kbd>: 다시 실행 (reflog) (실험적) | `` z `` | 되돌리기 (reflog) (실험적) | 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. |
<kbd>P</kbd>: 푸시 | `` <c-z> `` | 다시 실행 (reflog) (실험적) | 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. |
<kbd>p</kbd>: 업데이트 | `` P `` | 푸시 | |
</pre> | `` p `` | 업데이트 | |
## List panel navigation ## List panel navigation
<pre> | Key | Action | Info |
<kbd>,</kbd>: 이전 페이지 |-----|--------|-------------|
<kbd>.</kbd>: 다음 페이지 | `` , `` | 이전 페이지 | |
<kbd>&lt;</kbd>: 맨 위로 스크롤 | `` . `` | 다음 페이지 | |
<kbd>&gt;</kbd>: 맨 아래로 스크롤 | `` < `` | 맨 위로 스크롤 | |
<kbd>v</kbd>: 드래그 선택 전환 | `` > `` | 맨 아래로 스크롤 | |
<kbd>&lt;s-down&gt;</kbd>: Range select down | `` v `` | 드래그 선택 전환 | |
<kbd>&lt;s-up&gt;</kbd>: Range select up | `` <s-down> `` | Range select down | |
<kbd>/</kbd>: 검색 시작 | `` <s-up> `` | Range select up | |
<kbd>H</kbd>: 우 스크롤 | `` / `` | 검색 시작 | |
<kbd>L</kbd>: 좌 스크롤 | `` H `` | 우 스크롤 | |
<kbd>]</kbd>: 이전 탭 | `` L `` | 좌 스크롤 | |
<kbd>[</kbd>: 다음 탭 | `` ] `` | 이전 탭 | |
</pre> | `` [ `` | 다음 탭 | |
## Reflog ## Reflog
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: 커밋 SHA를 클립보드에 복사 |-----|--------|-------------|
<kbd>w</kbd>: View worktree options | `` <c-o> `` | 커밋 SHA를 클립보드에 복사 | |
<kbd>&lt;space&gt;</kbd>: 커밋을 체크아웃 | `` w `` | View worktree options | |
<kbd>y</kbd>: 커밋 attribute 복사 | `` <space> `` | 커밋을 체크아웃 | |
<kbd>o</kbd>: 브라우저에서 커밋 열기 | `` y `` | 커밋 attribute 복사 | |
<kbd>n</kbd>: 커밋에서 새 브랜치를 만듭니다. | `` o `` | 브라우저에서 커밋 열기 | |
<kbd>g</kbd>: View reset options | `` n `` | 커밋에서 새 브랜치를 만듭니다. | |
<kbd>C</kbd>: 커밋을 복사 (cherry-pick) | `` g `` | View reset options | |
<kbd>&lt;c-r&gt;</kbd>: Reset cherry-picked (copied) commits selection | `` C `` | 커밋을 복사 (cherry-pick) | |
<kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool) | `` <c-r> `` | Reset cherry-picked (copied) commits selection | |
<kbd>&lt;enter&gt;</kbd>: 커밋 보기 | `` <c-t> `` | Open external diff tool (git difftool) | |
<kbd>/</kbd>: Filter the current view by text | `` <enter> `` | 커밋 보기 | |
</pre> | `` / `` | Filter the current view by text | |
## Stash ## Stash
<pre> | Key | Action | Info |
<kbd>&lt;space&gt;</kbd>: 적용 |-----|--------|-------------|
<kbd>g</kbd>: Pop | `` <space> `` | 적용 | |
<kbd>d</kbd>: Drop | `` g `` | Pop | |
<kbd>n</kbd>: 새 브랜치 생성 | `` d `` | Drop | |
<kbd>r</kbd>: Rename stash | `` n `` | 새 브랜치 생성 | |
<kbd>w</kbd>: View worktree options | `` r `` | Rename stash | |
<kbd>&lt;enter&gt;</kbd>: View selected item's files | `` w `` | View worktree options | |
<kbd>/</kbd>: Filter the current view by text | `` <enter> `` | View selected item's files | |
</pre> | `` / `` | Filter the current view by text | |
## Sub-commits ## Sub-commits
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: 커밋 SHA를 클립보드에 복사 |-----|--------|-------------|
<kbd>w</kbd>: View worktree options | `` <c-o> `` | 커밋 SHA를 클립보드에 복사 | |
<kbd>&lt;space&gt;</kbd>: 커밋을 체크아웃 | `` w `` | View worktree options | |
<kbd>y</kbd>: 커밋 attribute 복사 | `` <space> `` | 커밋을 체크아웃 | |
<kbd>o</kbd>: 브라우저에서 커밋 열기 | `` y `` | 커밋 attribute 복사 | |
<kbd>n</kbd>: 커밋에서 새 브랜치를 만듭니다. | `` o `` | 브라우저에서 커밋 열기 | |
<kbd>g</kbd>: View reset options | `` n `` | 커밋에서 새 브랜치를 만듭니다. | |
<kbd>C</kbd>: 커밋을 복사 (cherry-pick) | `` g `` | View reset options | |
<kbd>&lt;c-r&gt;</kbd>: Reset cherry-picked (copied) commits selection | `` C `` | 커밋을 복사 (cherry-pick) | |
<kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool) | `` <c-r> `` | Reset cherry-picked (copied) commits selection | |
<kbd>&lt;enter&gt;</kbd>: View selected item's files | `` <c-t> `` | Open external diff tool (git difftool) | |
<kbd>/</kbd>: 검색 시작 | `` <enter> `` | View selected item's files | |
</pre> | `` / `` | 검색 시작 | |
## Worktrees ## Worktrees
<pre> | Key | Action | Info |
<kbd>n</kbd>: Create worktree |-----|--------|-------------|
<kbd>&lt;space&gt;</kbd>: Switch to worktree | `` n `` | Create worktree | |
<kbd>&lt;enter&gt;</kbd>: Switch to worktree | `` <space> `` | Switch to worktree | |
<kbd>o</kbd>: Open in editor | `` <enter> `` | Switch to worktree | |
<kbd>d</kbd>: Remove worktree | `` o `` | Open in editor | |
<kbd>/</kbd>: Filter the current view by text | `` d `` | Remove worktree | |
</pre> | `` / `` | Filter the current view by text | |
## 메뉴 ## 메뉴
<pre> | Key | Action | Info |
<kbd>&lt;enter&gt;</kbd>: 실행 |-----|--------|-------------|
<kbd>&lt;esc&gt;</kbd>: 닫기 | `` <enter> `` | 실행 | |
<kbd>/</kbd>: Filter the current view by text | `` <esc> `` | 닫기 | |
</pre> | `` / `` | Filter the current view by text | |
## 메인 패널 (Merging) ## 메인 패널 (Merging)
<pre> | Key | Action | Info |
<kbd>e</kbd>: 파일 편집 |-----|--------|-------------|
<kbd>o</kbd>: 파일 닫기 | `` e `` | 파일 편집 | |
<kbd>&lt;left&gt;</kbd>: 이전 충돌을 선택 | `` o `` | 파일 닫기 | |
<kbd>&lt;right&gt;</kbd>: 다음 충돌을 선택 | `` <left> `` | 이전 충돌을 선택 | |
<kbd>&lt;up&gt;</kbd>: 이전 hunk를 선택 | `` <right> `` | 다음 충돌을 선택 | |
<kbd>&lt;down&gt;</kbd>: 다음 hunk를 선택 | `` <up> `` | 이전 hunk를 선택 | |
<kbd>z</kbd>: 되돌리기 | `` <down> `` | 다음 hunk를 선택 | |
<kbd>M</kbd>: Git mergetool를 열기 | `` z `` | 되돌리기 | |
<kbd>&lt;space&gt;</kbd>: Pick hunk | `` M `` | Git mergetool를 열기 | |
<kbd>b</kbd>: Pick all hunks | `` <space> `` | Pick hunk | |
<kbd>&lt;esc&gt;</kbd>: 파일 목록으로 돌아가기 | `` b `` | Pick all hunks | |
</pre> | `` <esc> `` | 파일 목록으로 돌아가기 | |
## 메인 패널 (Normal) ## 메인 패널 (Normal)
<pre> | Key | Action | Info |
<kbd>mouse wheel down</kbd>: 아래로 스크롤 (fn+up) |-----|--------|-------------|
<kbd>mouse wheel up</kbd>: 위로 스크롤 (fn+down) | `` mouse wheel down (fn+up) `` | 아래로 스크롤 | |
</pre> | `` mouse wheel up (fn+down) `` | 위로 스크롤 | |
## 메인 패널 (Patch Building) ## 메인 패널 (Patch Building)
<pre> | Key | Action | Info |
<kbd>&lt;left&gt;</kbd>: 이전 hunk를 선택 |-----|--------|-------------|
<kbd>&lt;right&gt;</kbd>: 다음 hunk를 선택 | `` <left> `` | 이전 hunk를 선택 | |
<kbd>v</kbd>: 드래그 선택 전환 | `` <right> `` | 다음 hunk를 선택 | |
<kbd>a</kbd>: Toggle select hunk | `` v `` | 드래그 선택 전환 | |
<kbd>&lt;c-o&gt;</kbd>: 선택한 텍스트를 클립보드에 복사 | `` a `` | Toggle select hunk | |
<kbd>o</kbd>: 파일 닫기 | `` <c-o> `` | 선택한 텍스트를 클립보드에 복사 | |
<kbd>e</kbd>: 파일 편집 | `` o `` | 파일 닫기 | |
<kbd>&lt;space&gt;</kbd>: Line(s)을 패치에 추가/삭제 | `` e `` | 파일 편집 | |
<kbd>&lt;esc&gt;</kbd>: Exit custom patch builder | `` <space> `` | Line(s)을 패치에 추가/삭제 | |
<kbd>/</kbd>: 검색 시작 | `` <esc> `` | Exit custom patch builder | |
</pre> | `` / `` | 검색 시작 | |
## 메인 패널 (Staging) ## 메인 패널 (Staging)
<pre> | Key | Action | Info |
<kbd>&lt;left&gt;</kbd>: 이전 hunk를 선택 |-----|--------|-------------|
<kbd>&lt;right&gt;</kbd>: 다음 hunk를 선택 | `` <left> `` | 이전 hunk를 선택 | |
<kbd>v</kbd>: 드래그 선택 전환 | `` <right> `` | 다음 hunk를 선택 | |
<kbd>a</kbd>: Toggle select hunk | `` v `` | 드래그 선택 전환 | |
<kbd>&lt;c-o&gt;</kbd>: 선택한 텍스트를 클립보드에 복사 | `` a `` | Toggle select hunk | |
<kbd>o</kbd>: 파일 닫기 | `` <c-o> `` | 선택한 텍스트를 클립보드에 복사 | |
<kbd>e</kbd>: 파일 편집 | `` o `` | 파일 닫기 | |
<kbd>&lt;esc&gt;</kbd>: 파일 목록으로 돌아가기 | `` e `` | 파일 편집 | |
<kbd>&lt;tab&gt;</kbd>: 패널 전환 | `` <esc> `` | 파일 목록으로 돌아가기 | |
<kbd>&lt;space&gt;</kbd>: 선택한 행을 staged / unstaged | `` <tab> `` | 패널 전환 | |
<kbd>d</kbd>: 변경을 삭제 (git reset) | `` <space> `` | 선택한 행을 staged / unstaged | |
<kbd>E</kbd>: Edit hunk | `` d `` | 변경을 삭제 (git reset) | |
<kbd>c</kbd>: 커밋 변경내용 | `` E `` | Edit hunk | |
<kbd>w</kbd>: Commit changes without pre-commit hook | `` c `` | 커밋 변경내용 | |
<kbd>C</kbd>: Git 편집기를 사용하여 변경 내용을 커밋합니다. | `` w `` | Commit changes without pre-commit hook | |
<kbd>/</kbd>: 검색 시작 | `` C `` | Git 편집기를 사용하여 변경 내용을 커밋합니다. | |
</pre> | `` / `` | 검색 시작 | |
## 브랜치 ## 브랜치
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: 브랜치명을 클립보드에 복사 |-----|--------|-------------|
<kbd>i</kbd>: Git-flow 옵션 보기 | `` <c-o> `` | 브랜치명을 클립보드에 복사 | |
<kbd>&lt;space&gt;</kbd>: 체크아웃 | `` i `` | Git-flow 옵션 보기 | |
<kbd>n</kbd>: 새 브랜치 생성 | `` <space> `` | 체크아웃 | |
<kbd>o</kbd>: 풀 리퀘스트 생성 | `` n `` | 새 브랜치 생성 | |
<kbd>O</kbd>: 풀 리퀘스트 생성 옵션 | `` o `` | 풀 리퀘스트 생성 | |
<kbd>&lt;c-y&gt;</kbd>: 풀 리퀘스트 URL을 클립보드에 복사 | `` O `` | 풀 리퀘스트 생성 옵션 | |
<kbd>c</kbd>: 이름으로 체크아웃 | `` <c-y> `` | 풀 리퀘스트 URL을 클립보드에 복사 | |
<kbd>F</kbd>: 강제 체크아웃 | `` c `` | 이름으로 체크아웃 | |
<kbd>d</kbd>: View delete options | `` F `` | 강제 체크아웃 | |
<kbd>r</kbd>: 체크아웃된 브랜치를 이 브랜치에 리베이스 | `` d `` | View delete options | |
<kbd>M</kbd>: 현재 브랜치에 병합 | `` r `` | 체크아웃된 브랜치를 이 브랜치에 리베이스 | |
<kbd>f</kbd>: Fast-forward this branch from its upstream | `` M `` | 현재 브랜치에 병합 | |
<kbd>T</kbd>: 태그를 생성 | `` f `` | Fast-forward this branch from its upstream | |
<kbd>s</kbd>: Sort order | `` T `` | 태그를 생성 | |
<kbd>g</kbd>: View reset options | `` s `` | Sort order | |
<kbd>R</kbd>: 브랜치 이름 변경 | `` g `` | View reset options | |
<kbd>u</kbd>: View upstream options | `` R `` | 브랜치 이름 변경 | |
<kbd>w</kbd>: View worktree options | `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream |
<kbd>&lt;enter&gt;</kbd>: 커밋 보기 | `` w `` | View worktree options | |
<kbd>/</kbd>: Filter the current view by text | `` <enter> `` | 커밋 보기 | |
</pre> | `` / `` | Filter the current view by text | |
## 상태 ## 상태
<pre> | Key | Action | Info |
<kbd>o</kbd>: 설정 파일 열기 |-----|--------|-------------|
<kbd>e</kbd>: 설정 파일 수정 | `` o `` | 설정 파일 열기 | |
<kbd>u</kbd>: 업데이트 확인 | `` e `` | 설정 파일 수정 | |
<kbd>&lt;enter&gt;</kbd>: 최근에 사용한 저장소로 전환 | `` u `` | 업데이트 확인 | |
<kbd>a</kbd>: 모든 브랜치 로그 표시 | `` <enter> `` | 최근에 사용한 저장소로 전환 | |
</pre> | `` a `` | 모든 브랜치 로그 표시 | |
## 서브모듈 ## 서브모듈
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: 서브모듈 이름을 클립보드에 복사 |-----|--------|-------------|
<kbd>&lt;enter&gt;</kbd>: 서브모듈 열기 | `` <c-o> `` | 서브모듈 이름을 클립보드에 복사 | |
<kbd>&lt;space&gt;</kbd>: 서브모듈 열기 | `` <enter> `` | 서브모듈 열기 | |
<kbd>d</kbd>: 서브모듈 삭제 | `` <space> `` | 서브모듈 열기 | |
<kbd>u</kbd>: 서브모듈 업데이트 | `` d `` | 서브모듈 삭제 | |
<kbd>n</kbd>: 새로운 서브모듈 추가 | `` u `` | 서브모듈 업데이트 | |
<kbd>e</kbd>: 서브모듈의 URL을 수정 | `` n `` | 새로운 서브모듈 추가 | |
<kbd>i</kbd>: 서브모듈 초기화 | `` e `` | 서브모듈의 URL을 수정 | |
<kbd>b</kbd>: View bulk submodule options | `` i `` | 서브모듈 초기화 | |
<kbd>/</kbd>: Filter the current view by text | `` b `` | View bulk submodule options | |
</pre> | `` / `` | Filter the current view by text | |
## 원격 ## 원격
<pre> | Key | Action | Info |
<kbd>f</kbd>: 원격을 업데이트 |-----|--------|-------------|
<kbd>n</kbd>: 새로운 Remote 추가 | `` f `` | 원격을 업데이트 | |
<kbd>d</kbd>: Remote를 삭제 | `` n `` | 새로운 Remote 추가 | |
<kbd>e</kbd>: Remote를 수정 | `` d `` | Remote를 삭제 | |
<kbd>/</kbd>: Filter the current view by text | `` e `` | Remote를 수정 | |
</pre> | `` / `` | Filter the current view by text | |
## 원격 브랜치 ## 원격 브랜치
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: 브랜치명을 클립보드에 복사 |-----|--------|-------------|
<kbd>&lt;space&gt;</kbd>: 체크아웃 | `` <c-o> `` | 브랜치명을 클립보드에 복사 | |
<kbd>n</kbd>: 새 브랜치 생성 | `` <space> `` | 체크아웃 | |
<kbd>M</kbd>: 현재 브랜치에 병합 | `` n `` | 새 브랜치 생성 | |
<kbd>r</kbd>: 체크아웃된 브랜치를 이 브랜치에 리베이스 | `` M `` | 현재 브랜치에 병합 | |
<kbd>d</kbd>: Delete remote tag | `` r `` | 체크아웃된 브랜치를 이 브랜치에 리베이스 | |
<kbd>u</kbd>: Set as upstream of checked-out branch | `` d `` | Delete remote tag | |
<kbd>s</kbd>: Sort order | `` u `` | Set as upstream of checked-out branch | |
<kbd>g</kbd>: View reset options | `` s `` | Sort order | |
<kbd>w</kbd>: View worktree options | `` g `` | View reset options | |
<kbd>&lt;enter&gt;</kbd>: 커밋 보기 | `` w `` | View worktree options | |
<kbd>/</kbd>: Filter the current view by text | `` <enter> `` | 커밋 보기 | |
</pre> | `` / `` | Filter the current view by text | |
## 커밋 ## 커밋
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: 커밋 SHA를 클립보드에 복사 |-----|--------|-------------|
<kbd>&lt;c-r&gt;</kbd>: Reset cherry-picked (copied) commits selection | `` <c-o> `` | 커밋 SHA를 클립보드에 복사 | |
<kbd>b</kbd>: Bisect 옵션 보기 | `` <c-r> `` | Reset cherry-picked (copied) commits selection | |
<kbd>s</kbd>: Squash down | `` b `` | Bisect 옵션 보기 | |
<kbd>f</kbd>: Fixup commit | `` s `` | Squash down | |
<kbd>r</kbd>: 커밋메시지 변경 | `` f `` | Fixup commit | |
<kbd>R</kbd>: 에디터에서 커밋메시지 수정 | `` r `` | 커밋메시지 변경 | |
<kbd>d</kbd>: 커밋 삭제 | `` R `` | 에디터에서 커밋메시지 수정 | |
<kbd>e</kbd>: 커밋을 편집 | `` d `` | 커밋 삭제 | |
<kbd>i</kbd>: Start interactive rebase | `` e `` | 커밋을 편집 | |
<kbd>p</kbd>: Pick commit (when mid-rebase) | `` 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.
<kbd>F</kbd>: Create fixup commit for this commit If you would instead like to start an interactive rebase from the selected commit, press `e`. |
<kbd>S</kbd>: Squash all 'fixup!' commits above selected commit (autosquash) | `` p `` | Pick commit (when mid-rebase) | |
<kbd>&lt;c-j&gt;</kbd>: 커밋을 1개 아래로 이동 | `` F `` | Create fixup commit for this commit | |
<kbd>&lt;c-k&gt;</kbd>: 커밋을 1개 위로 이동 | `` S `` | Squash all 'fixup!' commits above selected commit (autosquash) | |
<kbd>V</kbd>: 커밋을 붙여넣기 (cherry-pick) | `` <c-j> `` | 커밋을 1개 아래로 이동 | |
<kbd>B</kbd>: Mark commit as base commit for rebase | `` <c-k> `` | 커밋을 1개 위로 이동 | |
<kbd>A</kbd>: Amend commit with staged changes | `` V `` | 커밋을 붙여넣기 (cherry-pick) | |
<kbd>a</kbd>: Set/Reset commit author | `` B `` | Mark commit as base commit for rebase | Select a base commit for the next rebase; this will effectively perform a 'git rebase --onto'. |
<kbd>t</kbd>: 커밋 되돌리기 | `` A `` | Amend commit with staged changes | |
<kbd>T</kbd>: Tag commit | `` a `` | Set/Reset commit author | |
<kbd>&lt;c-l&gt;</kbd>: 로그 메뉴 열기 | `` t `` | 커밋 되돌리기 | |
<kbd>w</kbd>: View worktree options | `` T `` | Tag commit | |
<kbd>&lt;space&gt;</kbd>: 커밋을 체크아웃 | `` <c-l> `` | 로그 메뉴 열기 | |
<kbd>y</kbd>: 커밋 attribute 복사 | `` w `` | View worktree options | |
<kbd>o</kbd>: 브라우저에서 커밋 열기 | `` <space> `` | 커밋을 체크아웃 | |
<kbd>n</kbd>: 커밋에서 새 브랜치를 만듭니다. | `` y `` | 커밋 attribute 복사 | |
<kbd>g</kbd>: View reset options | `` o `` | 브라우저에서 커밋 열기 | |
<kbd>C</kbd>: 커밋을 복사 (cherry-pick) | `` n `` | 커밋에서 새 브랜치를 만듭니다. | |
<kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool) | `` g `` | View reset options | |
<kbd>&lt;enter&gt;</kbd>: View selected item's files | `` C `` | 커밋을 복사 (cherry-pick) | |
<kbd>/</kbd>: 검색 시작 | `` <c-t> `` | Open external diff tool (git difftool) | |
</pre> | `` <enter> `` | View selected item's files | |
| `` / `` | 검색 시작 | |
## 커밋 파일 ## 커밋 파일
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: 커밋한 파일명을 클립보드에 복사 |-----|--------|-------------|
<kbd>c</kbd>: Checkout file | `` <c-o> `` | 커밋한 파일명을 클립보드에 복사 | |
<kbd>d</kbd>: Discard this commit's changes to this file | `` c `` | Checkout file | |
<kbd>o</kbd>: 파일 닫기 | `` d `` | Discard this commit's changes to this file | |
<kbd>e</kbd>: 파일 편집 | `` o `` | 파일 닫기 | |
<kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool) | `` e `` | 파일 편집 | |
<kbd>&lt;space&gt;</kbd>: Toggle file included in patch | `` <c-t> `` | Open external diff tool (git difftool) | |
<kbd>a</kbd>: Toggle all files included in patch | `` <space> `` | Toggle file included in patch | |
<kbd>&lt;enter&gt;</kbd>: Enter file to add selected lines to the patch (or toggle directory collapsed) | `` a `` | Toggle all files included in patch | |
<kbd>`</kbd>: 파일 트리뷰로 전환 | `` <enter> `` | Enter file to add selected lines to the patch (or toggle directory collapsed) | |
<kbd>/</kbd>: 검색 시작 | `` ` `` | 파일 트리뷰로 전환 | |
</pre> | `` / `` | 검색 시작 | |
## 커밋메시지 ## 커밋메시지
<pre> | Key | Action | Info |
<kbd>&lt;enter&gt;</kbd>: 확인 |-----|--------|-------------|
<kbd>&lt;esc&gt;</kbd>: 닫기 | `` <enter> `` | 확인 | |
</pre> | `` <esc> `` | 닫기 | |
## 태그 ## 태그
<pre> | Key | Action | Info |
<kbd>&lt;space&gt;</kbd>: 체크아웃 |-----|--------|-------------|
<kbd>d</kbd>: View delete options | `` <space> `` | 체크아웃 | |
<kbd>P</kbd>: 태그를 push | `` d `` | View delete options | |
<kbd>n</kbd>: 태그를 생성 | `` P `` | 태그를 push | |
<kbd>g</kbd>: View reset options | `` n `` | 태그를 생성 | |
<kbd>w</kbd>: View worktree options | `` g `` | View reset options | |
<kbd>&lt;enter&gt;</kbd>: 커밋 보기 | `` w `` | View worktree options | |
<kbd>/</kbd>: Filter the current view by text | `` <enter> `` | 커밋 보기 | |
</pre> | `` / `` | Filter the current view by text | |
## 파일 ## 파일
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: 파일명을 클립보드에 복사 |-----|--------|-------------|
<kbd>&lt;space&gt;</kbd>: Staged 전환 | `` <c-o> `` | 파일명을 클립보드에 복사 | |
<kbd>&lt;c-b&gt;</kbd>: 파일을 필터하기 (Staged/unstaged) | `` <space> `` | Staged 전환 | |
<kbd>y</kbd>: Copy to clipboard | `` <c-b> `` | 파일을 필터하기 (Staged/unstaged) | |
<kbd>c</kbd>: 커밋 변경내용 | `` y `` | Copy to clipboard | |
<kbd>w</kbd>: Commit changes without pre-commit hook | `` c `` | 커밋 변경내용 | |
<kbd>A</kbd>: 마지맛 커밋 수정 | `` w `` | Commit changes without pre-commit hook | |
<kbd>C</kbd>: Git 편집기를 사용하여 변경 내용을 커밋합니다. | `` A `` | 마지맛 커밋 수정 | |
<kbd>&lt;c-f&gt;</kbd>: Find base commit for fixup | `` C `` | Git 편집기를 사용하여 변경 내용을 커밋합니다. | |
<kbd>e</kbd>: 파일 편집 | `` <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> |
<kbd>o</kbd>: 파일 닫기 | `` e `` | 파일 편집 | |
<kbd>i</kbd>: Ignore file | `` o `` | 파일 닫기 | |
<kbd>r</kbd>: 파일 새로고침 | `` i `` | Ignore file | |
<kbd>s</kbd>: 변경사항을 Stash | `` r `` | 파일 새로고침 | |
<kbd>S</kbd>: Stash 옵션 보기 | `` s `` | 변경사항을 Stash | |
<kbd>a</kbd>: 모든 변경을 Staged/unstaged으로 전환 | `` S `` | Stash 옵션 보기 | |
<kbd>&lt;enter&gt;</kbd>: Stage individual hunks/lines for file, or collapse/expand for directory | `` a `` | 모든 변경을 Staged/unstaged으로 전환 | |
<kbd>d</kbd>: View 'discard changes' options | `` <enter> `` | Stage individual hunks/lines for file, or collapse/expand for directory | |
<kbd>g</kbd>: View upstream reset options | `` d `` | View 'discard changes' options | |
<kbd>D</kbd>: View reset options | `` g `` | View upstream reset options | |
<kbd>`</kbd>: 파일 트리뷰로 전환 | `` D `` | View reset options | |
<kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool) | `` ` `` | 파일 트리뷰로 전환 | |
<kbd>M</kbd>: Git mergetool를 열기 | `` <c-t> `` | Open external diff tool (git difftool) | |
<kbd>f</kbd>: Fetch | `` M `` | Git mergetool를 열기 | |
<kbd>/</kbd>: 검색 시작 | `` f `` | Fetch | |
</pre> | `` / `` | 검색 시작 | |
## 확인 패널 ## 확인 패널
<pre> | Key | Action | Info |
<kbd>&lt;enter&gt;</kbd>: 확인 |-----|--------|-------------|
<kbd>&lt;esc&gt;</kbd>: 닫기/취소 | `` <enter> `` | 확인 | |
</pre> | `` <esc> `` | 닫기/취소 | |

View File

@ -6,356 +6,357 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
## Globale sneltoetsen ## Globale sneltoetsen
<pre> | Key | Action | Info |
<kbd>&lt;c-r&gt;</kbd>: Wissel naar een recente repo |-----|--------|-------------|
<kbd>&lt;pgup&gt;</kbd>: Scroll naar beneden vanaf hoofdpaneel (fn+up/shift+k) | `` <c-r> `` | Wissel naar een recente repo | |
<kbd>&lt;pgdown&gt;</kbd>: Scroll naar beneden vanaf hoofdpaneel (fn+down/shift+j) | `` <pgup> (fn+up/shift+k) `` | Scroll naar beneden vanaf hoofdpaneel | |
<kbd>@</kbd>: Open command log menu | `` <pgdown> (fn+down/shift+j) `` | Scroll naar beneden vanaf hoofdpaneel | |
<kbd>}</kbd>: Increase the size of the context shown around changes in the diff view | `` @ `` | Open command log menu | |
<kbd>{</kbd>: Decrease the size of the context shown around changes in the diff view | `` } `` | Increase the size of the context shown around changes in the diff view | |
<kbd>:</kbd>: Voer aangepaste commando uit | `` { `` | Decrease the size of the context shown around changes in the diff view | |
<kbd>&lt;c-p&gt;</kbd>: Bekijk aangepaste patch opties | `` : `` | Voer aangepaste commando uit | |
<kbd>m</kbd>: Bekijk merge/rebase opties | `` <c-p> `` | Bekijk aangepaste patch opties | |
<kbd>R</kbd>: Verversen | `` m `` | Bekijk merge/rebase opties | |
<kbd>+</kbd>: Volgende scherm modus (normaal/half/groot) | `` R `` | Verversen | |
<kbd>_</kbd>: Vorige scherm modus | `` + `` | Volgende scherm modus (normaal/half/groot) | |
<kbd>?</kbd>: Open menu | `` _ `` | Vorige scherm modus | |
<kbd>&lt;c-s&gt;</kbd>: Bekijk scoping opties | `` ? `` | Open menu | |
<kbd>W</kbd>: Open diff menu | `` <c-s> `` | Bekijk scoping opties | |
<kbd>&lt;c-e&gt;</kbd>: Open diff menu | `` W `` | Open diff menu | |
<kbd>&lt;c-w&gt;</kbd>: Toggle whether or not whitespace changes are shown in the diff view | `` <c-e> `` | Open diff menu | |
<kbd>z</kbd>: Ongedaan maken (via reflog) (experimenteel) | `` <c-w> `` | Toggle whether or not whitespace changes are shown in the diff view | |
<kbd>&lt;c-z&gt;</kbd>: Redo (via reflog) (experimenteel) | `` z `` | Ongedaan maken (via reflog) (experimenteel) | 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. |
<kbd>P</kbd>: Push | `` <c-z> `` | Redo (via reflog) (experimenteel) | 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. |
<kbd>p</kbd>: Pull | `` P `` | Push | |
</pre> | `` p `` | Pull | |
## Lijstpaneel navigatie ## Lijstpaneel navigatie
<pre> | Key | Action | Info |
<kbd>,</kbd>: Vorige pagina |-----|--------|-------------|
<kbd>.</kbd>: Volgende pagina | `` , `` | Vorige pagina | |
<kbd>&lt;</kbd>: Scroll naar boven | `` . `` | Volgende pagina | |
<kbd>&gt;</kbd>: Scroll naar beneden | `` < `` | Scroll naar boven | |
<kbd>v</kbd>: Toggle drag selecteer | `` > `` | Scroll naar beneden | |
<kbd>&lt;s-down&gt;</kbd>: Range select down | `` v `` | Toggle drag selecteer | |
<kbd>&lt;s-up&gt;</kbd>: Range select up | `` <s-down> `` | Range select down | |
<kbd>/</kbd>: Start met zoeken | `` <s-up> `` | Range select up | |
<kbd>H</kbd>: Scroll left | `` / `` | Start met zoeken | |
<kbd>L</kbd>: Scroll right | `` H `` | Scroll left | |
<kbd>]</kbd>: Volgende tabblad | `` L `` | Scroll right | |
<kbd>[</kbd>: Vorige tabblad | `` ] `` | Volgende tabblad | |
</pre> | `` [ `` | Vorige tabblad | |
## Bestanden ## Bestanden
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: Kopieer de bestandsnaam naar het klembord |-----|--------|-------------|
<kbd>&lt;space&gt;</kbd>: Toggle staged | `` <c-o> `` | Kopieer de bestandsnaam naar het klembord | |
<kbd>&lt;c-b&gt;</kbd>: Filter files by status | `` <space> `` | Toggle staged | |
<kbd>y</kbd>: Copy to clipboard | `` <c-b> `` | Filter files by status | |
<kbd>c</kbd>: Commit veranderingen | `` y `` | Copy to clipboard | |
<kbd>w</kbd>: Commit veranderingen zonder pre-commit hook | `` c `` | Commit veranderingen | |
<kbd>A</kbd>: Wijzig laatste commit | `` w `` | Commit veranderingen zonder pre-commit hook | |
<kbd>C</kbd>: Commit veranderingen met de git editor | `` A `` | Wijzig laatste commit | |
<kbd>&lt;c-f&gt;</kbd>: Find base commit for fixup | `` C `` | Commit veranderingen met de git editor | |
<kbd>e</kbd>: Verander bestand | `` <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> |
<kbd>o</kbd>: Open bestand | `` e `` | Verander bestand | |
<kbd>i</kbd>: Ignore or exclude file | `` o `` | Open bestand | |
<kbd>r</kbd>: Refresh bestanden | `` i `` | Ignore or exclude file | |
<kbd>s</kbd>: Stash-bestanden | `` r `` | Refresh bestanden | |
<kbd>S</kbd>: Bekijk stash opties | `` s `` | Stash-bestanden | |
<kbd>a</kbd>: Toggle staged alle | `` S `` | Bekijk stash opties | |
<kbd>&lt;enter&gt;</kbd>: Stage individuele hunks/lijnen | `` a `` | Toggle staged alle | |
<kbd>d</kbd>: Bekijk 'veranderingen ongedaan maken' opties | `` <enter> `` | Stage individuele hunks/lijnen | |
<kbd>g</kbd>: Bekijk upstream reset opties | `` d `` | Bekijk 'veranderingen ongedaan maken' opties | |
<kbd>D</kbd>: Bekijk reset opties | `` g `` | Bekijk upstream reset opties | |
<kbd>`</kbd>: Toggle bestandsboom weergave | `` D `` | Bekijk reset opties | |
<kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool) | `` ` `` | Toggle bestandsboom weergave | |
<kbd>M</kbd>: Open external merge tool (git mergetool) | `` <c-t> `` | Open external diff tool (git difftool) | |
<kbd>f</kbd>: Fetch | `` M `` | Open external merge tool (git mergetool) | |
<kbd>/</kbd>: Start met zoeken | `` f `` | Fetch | |
</pre> | `` / `` | Start met zoeken | |
## Bevestigingspaneel ## Bevestigingspaneel
<pre> | Key | Action | Info |
<kbd>&lt;enter&gt;</kbd>: Bevestig |-----|--------|-------------|
<kbd>&lt;esc&gt;</kbd>: Sluiten | `` <enter> `` | Bevestig | |
</pre> | `` <esc> `` | Sluiten | |
## Branches ## Branches
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: Kopieer branch name naar klembord |-----|--------|-------------|
<kbd>i</kbd>: Laat git-flow opties zien | `` <c-o> `` | Kopieer branch name naar klembord | |
<kbd>&lt;space&gt;</kbd>: Uitchecken | `` i `` | Laat git-flow opties zien | |
<kbd>n</kbd>: Nieuwe branch | `` <space> `` | Uitchecken | |
<kbd>o</kbd>: Maak een pull-request | `` n `` | Nieuwe branch | |
<kbd>O</kbd>: Bekijk opties voor pull-aanvraag | `` o `` | Maak een pull-request | |
<kbd>&lt;c-y&gt;</kbd>: Kopieer de URL van het pull-verzoek naar het klembord | `` O `` | Bekijk opties voor pull-aanvraag | |
<kbd>c</kbd>: Uitchecken bij naam | `` <c-y> `` | Kopieer de URL van het pull-verzoek naar het klembord | |
<kbd>F</kbd>: Forceer checkout | `` c `` | Uitchecken bij naam | |
<kbd>d</kbd>: View delete options | `` F `` | Forceer checkout | |
<kbd>r</kbd>: Rebase branch | `` d `` | View delete options | |
<kbd>M</kbd>: Merge in met huidige checked out branch | `` r `` | Rebase branch | |
<kbd>f</kbd>: Fast-forward deze branch vanaf zijn upstream | `` M `` | Merge in met huidige checked out branch | |
<kbd>T</kbd>: Creëer tag | `` f `` | Fast-forward deze branch vanaf zijn upstream | |
<kbd>s</kbd>: Sort order | `` T `` | Creëer tag | |
<kbd>g</kbd>: Bekijk reset opties | `` s `` | Sort order | |
<kbd>R</kbd>: Hernoem branch | `` g `` | Bekijk reset opties | |
<kbd>u</kbd>: View upstream options | `` R `` | Hernoem branch | |
<kbd>w</kbd>: View worktree options | `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream |
<kbd>&lt;enter&gt;</kbd>: Bekijk commits | `` w `` | View worktree options | |
<kbd>/</kbd>: Filter the current view by text | `` <enter> `` | Bekijk commits | |
</pre> | `` / `` | Filter the current view by text | |
## Commit bericht ## Commit bericht
<pre> | Key | Action | Info |
<kbd>&lt;enter&gt;</kbd>: Bevestig |-----|--------|-------------|
<kbd>&lt;esc&gt;</kbd>: Sluiten | `` <enter> `` | Bevestig | |
</pre> | `` <esc> `` | Sluiten | |
## Commit bestanden ## Commit bestanden
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: Kopieer de vastgelegde bestandsnaam naar het klembord |-----|--------|-------------|
<kbd>c</kbd>: Bestand uitchecken | `` <c-o> `` | Kopieer de vastgelegde bestandsnaam naar het klembord | |
<kbd>d</kbd>: Uitsluit deze commit zijn veranderingen aan dit bestand | `` c `` | Bestand uitchecken | |
<kbd>o</kbd>: Open bestand | `` d `` | Uitsluit deze commit zijn veranderingen aan dit bestand | |
<kbd>e</kbd>: Verander bestand | `` o `` | Open bestand | |
<kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool) | `` e `` | Verander bestand | |
<kbd>&lt;space&gt;</kbd>: Toggle bestand inbegrepen in patch | `` <c-t> `` | Open external diff tool (git difftool) | |
<kbd>a</kbd>: Toggle all files included in patch | `` <space> `` | Toggle bestand inbegrepen in patch | |
<kbd>&lt;enter&gt;</kbd>: Enter bestand om geselecteerde regels toe te voegen aan de patch | `` a `` | Toggle all files included in patch | |
<kbd>`</kbd>: Toggle bestandsboom weergave | `` <enter> `` | Enter bestand om geselecteerde regels toe te voegen aan de patch | |
<kbd>/</kbd>: Start met zoeken | `` ` `` | Toggle bestandsboom weergave | |
</pre> | `` / `` | Start met zoeken | |
## Commits ## Commits
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: Kopieer commit SHA naar klembord |-----|--------|-------------|
<kbd>&lt;c-r&gt;</kbd>: Reset cherry-picked (gekopieerde) commits selectie | `` <c-o> `` | Kopieer commit SHA naar klembord | |
<kbd>b</kbd>: View bisect options | `` <c-r> `` | Reset cherry-picked (gekopieerde) commits selectie | |
<kbd>s</kbd>: Squash beneden | `` b `` | View bisect options | |
<kbd>f</kbd>: Fixup commit | `` s `` | Squash beneden | |
<kbd>r</kbd>: Hernoem commit | `` f `` | Fixup commit | |
<kbd>R</kbd>: Hernoem commit met editor | `` r `` | Hernoem commit | |
<kbd>d</kbd>: Verwijder commit | `` R `` | Hernoem commit met editor | |
<kbd>e</kbd>: Wijzig commit | `` d `` | Verwijder commit | |
<kbd>i</kbd>: Start interactive rebase | `` e `` | Wijzig commit | |
<kbd>p</kbd>: Kies commit (wanneer midden in rebase) | `` 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.
<kbd>F</kbd>: Creëer fixup commit If you would instead like to start an interactive rebase from the selected commit, press `e`. |
<kbd>S</kbd>: Squash bovenstaande commits | `` p `` | Kies commit (wanneer midden in rebase) | |
<kbd>&lt;c-j&gt;</kbd>: Verplaats commit 1 naar beneden | `` F `` | Creëer fixup commit | |
<kbd>&lt;c-k&gt;</kbd>: Verplaats commit 1 naar boven | `` S `` | Squash bovenstaande commits | |
<kbd>V</kbd>: Plak commits (cherry-pick) | `` <c-j> `` | Verplaats commit 1 naar beneden | |
<kbd>B</kbd>: Mark commit as base commit for rebase | `` <c-k> `` | Verplaats commit 1 naar boven | |
<kbd>A</kbd>: Wijzig commit met staged veranderingen | `` V `` | Plak commits (cherry-pick) | |
<kbd>a</kbd>: Set/Reset commit author | `` B `` | Mark commit as base commit for rebase | Select a base commit for the next rebase; this will effectively perform a 'git rebase --onto'. |
<kbd>t</kbd>: Commit ongedaan maken | `` A `` | Wijzig commit met staged veranderingen | |
<kbd>T</kbd>: Tag commit | `` a `` | Set/Reset commit author | |
<kbd>&lt;c-l&gt;</kbd>: Open log menu | `` t `` | Commit ongedaan maken | |
<kbd>w</kbd>: View worktree options | `` T `` | Tag commit | |
<kbd>&lt;space&gt;</kbd>: Checkout commit | `` <c-l> `` | Open log menu | |
<kbd>y</kbd>: Copy commit attribute | `` w `` | View worktree options | |
<kbd>o</kbd>: Open commit in browser | `` <space> `` | Checkout commit | |
<kbd>n</kbd>: Creëer nieuwe branch van commit | `` y `` | Copy commit attribute | |
<kbd>g</kbd>: Bekijk reset opties | `` o `` | Open commit in browser | |
<kbd>C</kbd>: Kopieer commit (cherry-pick) | `` n `` | Creëer nieuwe branch van commit | |
<kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool) | `` g `` | Bekijk reset opties | |
<kbd>&lt;enter&gt;</kbd>: Bekijk gecommite bestanden | `` C `` | Kopieer commit (cherry-pick) | |
<kbd>/</kbd>: Start met zoeken | `` <c-t> `` | Open external diff tool (git difftool) | |
</pre> | `` <enter> `` | Bekijk gecommite bestanden | |
| `` / `` | Start met zoeken | |
## Menu ## Menu
<pre> | Key | Action | Info |
<kbd>&lt;enter&gt;</kbd>: Uitvoeren |-----|--------|-------------|
<kbd>&lt;esc&gt;</kbd>: Sluiten | `` <enter> `` | Uitvoeren | |
<kbd>/</kbd>: Filter the current view by text | `` <esc> `` | Sluiten | |
</pre> | `` / `` | Filter the current view by text | |
## Mergen ## Mergen
<pre> | Key | Action | Info |
<kbd>e</kbd>: Verander bestand |-----|--------|-------------|
<kbd>o</kbd>: Open bestand | `` e `` | Verander bestand | |
<kbd>&lt;left&gt;</kbd>: Selecteer voorgaand conflict | `` o `` | Open bestand | |
<kbd>&lt;right&gt;</kbd>: Selecteer volgende conflict | `` <left> `` | Selecteer voorgaand conflict | |
<kbd>&lt;up&gt;</kbd>: Selecteer bovenste hunk | `` <right> `` | Selecteer volgende conflict | |
<kbd>&lt;down&gt;</kbd>: Selecteer onderste hunk | `` <up> `` | Selecteer bovenste hunk | |
<kbd>z</kbd>: Ongedaan maken | `` <down> `` | Selecteer onderste hunk | |
<kbd>M</kbd>: Open external merge tool (git mergetool) | `` z `` | Ongedaan maken | |
<kbd>&lt;space&gt;</kbd>: Kies stuk | `` M `` | Open external merge tool (git mergetool) | |
<kbd>b</kbd>: Kies beide stukken | `` <space> `` | Kies stuk | |
<kbd>&lt;esc&gt;</kbd>: Ga terug naar het bestanden paneel | `` b `` | Kies beide stukken | |
</pre> | `` <esc> `` | Ga terug naar het bestanden paneel | |
## Normaal ## Normaal
<pre> | Key | Action | Info |
<kbd>mouse wheel down</kbd>: Scroll omlaag (fn+up) |-----|--------|-------------|
<kbd>mouse wheel up</kbd>: Scroll omhoog (fn+down) | `` mouse wheel down (fn+up) `` | Scroll omlaag | |
</pre> | `` mouse wheel up (fn+down) `` | Scroll omhoog | |
## Patch bouwen ## Patch bouwen
<pre> | Key | Action | Info |
<kbd>&lt;left&gt;</kbd>: Selecteer de vorige hunk |-----|--------|-------------|
<kbd>&lt;right&gt;</kbd>: Selecteer de volgende hunk | `` <left> `` | Selecteer de vorige hunk | |
<kbd>v</kbd>: Toggle drag selecteer | `` <right> `` | Selecteer de volgende hunk | |
<kbd>a</kbd>: Toggle selecteer hunk | `` v `` | Toggle drag selecteer | |
<kbd>&lt;c-o&gt;</kbd>: Copy the selected text to the clipboard | `` a `` | Toggle selecteer hunk | |
<kbd>o</kbd>: Open bestand | `` <c-o> `` | Copy the selected text to the clipboard | |
<kbd>e</kbd>: Verander bestand | `` o `` | Open bestand | |
<kbd>&lt;space&gt;</kbd>: Voeg toe/verwijder lijn(en) in patch | `` e `` | Verander bestand | |
<kbd>&lt;esc&gt;</kbd>: Sluit lijn-bij-lijn modus | `` <space> `` | Voeg toe/verwijder lijn(en) in patch | |
<kbd>/</kbd>: Start met zoeken | `` <esc> `` | Sluit lijn-bij-lijn modus | |
</pre> | `` / `` | Start met zoeken | |
## Reflog ## Reflog
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: Kopieer commit SHA naar klembord |-----|--------|-------------|
<kbd>w</kbd>: View worktree options | `` <c-o> `` | Kopieer commit SHA naar klembord | |
<kbd>&lt;space&gt;</kbd>: Checkout commit | `` w `` | View worktree options | |
<kbd>y</kbd>: Copy commit attribute | `` <space> `` | Checkout commit | |
<kbd>o</kbd>: Open commit in browser | `` y `` | Copy commit attribute | |
<kbd>n</kbd>: Creëer nieuwe branch van commit | `` o `` | Open commit in browser | |
<kbd>g</kbd>: Bekijk reset opties | `` n `` | Creëer nieuwe branch van commit | |
<kbd>C</kbd>: Kopieer commit (cherry-pick) | `` g `` | Bekijk reset opties | |
<kbd>&lt;c-r&gt;</kbd>: Reset cherry-picked (gekopieerde) commits selectie | `` C `` | Kopieer commit (cherry-pick) | |
<kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool) | `` <c-r> `` | Reset cherry-picked (gekopieerde) commits selectie | |
<kbd>&lt;enter&gt;</kbd>: Bekijk commits | `` <c-t> `` | Open external diff tool (git difftool) | |
<kbd>/</kbd>: Filter the current view by text | `` <enter> `` | Bekijk commits | |
</pre> | `` / `` | Filter the current view by text | |
## Remote branches ## Remote branches
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: Kopieer branch name naar klembord |-----|--------|-------------|
<kbd>&lt;space&gt;</kbd>: Uitchecken | `` <c-o> `` | Kopieer branch name naar klembord | |
<kbd>n</kbd>: Nieuwe branch | `` <space> `` | Uitchecken | |
<kbd>M</kbd>: Merge in met huidige checked out branch | `` n `` | Nieuwe branch | |
<kbd>r</kbd>: Rebase branch | `` M `` | Merge in met huidige checked out branch | |
<kbd>d</kbd>: Delete remote tag | `` r `` | Rebase branch | |
<kbd>u</kbd>: Stel in als upstream van uitgecheckte branch | `` d `` | Delete remote tag | |
<kbd>s</kbd>: Sort order | `` u `` | Stel in als upstream van uitgecheckte branch | |
<kbd>g</kbd>: Bekijk reset opties | `` s `` | Sort order | |
<kbd>w</kbd>: View worktree options | `` g `` | Bekijk reset opties | |
<kbd>&lt;enter&gt;</kbd>: Bekijk commits | `` w `` | View worktree options | |
<kbd>/</kbd>: Filter the current view by text | `` <enter> `` | Bekijk commits | |
</pre> | `` / `` | Filter the current view by text | |
## Remotes ## Remotes
<pre> | Key | Action | Info |
<kbd>f</kbd>: Fetch remote |-----|--------|-------------|
<kbd>n</kbd>: Voeg een nieuwe remote toe | `` f `` | Fetch remote | |
<kbd>d</kbd>: Verwijder remote | `` n `` | Voeg een nieuwe remote toe | |
<kbd>e</kbd>: Wijzig remote | `` d `` | Verwijder remote | |
<kbd>/</kbd>: Filter the current view by text | `` e `` | Wijzig remote | |
</pre> | `` / `` | Filter the current view by text | |
## Staging ## Staging
<pre> | Key | Action | Info |
<kbd>&lt;left&gt;</kbd>: Selecteer de vorige hunk |-----|--------|-------------|
<kbd>&lt;right&gt;</kbd>: Selecteer de volgende hunk | `` <left> `` | Selecteer de vorige hunk | |
<kbd>v</kbd>: Toggle drag selecteer | `` <right> `` | Selecteer de volgende hunk | |
<kbd>a</kbd>: Toggle selecteer hunk | `` v `` | Toggle drag selecteer | |
<kbd>&lt;c-o&gt;</kbd>: Copy the selected text to the clipboard | `` a `` | Toggle selecteer hunk | |
<kbd>o</kbd>: Open bestand | `` <c-o> `` | Copy the selected text to the clipboard | |
<kbd>e</kbd>: Verander bestand | `` o `` | Open bestand | |
<kbd>&lt;esc&gt;</kbd>: Ga terug naar het bestanden paneel | `` e `` | Verander bestand | |
<kbd>&lt;tab&gt;</kbd>: Ga naar een ander paneel | `` <esc> `` | Ga terug naar het bestanden paneel | |
<kbd>&lt;space&gt;</kbd>: Toggle lijnen staged / unstaged | `` <tab> `` | Ga naar een ander paneel | |
<kbd>d</kbd>: Verwijdert change (git reset) | `` <space> `` | Toggle lijnen staged / unstaged | |
<kbd>E</kbd>: Edit hunk | `` d `` | Verwijdert change (git reset) | |
<kbd>c</kbd>: Commit veranderingen | `` E `` | Edit hunk | |
<kbd>w</kbd>: Commit veranderingen zonder pre-commit hook | `` c `` | Commit veranderingen | |
<kbd>C</kbd>: Commit veranderingen met de git editor | `` w `` | Commit veranderingen zonder pre-commit hook | |
<kbd>/</kbd>: Start met zoeken | `` C `` | Commit veranderingen met de git editor | |
</pre> | `` / `` | Start met zoeken | |
## Stash ## Stash
<pre> | Key | Action | Info |
<kbd>&lt;space&gt;</kbd>: Toepassen |-----|--------|-------------|
<kbd>g</kbd>: Pop | `` <space> `` | Toepassen | |
<kbd>d</kbd>: Laten vallen | `` g `` | Pop | |
<kbd>n</kbd>: Nieuwe branch | `` d `` | Laten vallen | |
<kbd>r</kbd>: Rename stash | `` n `` | Nieuwe branch | |
<kbd>w</kbd>: View worktree options | `` r `` | Rename stash | |
<kbd>&lt;enter&gt;</kbd>: Bekijk gecommite bestanden | `` w `` | View worktree options | |
<kbd>/</kbd>: Filter the current view by text | `` <enter> `` | Bekijk gecommite bestanden | |
</pre> | `` / `` | Filter the current view by text | |
## Status ## Status
<pre> | Key | Action | Info |
<kbd>o</kbd>: Open config bestand |-----|--------|-------------|
<kbd>e</kbd>: Verander config bestand | `` o `` | Open config bestand | |
<kbd>u</kbd>: Check voor updates | `` e `` | Verander config bestand | |
<kbd>&lt;enter&gt;</kbd>: Wissel naar een recente repo | `` u `` | Check voor updates | |
<kbd>a</kbd>: Alle logs van de branch laten zien | `` <enter> `` | Wissel naar een recente repo | |
</pre> | `` a `` | Alle logs van de branch laten zien | |
## Sub-commits ## Sub-commits
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: Kopieer commit SHA naar klembord |-----|--------|-------------|
<kbd>w</kbd>: View worktree options | `` <c-o> `` | Kopieer commit SHA naar klembord | |
<kbd>&lt;space&gt;</kbd>: Checkout commit | `` w `` | View worktree options | |
<kbd>y</kbd>: Copy commit attribute | `` <space> `` | Checkout commit | |
<kbd>o</kbd>: Open commit in browser | `` y `` | Copy commit attribute | |
<kbd>n</kbd>: Creëer nieuwe branch van commit | `` o `` | Open commit in browser | |
<kbd>g</kbd>: Bekijk reset opties | `` n `` | Creëer nieuwe branch van commit | |
<kbd>C</kbd>: Kopieer commit (cherry-pick) | `` g `` | Bekijk reset opties | |
<kbd>&lt;c-r&gt;</kbd>: Reset cherry-picked (gekopieerde) commits selectie | `` C `` | Kopieer commit (cherry-pick) | |
<kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool) | `` <c-r> `` | Reset cherry-picked (gekopieerde) commits selectie | |
<kbd>&lt;enter&gt;</kbd>: Bekijk gecommite bestanden | `` <c-t> `` | Open external diff tool (git difftool) | |
<kbd>/</kbd>: Start met zoeken | `` <enter> `` | Bekijk gecommite bestanden | |
</pre> | `` / `` | Start met zoeken | |
## Submodules ## Submodules
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: Kopieer submodule naam naar klembord |-----|--------|-------------|
<kbd>&lt;enter&gt;</kbd>: Enter submodule | `` <c-o> `` | Kopieer submodule naam naar klembord | |
<kbd>&lt;space&gt;</kbd>: Enter submodule | `` <enter> `` | Enter submodule | |
<kbd>d</kbd>: Remove submodule | `` <space> `` | Enter submodule | |
<kbd>u</kbd>: Update submodule | `` d `` | Remove submodule | |
<kbd>n</kbd>: Voeg nieuwe submodule toe | `` u `` | Update submodule | |
<kbd>e</kbd>: Update submodule URL | `` n `` | Voeg nieuwe submodule toe | |
<kbd>i</kbd>: Initialiseer submodule | `` e `` | Update submodule URL | |
<kbd>b</kbd>: Bekijk bulk submodule opties | `` i `` | Initialiseer submodule | |
<kbd>/</kbd>: Filter the current view by text | `` b `` | Bekijk bulk submodule opties | |
</pre> | `` / `` | Filter the current view by text | |
## Tags ## Tags
<pre> | Key | Action | Info |
<kbd>&lt;space&gt;</kbd>: Uitchecken |-----|--------|-------------|
<kbd>d</kbd>: View delete options | `` <space> `` | Uitchecken | |
<kbd>P</kbd>: Push tag | `` d `` | View delete options | |
<kbd>n</kbd>: Creëer tag | `` P `` | Push tag | |
<kbd>g</kbd>: Bekijk reset opties | `` n `` | Creëer tag | |
<kbd>w</kbd>: View worktree options | `` g `` | Bekijk reset opties | |
<kbd>&lt;enter&gt;</kbd>: Bekijk commits | `` w `` | View worktree options | |
<kbd>/</kbd>: Filter the current view by text | `` <enter> `` | Bekijk commits | |
</pre> | `` / `` | Filter the current view by text | |
## Worktrees ## Worktrees
<pre> | Key | Action | Info |
<kbd>n</kbd>: Create worktree |-----|--------|-------------|
<kbd>&lt;space&gt;</kbd>: Switch to worktree | `` n `` | Create worktree | |
<kbd>&lt;enter&gt;</kbd>: Switch to worktree | `` <space> `` | Switch to worktree | |
<kbd>o</kbd>: Open in editor | `` <enter> `` | Switch to worktree | |
<kbd>d</kbd>: Remove worktree | `` o `` | Open in editor | |
<kbd>/</kbd>: Filter the current view by text | `` d `` | Remove worktree | |
</pre> | `` / `` | Filter the current view by text | |

View File

@ -6,356 +6,357 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
## Globalne ## Globalne
<pre> | Key | Action | Info |
<kbd>&lt;c-r&gt;</kbd>: Switch to a recent repo |-----|--------|-------------|
<kbd>&lt;pgup&gt;</kbd>: Scroll up main panel (fn+up/shift+k) | `` <c-r> `` | Switch to a recent repo | |
<kbd>&lt;pgdown&gt;</kbd>: Scroll down main panel (fn+down/shift+j) | `` <pgup> (fn+up/shift+k) `` | Scroll up main panel | |
<kbd>@</kbd>: Open command log menu | `` <pgdown> (fn+down/shift+j) `` | Scroll down main panel | |
<kbd>}</kbd>: Increase the size of the context shown around changes in the diff view | `` @ `` | Open command log menu | |
<kbd>{</kbd>: Decrease the size of the context shown around changes in the diff view | `` } `` | Increase the size of the context shown around changes in the diff view | |
<kbd>:</kbd>: Wykonaj własną komendę | `` { `` | Decrease the size of the context shown around changes in the diff view | |
<kbd>&lt;c-p&gt;</kbd>: View custom patch options | `` : `` | Wykonaj własną komendę | |
<kbd>m</kbd>: Widok scalenia/opcje zmiany bazy | `` <c-p> `` | View custom patch options | |
<kbd>R</kbd>: Odśwież | `` m `` | Widok scalenia/opcje zmiany bazy | |
<kbd>+</kbd>: Next screen mode (normal/half/fullscreen) | `` R `` | Odśwież | |
<kbd>_</kbd>: Prev screen mode | `` + `` | Next screen mode (normal/half/fullscreen) | |
<kbd>?</kbd>: Open menu | `` _ `` | Prev screen mode | |
<kbd>&lt;c-s&gt;</kbd>: View filter-by-path options | `` ? `` | Open menu | |
<kbd>W</kbd>: Open diff menu | `` <c-s> `` | View filter-by-path options | |
<kbd>&lt;c-e&gt;</kbd>: Open diff menu | `` W `` | Open diff menu | |
<kbd>&lt;c-w&gt;</kbd>: Toggle whether or not whitespace changes are shown in the diff view | `` <c-e> `` | Open diff menu | |
<kbd>z</kbd>: Undo | `` <c-w> `` | Toggle whether or not whitespace changes are shown in the diff view | |
<kbd>&lt;c-z&gt;</kbd>: Redo | `` 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. |
<kbd>P</kbd>: Push | `` <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. |
<kbd>p</kbd>: Pull | `` P `` | Push | |
</pre> | `` p `` | Pull | |
## List panel navigation ## List panel navigation
<pre> | Key | Action | Info |
<kbd>,</kbd>: Previous page |-----|--------|-------------|
<kbd>.</kbd>: Next page | `` , `` | Previous page | |
<kbd>&lt;</kbd>: Scroll to top | `` . `` | Next page | |
<kbd>&gt;</kbd>: Scroll to bottom | `` < `` | Scroll to top | |
<kbd>v</kbd>: Toggle range select | `` > `` | Scroll to bottom | |
<kbd>&lt;s-down&gt;</kbd>: Range select down | `` v `` | Toggle range select | |
<kbd>&lt;s-up&gt;</kbd>: Range select up | `` <s-down> `` | Range select down | |
<kbd>/</kbd>: Search the current view by text | `` <s-up> `` | Range select up | |
<kbd>H</kbd>: Scroll left | `` / `` | Search the current view by text | |
<kbd>L</kbd>: Scroll right | `` H `` | Scroll left | |
<kbd>]</kbd>: Next tab | `` L `` | Scroll right | |
<kbd>[</kbd>: Previous tab | `` ] `` | Next tab | |
</pre> | `` [ `` | Previous tab | |
## Commit summary ## Commit summary
<pre> | Key | Action | Info |
<kbd>&lt;enter&gt;</kbd>: Potwierdź |-----|--------|-------------|
<kbd>&lt;esc&gt;</kbd>: Zamknij | `` <enter> `` | Potwierdź | |
</pre> | `` <esc> `` | Zamknij | |
## Commity ## Commity
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: Copy commit SHA to clipboard |-----|--------|-------------|
<kbd>&lt;c-r&gt;</kbd>: Reset cherry-picked (copied) commits selection | `` <c-o> `` | Copy commit SHA to clipboard | |
<kbd>b</kbd>: View bisect options | `` <c-r> `` | Reset cherry-picked (copied) commits selection | |
<kbd>s</kbd>: Ściśnij | `` b `` | View bisect options | |
<kbd>f</kbd>: Napraw commit | `` s `` | Ściśnij | |
<kbd>r</kbd>: Zmień nazwę commita | `` f `` | Napraw commit | |
<kbd>R</kbd>: Zmień nazwę commita w edytorze | `` r `` | Zmień nazwę commita | |
<kbd>d</kbd>: Usuń commit | `` R `` | Zmień nazwę commita w edytorze | |
<kbd>e</kbd>: Edytuj commit | `` d `` | Usuń commit | |
<kbd>i</kbd>: Start interactive rebase | `` e `` | Edytuj commit | |
<kbd>p</kbd>: Wybierz commit (podczas zmiany bazy) | `` 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.
<kbd>F</kbd>: Utwórz commit naprawczy dla tego commita If you would instead like to start an interactive rebase from the selected commit, press `e`. |
<kbd>S</kbd>: Spłaszcz wszystkie commity naprawcze powyżej zaznaczonych commitów (autosquash) | `` p `` | Wybierz commit (podczas zmiany bazy) | |
<kbd>&lt;c-j&gt;</kbd>: Przenieś commit 1 w dół | `` F `` | Utwórz commit naprawczy dla tego commita | |
<kbd>&lt;c-k&gt;</kbd>: Przenieś commit 1 w górę | `` S `` | Spłaszcz wszystkie commity naprawcze powyżej zaznaczonych commitów (autosquash) | |
<kbd>V</kbd>: Wklej commity (przebieranie) | `` <c-j> `` | Przenieś commit 1 w dół | |
<kbd>B</kbd>: Mark commit as base commit for rebase | `` <c-k> `` | Przenieś commit 1 w górę | |
<kbd>A</kbd>: Popraw commit zmianami z poczekalni | `` V `` | Wklej commity (przebieranie) | |
<kbd>a</kbd>: Set/Reset commit author | `` B `` | Mark commit as base commit for rebase | Select a base commit for the next rebase; this will effectively perform a 'git rebase --onto'. |
<kbd>t</kbd>: Odwróć commit | `` A `` | Popraw commit zmianami z poczekalni | |
<kbd>T</kbd>: Tag commit | `` a `` | Set/Reset commit author | |
<kbd>&lt;c-l&gt;</kbd>: Open log menu | `` t `` | Odwróć commit | |
<kbd>w</kbd>: View worktree options | `` T `` | Tag commit | |
<kbd>&lt;space&gt;</kbd>: Checkout commit | `` <c-l> `` | Open log menu | |
<kbd>y</kbd>: Copy commit attribute | `` w `` | View worktree options | |
<kbd>o</kbd>: Open commit in browser | `` <space> `` | Checkout commit | |
<kbd>n</kbd>: Create new branch off of commit | `` y `` | Copy commit attribute | |
<kbd>g</kbd>: Wyświetl opcje resetu | `` o `` | Open commit in browser | |
<kbd>C</kbd>: Kopiuj commit (przebieranie) | `` n `` | Create new branch off of commit | |
<kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool) | `` g `` | Wyświetl opcje resetu | |
<kbd>&lt;enter&gt;</kbd>: Przeglądaj pliki commita | `` C `` | Kopiuj commit (przebieranie) | |
<kbd>/</kbd>: Search the current view by text | `` <c-t> `` | Open external diff tool (git difftool) | |
</pre> | `` <enter> `` | Przeglądaj pliki commita | |
| `` / `` | Search the current view by text | |
## Confirmation panel ## Confirmation panel
<pre> | Key | Action | Info |
<kbd>&lt;enter&gt;</kbd>: Potwierdź |-----|--------|-------------|
<kbd>&lt;esc&gt;</kbd>: Zamknij | `` <enter> `` | Potwierdź | |
</pre> | `` <esc> `` | Zamknij | |
## Local branches ## Local branches
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: Copy branch name to clipboard |-----|--------|-------------|
<kbd>i</kbd>: Show git-flow options | `` <c-o> `` | Copy branch name to clipboard | |
<kbd>&lt;space&gt;</kbd>: Przełącz | `` i `` | Show git-flow options | |
<kbd>n</kbd>: Nowa gałąź | `` <space> `` | Przełącz | |
<kbd>o</kbd>: Utwórz żądanie pobrania | `` n `` | Nowa gałąź | |
<kbd>O</kbd>: Utwórz opcje żądania ściągnięcia | `` o `` | Utwórz żądanie pobrania | |
<kbd>&lt;c-y&gt;</kbd>: Skopiuj adres URL żądania pobrania do schowka | `` O `` | Utwórz opcje żądania ściągnięcia | |
<kbd>c</kbd>: Przełącz używając nazwy | `` <c-y> `` | Skopiuj adres URL żądania pobrania do schowka | |
<kbd>F</kbd>: Wymuś przełączenie | `` c `` | Przełącz używając nazwy | |
<kbd>d</kbd>: View delete options | `` F `` | Wymuś przełączenie | |
<kbd>r</kbd>: Zmiana bazy gałęzi | `` d `` | View delete options | |
<kbd>M</kbd>: Scal do obecnej gałęzi | `` r `` | Zmiana bazy gałęzi | |
<kbd>f</kbd>: Fast-forward this branch from its upstream | `` M `` | Scal do obecnej gałęzi | |
<kbd>T</kbd>: Create tag | `` f `` | Fast-forward this branch from its upstream | |
<kbd>s</kbd>: Sort order | `` T `` | Create tag | |
<kbd>g</kbd>: Wyświetl opcje resetu | `` s `` | Sort order | |
<kbd>R</kbd>: Rename branch | `` g `` | Wyświetl opcje resetu | |
<kbd>u</kbd>: View upstream options | `` R `` | Rename branch | |
<kbd>w</kbd>: View worktree options | `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream |
<kbd>&lt;enter&gt;</kbd>: View commits | `` w `` | View worktree options | |
<kbd>/</kbd>: Filter the current view by text | `` <enter> `` | View commits | |
</pre> | `` / `` | Filter the current view by text | |
## Main panel (patch building) ## Main panel (patch building)
<pre> | Key | Action | Info |
<kbd>&lt;left&gt;</kbd>: Poprzedni kawałek |-----|--------|-------------|
<kbd>&lt;right&gt;</kbd>: Następny kawałek | `` <left> `` | Poprzedni kawałek | |
<kbd>v</kbd>: Toggle range select | `` <right> `` | Następny kawałek | |
<kbd>a</kbd>: Toggle select hunk | `` v `` | Toggle range select | |
<kbd>&lt;c-o&gt;</kbd>: Copy the selected text to the clipboard | `` a `` | Toggle select hunk | |
<kbd>o</kbd>: Otwórz plik | `` <c-o> `` | Copy the selected text to the clipboard | |
<kbd>e</kbd>: Edytuj plik | `` o `` | Otwórz plik | |
<kbd>&lt;space&gt;</kbd>: Add/Remove line(s) to patch | `` e `` | Edytuj plik | |
<kbd>&lt;esc&gt;</kbd>: Wyście z trybu "linia po linii" | `` <space> `` | Add/Remove line(s) to patch | |
<kbd>/</kbd>: Search the current view by text | `` <esc> `` | Wyście z trybu "linia po linii" | |
</pre> | `` / `` | Search the current view by text | |
## Menu ## Menu
<pre> | Key | Action | Info |
<kbd>&lt;enter&gt;</kbd>: Wykonaj |-----|--------|-------------|
<kbd>&lt;esc&gt;</kbd>: Zamknij | `` <enter> `` | Wykonaj | |
<kbd>/</kbd>: Filter the current view by text | `` <esc> `` | Zamknij | |
</pre> | `` / `` | Filter the current view by text | |
## Pliki ## Pliki
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: Copy the file name to the clipboard |-----|--------|-------------|
<kbd>&lt;space&gt;</kbd>: Przełącz stan poczekalni | `` <c-o> `` | Copy the file name to the clipboard | |
<kbd>&lt;c-b&gt;</kbd>: Filter files by status | `` <space> `` | Przełącz stan poczekalni | |
<kbd>y</kbd>: Copy to clipboard | `` <c-b> `` | Filter files by status | |
<kbd>c</kbd>: Zatwierdź zmiany | `` y `` | Copy to clipboard | |
<kbd>w</kbd>: Zatwierdź zmiany bez skryptu pre-commit | `` c `` | Zatwierdź zmiany | |
<kbd>A</kbd>: Zmień ostatni commit | `` w `` | Zatwierdź zmiany bez skryptu pre-commit | |
<kbd>C</kbd>: Zatwierdź zmiany używając edytora | `` A `` | Zmień ostatni commit | |
<kbd>&lt;c-f&gt;</kbd>: Find base commit for fixup | `` C `` | Zatwierdź zmiany używając edytora | |
<kbd>e</kbd>: Edytuj plik | `` <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> |
<kbd>o</kbd>: Otwórz plik | `` e `` | Edytuj plik | |
<kbd>i</kbd>: Ignore or exclude file | `` o `` | Otwórz plik | |
<kbd>r</kbd>: Odśwież pliki | `` i `` | Ignore or exclude file | |
<kbd>s</kbd>: Przechowaj zmiany | `` r `` | Odśwież pliki | |
<kbd>S</kbd>: Wyświetl opcje schowka | `` s `` | Przechowaj zmiany | |
<kbd>a</kbd>: Przełącz stan poczekalni wszystkich | `` S `` | Wyświetl opcje schowka | |
<kbd>&lt;enter&gt;</kbd>: Zatwierdź pojedyncze linie | `` a `` | Przełącz stan poczekalni wszystkich | |
<kbd>d</kbd>: Pokaż opcje porzucania zmian | `` <enter> `` | Zatwierdź pojedyncze linie | |
<kbd>g</kbd>: View upstream reset options | `` d `` | Pokaż opcje porzucania zmian | |
<kbd>D</kbd>: Wyświetl opcje resetu | `` g `` | View upstream reset options | |
<kbd>`</kbd>: Toggle file tree view | `` D `` | Wyświetl opcje resetu | |
<kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool) | `` ` `` | Toggle file tree view | |
<kbd>M</kbd>: Open external merge tool (git mergetool) | `` <c-t> `` | Open external diff tool (git difftool) | |
<kbd>f</kbd>: Pobierz | `` M `` | Open external merge tool (git mergetool) | |
<kbd>/</kbd>: Search the current view by text | `` f `` | Pobierz | |
</pre> | `` / `` | Search the current view by text | |
## Pliki commita ## Pliki commita
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: Copy the committed file name to the clipboard |-----|--------|-------------|
<kbd>c</kbd>: Plik wybierania | `` <c-o> `` | Copy the committed file name to the clipboard | |
<kbd>d</kbd>: Porzuć zmiany commita dla tego pliku | `` c `` | Plik wybierania | |
<kbd>o</kbd>: Otwórz plik | `` d `` | Porzuć zmiany commita dla tego pliku | |
<kbd>e</kbd>: Edytuj plik | `` o `` | Otwórz plik | |
<kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool) | `` e `` | Edytuj plik | |
<kbd>&lt;space&gt;</kbd>: Toggle file included in patch | `` <c-t> `` | Open external diff tool (git difftool) | |
<kbd>a</kbd>: Toggle all files included in patch | `` <space> `` | Toggle file included in patch | |
<kbd>&lt;enter&gt;</kbd>: Enter file to add selected lines to the patch (or toggle directory collapsed) | `` a `` | Toggle all files included in patch | |
<kbd>`</kbd>: Toggle file tree view | `` <enter> `` | Enter file to add selected lines to the patch (or toggle directory collapsed) | |
<kbd>/</kbd>: Search the current view by text | `` ` `` | Toggle file tree view | |
</pre> | `` / `` | Search the current view by text | |
## Poczekalnia ## Poczekalnia
<pre> | Key | Action | Info |
<kbd>&lt;left&gt;</kbd>: Poprzedni kawałek |-----|--------|-------------|
<kbd>&lt;right&gt;</kbd>: Następny kawałek | `` <left> `` | Poprzedni kawałek | |
<kbd>v</kbd>: Toggle range select | `` <right> `` | Następny kawałek | |
<kbd>a</kbd>: Toggle select hunk | `` v `` | Toggle range select | |
<kbd>&lt;c-o&gt;</kbd>: Copy the selected text to the clipboard | `` a `` | Toggle select hunk | |
<kbd>o</kbd>: Otwórz plik | `` <c-o> `` | Copy the selected text to the clipboard | |
<kbd>e</kbd>: Edytuj plik | `` o `` | Otwórz plik | |
<kbd>&lt;esc&gt;</kbd>: Wróć do panelu plików | `` e `` | Edytuj plik | |
<kbd>&lt;tab&gt;</kbd>: Switch to other panel (staged/unstaged changes) | `` <esc> `` | Wróć do panelu plików | |
<kbd>&lt;space&gt;</kbd>: Toggle line staged / unstaged | `` <tab> `` | Switch to other panel (staged/unstaged changes) | |
<kbd>d</kbd>: Discard change (git reset) | `` <space> `` | Toggle line staged / unstaged | |
<kbd>E</kbd>: Edit hunk | `` d `` | Discard change (git reset) | |
<kbd>c</kbd>: Zatwierdź zmiany | `` E `` | Edit hunk | |
<kbd>w</kbd>: Zatwierdź zmiany bez skryptu pre-commit | `` c `` | Zatwierdź zmiany | |
<kbd>C</kbd>: Zatwierdź zmiany używając edytora | `` w `` | Zatwierdź zmiany bez skryptu pre-commit | |
<kbd>/</kbd>: Search the current view by text | `` C `` | Zatwierdź zmiany używając edytora | |
</pre> | `` / `` | Search the current view by text | |
## Reflog ## Reflog
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: Copy commit SHA to clipboard |-----|--------|-------------|
<kbd>w</kbd>: View worktree options | `` <c-o> `` | Copy commit SHA to clipboard | |
<kbd>&lt;space&gt;</kbd>: Checkout commit | `` w `` | View worktree options | |
<kbd>y</kbd>: Copy commit attribute | `` <space> `` | Checkout commit | |
<kbd>o</kbd>: Open commit in browser | `` y `` | Copy commit attribute | |
<kbd>n</kbd>: Create new branch off of commit | `` o `` | Open commit in browser | |
<kbd>g</kbd>: Wyświetl opcje resetu | `` n `` | Create new branch off of commit | |
<kbd>C</kbd>: Kopiuj commit (przebieranie) | `` g `` | Wyświetl opcje resetu | |
<kbd>&lt;c-r&gt;</kbd>: Reset cherry-picked (copied) commits selection | `` C `` | Kopiuj commit (przebieranie) | |
<kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool) | `` <c-r> `` | Reset cherry-picked (copied) commits selection | |
<kbd>&lt;enter&gt;</kbd>: View commits | `` <c-t> `` | Open external diff tool (git difftool) | |
<kbd>/</kbd>: Filter the current view by text | `` <enter> `` | View commits | |
</pre> | `` / `` | Filter the current view by text | |
## Remote branches ## Remote branches
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: Copy branch name to clipboard |-----|--------|-------------|
<kbd>&lt;space&gt;</kbd>: Przełącz | `` <c-o> `` | Copy branch name to clipboard | |
<kbd>n</kbd>: Nowa gałąź | `` <space> `` | Przełącz | |
<kbd>M</kbd>: Scal do obecnej gałęzi | `` n `` | Nowa gałąź | |
<kbd>r</kbd>: Zmiana bazy gałęzi | `` M `` | Scal do obecnej gałęzi | |
<kbd>d</kbd>: Delete remote tag | `` r `` | Zmiana bazy gałęzi | |
<kbd>u</kbd>: Set as upstream of checked-out branch | `` d `` | Delete remote tag | |
<kbd>s</kbd>: Sort order | `` u `` | Set as upstream of checked-out branch | |
<kbd>g</kbd>: Wyświetl opcje resetu | `` s `` | Sort order | |
<kbd>w</kbd>: View worktree options | `` g `` | Wyświetl opcje resetu | |
<kbd>&lt;enter&gt;</kbd>: View commits | `` w `` | View worktree options | |
<kbd>/</kbd>: Filter the current view by text | `` <enter> `` | View commits | |
</pre> | `` / `` | Filter the current view by text | |
## Remotes ## Remotes
<pre> | Key | Action | Info |
<kbd>f</kbd>: Fetch remote |-----|--------|-------------|
<kbd>n</kbd>: Add new remote | `` f `` | Fetch remote | |
<kbd>d</kbd>: Remove remote | `` n `` | Add new remote | |
<kbd>e</kbd>: Edit remote | `` d `` | Remove remote | |
<kbd>/</kbd>: Filter the current view by text | `` e `` | Edit remote | |
</pre> | `` / `` | Filter the current view by text | |
## Scalanie ## Scalanie
<pre> | Key | Action | Info |
<kbd>e</kbd>: Edytuj plik |-----|--------|-------------|
<kbd>o</kbd>: Otwórz plik | `` e `` | Edytuj plik | |
<kbd>&lt;left&gt;</kbd>: Poprzedni konflikt | `` o `` | Otwórz plik | |
<kbd>&lt;right&gt;</kbd>: Następny konflikt | `` <left> `` | Poprzedni konflikt | |
<kbd>&lt;up&gt;</kbd>: Wybierz poprzedni kawałek | `` <right> `` | Następny konflikt | |
<kbd>&lt;down&gt;</kbd>: Wybierz następny kawałek | `` <up> `` | Wybierz poprzedni kawałek | |
<kbd>z</kbd>: Cofnij | `` <down> `` | Wybierz następny kawałek | |
<kbd>M</kbd>: Open external merge tool (git mergetool) | `` z `` | Cofnij | |
<kbd>&lt;space&gt;</kbd>: Wybierz kawałek | `` M `` | Open external merge tool (git mergetool) | |
<kbd>b</kbd>: Wybierz oba kawałki | `` <space> `` | Wybierz kawałek | |
<kbd>&lt;esc&gt;</kbd>: Wróć do panelu plików | `` b `` | Wybierz oba kawałki | |
</pre> | `` <esc> `` | Wróć do panelu plików | |
## Schowek ## Schowek
<pre> | Key | Action | Info |
<kbd>&lt;space&gt;</kbd>: Zastosuj |-----|--------|-------------|
<kbd>g</kbd>: Wyciągnij | `` <space> `` | Zastosuj | |
<kbd>d</kbd>: Porzuć | `` g `` | Wyciągnij | |
<kbd>n</kbd>: Nowa gałąź | `` d `` | Porzuć | |
<kbd>r</kbd>: Rename stash | `` n `` | Nowa gałąź | |
<kbd>w</kbd>: View worktree options | `` r `` | Rename stash | |
<kbd>&lt;enter&gt;</kbd>: Przeglądaj pliki commita | `` w `` | View worktree options | |
<kbd>/</kbd>: Filter the current view by text | `` <enter> `` | Przeglądaj pliki commita | |
</pre> | `` / `` | Filter the current view by text | |
## Status ## Status
<pre> | Key | Action | Info |
<kbd>o</kbd>: Otwórz konfigurację |-----|--------|-------------|
<kbd>e</kbd>: Edytuj konfigurację | `` o `` | Otwórz konfigurację | |
<kbd>u</kbd>: Sprawdź aktualizacje | `` e `` | Edytuj konfigurację | |
<kbd>&lt;enter&gt;</kbd>: Switch to a recent repo | `` u `` | Sprawdź aktualizacje | |
<kbd>a</kbd>: Pokaż wszystkie logi gałęzi | `` <enter> `` | Switch to a recent repo | |
</pre> | `` a `` | Pokaż wszystkie logi gałęzi | |
## Sub-commits ## Sub-commits
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: Copy commit SHA to clipboard |-----|--------|-------------|
<kbd>w</kbd>: View worktree options | `` <c-o> `` | Copy commit SHA to clipboard | |
<kbd>&lt;space&gt;</kbd>: Checkout commit | `` w `` | View worktree options | |
<kbd>y</kbd>: Copy commit attribute | `` <space> `` | Checkout commit | |
<kbd>o</kbd>: Open commit in browser | `` y `` | Copy commit attribute | |
<kbd>n</kbd>: Create new branch off of commit | `` o `` | Open commit in browser | |
<kbd>g</kbd>: Wyświetl opcje resetu | `` n `` | Create new branch off of commit | |
<kbd>C</kbd>: Kopiuj commit (przebieranie) | `` g `` | Wyświetl opcje resetu | |
<kbd>&lt;c-r&gt;</kbd>: Reset cherry-picked (copied) commits selection | `` C `` | Kopiuj commit (przebieranie) | |
<kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool) | `` <c-r> `` | Reset cherry-picked (copied) commits selection | |
<kbd>&lt;enter&gt;</kbd>: Przeglądaj pliki commita | `` <c-t> `` | Open external diff tool (git difftool) | |
<kbd>/</kbd>: Search the current view by text | `` <enter> `` | Przeglądaj pliki commita | |
</pre> | `` / `` | Search the current view by text | |
## Submodules ## Submodules
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: Copy submodule name to clipboard |-----|--------|-------------|
<kbd>&lt;enter&gt;</kbd>: Enter submodule | `` <c-o> `` | Copy submodule name to clipboard | |
<kbd>&lt;space&gt;</kbd>: Enter submodule | `` <enter> `` | Enter submodule | |
<kbd>d</kbd>: Remove submodule | `` <space> `` | Enter submodule | |
<kbd>u</kbd>: Update submodule | `` d `` | Remove submodule | |
<kbd>n</kbd>: Add new submodule | `` u `` | Update submodule | |
<kbd>e</kbd>: Update submodule URL | `` n `` | Add new submodule | |
<kbd>i</kbd>: Initialize submodule | `` e `` | Update submodule URL | |
<kbd>b</kbd>: View bulk submodule options | `` i `` | Initialize submodule | |
<kbd>/</kbd>: Filter the current view by text | `` b `` | View bulk submodule options | |
</pre> | `` / `` | Filter the current view by text | |
## Tags ## Tags
<pre> | Key | Action | Info |
<kbd>&lt;space&gt;</kbd>: Przełącz |-----|--------|-------------|
<kbd>d</kbd>: View delete options | `` <space> `` | Przełącz | |
<kbd>P</kbd>: Push tag | `` d `` | View delete options | |
<kbd>n</kbd>: Create tag | `` P `` | Push tag | |
<kbd>g</kbd>: Wyświetl opcje resetu | `` n `` | Create tag | |
<kbd>w</kbd>: View worktree options | `` g `` | Wyświetl opcje resetu | |
<kbd>&lt;enter&gt;</kbd>: View commits | `` w `` | View worktree options | |
<kbd>/</kbd>: Filter the current view by text | `` <enter> `` | View commits | |
</pre> | `` / `` | Filter the current view by text | |
## Worktrees ## Worktrees
<pre> | Key | Action | Info |
<kbd>n</kbd>: Create worktree |-----|--------|-------------|
<kbd>&lt;space&gt;</kbd>: Switch to worktree | `` n `` | Create worktree | |
<kbd>&lt;enter&gt;</kbd>: Switch to worktree | `` <space> `` | Switch to worktree | |
<kbd>o</kbd>: Open in editor | `` <enter> `` | Switch to worktree | |
<kbd>d</kbd>: Remove worktree | `` o `` | Open in editor | |
<kbd>/</kbd>: Filter the current view by text | `` d `` | Remove worktree | |
</pre> | `` / `` | Filter the current view by text | |
## Zwykłe ## Zwykłe
<pre> | Key | Action | Info |
<kbd>mouse wheel down</kbd>: Przewiń w dół (fn+up) |-----|--------|-------------|
<kbd>mouse wheel up</kbd>: Przewiń w górę (fn+down) | `` mouse wheel down (fn+up) `` | Przewiń w dół | |
</pre> | `` mouse wheel up (fn+down) `` | Przewiń w górę | |

View File

@ -6,356 +6,357 @@ _Связки клавиш_
## Глобальные сочетания клавиш ## Глобальные сочетания клавиш
<pre> | Key | Action | Info |
<kbd>&lt;c-r&gt;</kbd>: Переключиться на последний репозиторий |-----|--------|-------------|
<kbd>&lt;pgup&gt;</kbd>: Прокрутить вверх главную панель (fn+up/shift+k) | `` <c-r> `` | Переключиться на последний репозиторий | |
<kbd>&lt;pgdown&gt;</kbd>: Прокрутить вниз главную панель (fn+down/shift+j) | `` <pgup> (fn+up/shift+k) `` | Прокрутить вверх главную панель | |
<kbd>@</kbd>: Открыть меню журнала команд | `` <pgdown> (fn+down/shift+j) `` | Прокрутить вниз главную панель | |
<kbd>}</kbd>: Увеличить размер контекста, отображаемого вокруг изменений в просмотрщике сравнении | `` @ `` | Открыть меню журнала команд | |
<kbd>{</kbd>: Уменьшите размер контекста, отображаемого вокруг изменений в просмотрщике сравнении | `` } `` | Увеличить размер контекста, отображаемого вокруг изменений в просмотрщике сравнении | |
<kbd>:</kbd>: Выполнить пользовательскую команду | `` { `` | Уменьшите размер контекста, отображаемого вокруг изменений в просмотрщике сравнении | |
<kbd>&lt;c-p&gt;</kbd>: Просмотреть пользовательские параметры патча | `` : `` | Выполнить пользовательскую команду | |
<kbd>m</kbd>: Просмотреть параметры слияния/перебазирования | `` <c-p> `` | Просмотреть пользовательские параметры патча | |
<kbd>R</kbd>: Обновить | `` m `` | Просмотреть параметры слияния/перебазирования | |
<kbd>+</kbd>: Следующий режим экрана (нормальный/полуэкранный/полноэкранный) | `` R `` | Обновить | |
<kbd>_</kbd>: Предыдущий режим экрана | `` + `` | Следующий режим экрана (нормальный/полуэкранный/полноэкранный) | |
<kbd>?</kbd>: Открыть меню | `` _ `` | Предыдущий режим экрана | |
<kbd>&lt;c-s&gt;</kbd>: Просмотреть параметры фильтрации по пути | `` ? `` | Открыть меню | |
<kbd>W</kbd>: Открыть меню сравнении | `` <c-s> `` | Просмотреть параметры фильтрации по пути | |
<kbd>&lt;c-e&gt;</kbd>: Открыть меню сравнении | `` W `` | Открыть меню сравнении | |
<kbd>&lt;c-w&gt;</kbd>: Переключить отображение изменении пробелов в просмотрщике сравнении | `` <c-e> `` | Открыть меню сравнении | |
<kbd>z</kbd>: Отменить (через reflog) (экспериментальный) | `` <c-w> `` | Переключить отображение изменении пробелов в просмотрщике сравнении | |
<kbd>&lt;c-z&gt;</kbd>: Повторить (через reflog) (экспериментальный) | `` z `` | Отменить (через reflog) (экспериментальный) | Журнал ссылок (reflog) будет использоваться для определения того, какую команду git запустить, чтобы отменить последнюю команду git. Сюда не входят изменения в рабочем дереве; учитываются только коммиты. |
<kbd>P</kbd>: Отправить изменения | `` <c-z> `` | Повторить (через reflog) (экспериментальный) | Журнал ссылок (reflog) будет использоваться для определения того, какую команду git нужно запустить, чтобы повторить последнюю команду git. Сюда не входят изменения в рабочем дереве; учитываются только коммиты. |
<kbd>p</kbd>: Получить и слить изменения | `` P `` | Отправить изменения | |
</pre> | `` p `` | Получить и слить изменения | |
## Навигация по панели списка ## Навигация по панели списка
<pre> | Key | Action | Info |
<kbd>,</kbd>: Предыдущая страница |-----|--------|-------------|
<kbd>.</kbd>: Следующая страница | `` , `` | Предыдущая страница | |
<kbd>&lt;</kbd>: Пролистать наверх | `` . `` | Следующая страница | |
<kbd>&gt;</kbd>: Прокрутить вниз | `` < `` | Пролистать наверх | |
<kbd>v</kbd>: Переключить выборку перетаскивания | `` > `` | Прокрутить вниз | |
<kbd>&lt;s-down&gt;</kbd>: Range select down | `` v `` | Переключить выборку перетаскивания | |
<kbd>&lt;s-up&gt;</kbd>: Range select up | `` <s-down> `` | Range select down | |
<kbd>/</kbd>: Найти | `` <s-up> `` | Range select up | |
<kbd>H</kbd>: Прокрутить влево | `` / `` | Найти | |
<kbd>L</kbd>: Прокрутить вправо | `` H `` | Прокрутить влево | |
<kbd>]</kbd>: Следующая вкладка | `` L `` | Прокрутить вправо | |
<kbd>[</kbd>: Предыдущая вкладка | `` ] `` | Следующая вкладка | |
</pre> | `` [ `` | Предыдущая вкладка | |
## Worktrees ## Worktrees
<pre> | Key | Action | Info |
<kbd>n</kbd>: Create worktree |-----|--------|-------------|
<kbd>&lt;space&gt;</kbd>: Switch to worktree | `` n `` | Create worktree | |
<kbd>&lt;enter&gt;</kbd>: Switch to worktree | `` <space> `` | Switch to worktree | |
<kbd>o</kbd>: Open in editor | `` <enter> `` | Switch to worktree | |
<kbd>d</kbd>: Remove worktree | `` o `` | Open in editor | |
<kbd>/</kbd>: Filter the current view by text | `` d `` | Remove worktree | |
</pre> | `` / `` | Filter the current view by text | |
## Главная панель (Индексирование) ## Главная панель (Индексирование)
<pre> | Key | Action | Info |
<kbd>&lt;left&gt;</kbd>: Выбрать предыдущую часть |-----|--------|-------------|
<kbd>&lt;right&gt;</kbd>: Выбрать следующую часть | `` <left> `` | Выбрать предыдущую часть | |
<kbd>v</kbd>: Переключить выборку перетаскивания | `` <right> `` | Выбрать следующую часть | |
<kbd>a</kbd>: Переключить выборку частей | `` v `` | Переключить выборку перетаскивания | |
<kbd>&lt;c-o&gt;</kbd>: Скопировать выделенный текст в буфер обмена | `` a `` | Переключить выборку частей | |
<kbd>o</kbd>: Открыть файл | `` <c-o> `` | Скопировать выделенный текст в буфер обмена | |
<kbd>e</kbd>: Редактировать файл | `` o `` | Открыть файл | |
<kbd>&lt;esc&gt;</kbd>: Вернуться к панели файлов | `` e `` | Редактировать файл | |
<kbd>&lt;tab&gt;</kbd>: Переключиться на другую панель (проиндексированные/непроиндексированные изменения) | `` <esc> `` | Вернуться к панели файлов | |
<kbd>&lt;space&gt;</kbd>: Переключить строку в проиндексированные / непроиндексированные | `` <tab> `` | Переключиться на другую панель (проиндексированные/непроиндексированные изменения) | |
<kbd>d</kbd>: Отменить изменение (git reset) | `` <space> `` | Переключить строку в проиндексированные / непроиндексированные | |
<kbd>E</kbd>: Изменить эту часть | `` d `` | Отменить изменение (git reset) | |
<kbd>c</kbd>: Сохранить изменения | `` E `` | Изменить эту часть | |
<kbd>w</kbd>: Закоммитить изменения без предварительного хука коммита | `` c `` | Сохранить изменения | |
<kbd>C</kbd>: Сохранить изменения с помощью редактора git | `` w `` | Закоммитить изменения без предварительного хука коммита | |
<kbd>/</kbd>: Найти | `` C `` | Сохранить изменения с помощью редактора git | |
</pre> | `` / `` | Найти | |
## Главная панель (Обычный) ## Главная панель (Обычный)
<pre> | Key | Action | Info |
<kbd>mouse wheel down</kbd>: Прокрутить вниз (fn+up) |-----|--------|-------------|
<kbd>mouse wheel up</kbd>: Прокрутить вверх (fn+down) | `` mouse wheel down (fn+up) `` | Прокрутить вниз | |
</pre> | `` mouse wheel up (fn+down) `` | Прокрутить вверх | |
## Главная панель (Слияние) ## Главная панель (Слияние)
<pre> | Key | Action | Info |
<kbd>e</kbd>: Редактировать файл |-----|--------|-------------|
<kbd>o</kbd>: Открыть файл | `` e `` | Редактировать файл | |
<kbd>&lt;left&gt;</kbd>: Выбрать предыдущий конфликт | `` o `` | Открыть файл | |
<kbd>&lt;right&gt;</kbd>: Выбрать следующий конфликт | `` <left> `` | Выбрать предыдущий конфликт | |
<kbd>&lt;up&gt;</kbd>: Выбрать предыдущую часть | `` <right> `` | Выбрать следующий конфликт | |
<kbd>&lt;down&gt;</kbd>: Выбрать следующую часть | `` <up> `` | Выбрать предыдущую часть | |
<kbd>z</kbd>: Отменить | `` <down> `` | Выбрать следующую часть | |
<kbd>M</kbd>: Открыть внешний инструмент слияния (git mergetool) | `` z `` | Отменить | |
<kbd>&lt;space&gt;</kbd>: Выбрать эту часть | `` M `` | Открыть внешний инструмент слияния (git mergetool) | |
<kbd>b</kbd>: Выбрать все части | `` <space> `` | Выбрать эту часть | |
<kbd>&lt;esc&gt;</kbd>: Вернуться к панели файлов | `` b `` | Выбрать все части | |
</pre> | `` <esc> `` | Вернуться к панели файлов | |
## Главная панель (сборка патчей) ## Главная панель (сборка патчей)
<pre> | Key | Action | Info |
<kbd>&lt;left&gt;</kbd>: Выбрать предыдущую часть |-----|--------|-------------|
<kbd>&lt;right&gt;</kbd>: Выбрать следующую часть | `` <left> `` | Выбрать предыдущую часть | |
<kbd>v</kbd>: Переключить выборку перетаскивания | `` <right> `` | Выбрать следующую часть | |
<kbd>a</kbd>: Переключить выборку частей | `` v `` | Переключить выборку перетаскивания | |
<kbd>&lt;c-o&gt;</kbd>: Скопировать выделенный текст в буфер обмена | `` a `` | Переключить выборку частей | |
<kbd>o</kbd>: Открыть файл | `` <c-o> `` | Скопировать выделенный текст в буфер обмена | |
<kbd>e</kbd>: Редактировать файл | `` o `` | Открыть файл | |
<kbd>&lt;space&gt;</kbd>: Добавить/удалить строку(и) для патча | `` e `` | Редактировать файл | |
<kbd>&lt;esc&gt;</kbd>: Выйти из сборщика пользовательских патчей | `` <space> `` | Добавить/удалить строку(и) для патча | |
<kbd>/</kbd>: Найти | `` <esc> `` | Выйти из сборщика пользовательских патчей | |
</pre> | `` / `` | Найти | |
## Журнал ссылок (Reflog) ## Журнал ссылок (Reflog)
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: Скопировать SHA коммита в буфер обмена |-----|--------|-------------|
<kbd>w</kbd>: View worktree options | `` <c-o> `` | Скопировать SHA коммита в буфер обмена | |
<kbd>&lt;space&gt;</kbd>: Переключить коммит | `` w `` | View worktree options | |
<kbd>y</kbd>: Скопировать атрибут коммита | `` <space> `` | Переключить коммит | |
<kbd>o</kbd>: Открыть коммит в браузере | `` y `` | Скопировать атрибут коммита | |
<kbd>n</kbd>: Создать новую ветку с этого коммита | `` o `` | Открыть коммит в браузере | |
<kbd>g</kbd>: Просмотреть параметры сброса | `` n `` | Создать новую ветку с этого коммита | |
<kbd>C</kbd>: Скопировать отобранные коммит (cherry-pick) | `` g `` | Просмотреть параметры сброса | |
<kbd>&lt;c-r&gt;</kbd>: Сбросить отобранную (скопированную | cherry-picked) выборку коммитов | `` C `` | Скопировать отобранные коммит (cherry-pick) | |
<kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool) | `` <c-r> `` | Сбросить отобранную (скопированную | cherry-picked) выборку коммитов | |
<kbd>&lt;enter&gt;</kbd>: Просмотреть коммиты | `` <c-t> `` | Open external diff tool (git difftool) | |
<kbd>/</kbd>: Filter the current view by text | `` <enter> `` | Просмотреть коммиты | |
</pre> | `` / `` | Filter the current view by text | |
## Коммиты ## Коммиты
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: Скопировать SHA коммита в буфер обмена |-----|--------|-------------|
<kbd>&lt;c-r&gt;</kbd>: Сбросить отобранную (скопированную | cherry-picked) выборку коммитов | `` <c-o> `` | Скопировать SHA коммита в буфер обмена | |
<kbd>b</kbd>: Просмотреть параметры бинарного поиска | `` <c-r> `` | Сбросить отобранную (скопированную | cherry-picked) выборку коммитов | |
<kbd>s</kbd>: Объединить несколько коммитов в один нижний | `` b `` | Просмотреть параметры бинарного поиска | |
<kbd>f</kbd>: Объединить несколько коммитов в один отбросив сообщение коммита | `` s `` | Объединить несколько коммитов в один нижний | |
<kbd>r</kbd>: Перефразировать коммит | `` f `` | Объединить несколько коммитов в один отбросив сообщение коммита | |
<kbd>R</kbd>: Переписать коммит с помощью редактора | `` r `` | Перефразировать коммит | |
<kbd>d</kbd>: Удалить коммит | `` R `` | Переписать коммит с помощью редактора | |
<kbd>e</kbd>: Изменить коммит | `` d `` | Удалить коммит | |
<kbd>i</kbd>: Start interactive rebase | `` e `` | Изменить коммит | |
<kbd>p</kbd>: Выбрать коммит (в середине перебазирования) | `` 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.
<kbd>F</kbd>: Создать fixup коммит для этого коммита If you would instead like to start an interactive rebase from the selected commit, press `e`. |
<kbd>S</kbd>: Объединить все 'fixup!' коммиты выше в выбранный коммит (автосохранение) | `` p `` | Выбрать коммит (в середине перебазирования) | |
<kbd>&lt;c-j&gt;</kbd>: Переместить коммит вниз на один | `` F `` | Создать fixup коммит для этого коммита | |
<kbd>&lt;c-k&gt;</kbd>: Переместить коммит вверх на один | `` S `` | Объединить все 'fixup!' коммиты выше в выбранный коммит (автосохранение) | |
<kbd>V</kbd>: Вставить отобранные коммиты (cherry-pick) | `` <c-j> `` | Переместить коммит вниз на один | |
<kbd>B</kbd>: Mark commit as base commit for rebase | `` <c-k> `` | Переместить коммит вверх на один | |
<kbd>A</kbd>: Править последний коммит с проиндексированными изменениями | `` V `` | Вставить отобранные коммиты (cherry-pick) | |
<kbd>a</kbd>: Установить/убрать автора коммита | `` B `` | Mark commit as base commit for rebase | Select a base commit for the next rebase; this will effectively perform a 'git rebase --onto'. |
<kbd>t</kbd>: Отменить коммит | `` A `` | Править последний коммит с проиндексированными изменениями | |
<kbd>T</kbd>: Пометить коммит тегом | `` a `` | Установить/убрать автора коммита | |
<kbd>&lt;c-l&gt;</kbd>: Открыть меню журнала | `` t `` | Отменить коммит | |
<kbd>w</kbd>: View worktree options | `` T `` | Пометить коммит тегом | |
<kbd>&lt;space&gt;</kbd>: Переключить коммит | `` <c-l> `` | Открыть меню журнала | |
<kbd>y</kbd>: Скопировать атрибут коммита | `` w `` | View worktree options | |
<kbd>o</kbd>: Открыть коммит в браузере | `` <space> `` | Переключить коммит | |
<kbd>n</kbd>: Создать новую ветку с этого коммита | `` y `` | Скопировать атрибут коммита | |
<kbd>g</kbd>: Просмотреть параметры сброса | `` o `` | Открыть коммит в браузере | |
<kbd>C</kbd>: Скопировать отобранные коммит (cherry-pick) | `` n `` | Создать новую ветку с этого коммита | |
<kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool) | `` g `` | Просмотреть параметры сброса | |
<kbd>&lt;enter&gt;</kbd>: Просмотреть файлы выбранного элемента | `` C `` | Скопировать отобранные коммит (cherry-pick) | |
<kbd>/</kbd>: Найти | `` <c-t> `` | Open external diff tool (git difftool) | |
</pre> | `` <enter> `` | Просмотреть файлы выбранного элемента | |
| `` / `` | Найти | |
## Локальные Ветки ## Локальные Ветки
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: Скопировать название ветки в буфер обмена |-----|--------|-------------|
<kbd>i</kbd>: Показать параметры git-flow | `` <c-o> `` | Скопировать название ветки в буфер обмена | |
<kbd>&lt;space&gt;</kbd>: Переключить | `` i `` | Показать параметры git-flow | |
<kbd>n</kbd>: Новая ветка | `` <space> `` | Переключить | |
<kbd>o</kbd>: Создать запрос на принятие изменений | `` n `` | Новая ветка | |
<kbd>O</kbd>: Создать параметры запроса принятие изменений | `` o `` | Создать запрос на принятие изменений | |
<kbd>&lt;c-y&gt;</kbd>: Скопировать URL запроса на принятие изменений в буфер обмена | `` O `` | Создать параметры запроса принятие изменений | |
<kbd>c</kbd>: Переключить по названию | `` <c-y> `` | Скопировать URL запроса на принятие изменений в буфер обмена | |
<kbd>F</kbd>: Принудительное переключение | `` c `` | Переключить по названию | |
<kbd>d</kbd>: View delete options | `` F `` | Принудительное переключение | |
<kbd>r</kbd>: Перебазировать переключённую ветку на эту ветку | `` d `` | View delete options | |
<kbd>M</kbd>: Слияние с текущей переключённой веткой | `` r `` | Перебазировать переключённую ветку на эту ветку | |
<kbd>f</kbd>: Перемотать эту ветку вперёд из её upstream-ветки | `` M `` | Слияние с текущей переключённой веткой | |
<kbd>T</kbd>: Создать тег | `` f `` | Перемотать эту ветку вперёд из её upstream-ветки | |
<kbd>s</kbd>: Порядок сортировки | `` T `` | Создать тег | |
<kbd>g</kbd>: Просмотреть параметры сброса | `` s `` | Порядок сортировки | |
<kbd>R</kbd>: Переименовать ветку | `` g `` | Просмотреть параметры сброса | |
<kbd>u</kbd>: View upstream options | `` R `` | Переименовать ветку | |
<kbd>w</kbd>: View worktree options | `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream |
<kbd>&lt;enter&gt;</kbd>: Просмотреть коммиты | `` w `` | View worktree options | |
<kbd>/</kbd>: Filter the current view by text | `` <enter> `` | Просмотреть коммиты | |
</pre> | `` / `` | Filter the current view by text | |
## Меню ## Меню
<pre> | Key | Action | Info |
<kbd>&lt;enter&gt;</kbd>: Выполнить |-----|--------|-------------|
<kbd>&lt;esc&gt;</kbd>: Закрыть | `` <enter> `` | Выполнить | |
<kbd>/</kbd>: Filter the current view by text | `` <esc> `` | Закрыть | |
</pre> | `` / `` | Filter the current view by text | |
## Панель Подтверждения ## Панель Подтверждения
<pre> | Key | Action | Info |
<kbd>&lt;enter&gt;</kbd>: Подтвердить |-----|--------|-------------|
<kbd>&lt;esc&gt;</kbd>: Закрыть/отменить | `` <enter> `` | Подтвердить | |
</pre> | `` <esc> `` | Закрыть/отменить | |
## Подкоммиты ## Подкоммиты
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: Скопировать SHA коммита в буфер обмена |-----|--------|-------------|
<kbd>w</kbd>: View worktree options | `` <c-o> `` | Скопировать SHA коммита в буфер обмена | |
<kbd>&lt;space&gt;</kbd>: Переключить коммит | `` w `` | View worktree options | |
<kbd>y</kbd>: Скопировать атрибут коммита | `` <space> `` | Переключить коммит | |
<kbd>o</kbd>: Открыть коммит в браузере | `` y `` | Скопировать атрибут коммита | |
<kbd>n</kbd>: Создать новую ветку с этого коммита | `` o `` | Открыть коммит в браузере | |
<kbd>g</kbd>: Просмотреть параметры сброса | `` n `` | Создать новую ветку с этого коммита | |
<kbd>C</kbd>: Скопировать отобранные коммит (cherry-pick) | `` g `` | Просмотреть параметры сброса | |
<kbd>&lt;c-r&gt;</kbd>: Сбросить отобранную (скопированную | cherry-picked) выборку коммитов | `` C `` | Скопировать отобранные коммит (cherry-pick) | |
<kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool) | `` <c-r> `` | Сбросить отобранную (скопированную | cherry-picked) выборку коммитов | |
<kbd>&lt;enter&gt;</kbd>: Просмотреть файлы выбранного элемента | `` <c-t> `` | Open external diff tool (git difftool) | |
<kbd>/</kbd>: Найти | `` <enter> `` | Просмотреть файлы выбранного элемента | |
</pre> | `` / `` | Найти | |
## Подмодули ## Подмодули
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: Скопировать название подмодуля в буфер обмена |-----|--------|-------------|
<kbd>&lt;enter&gt;</kbd>: Ввести подмодуль | `` <c-o> `` | Скопировать название подмодуля в буфер обмена | |
<kbd>&lt;space&gt;</kbd>: Ввести подмодуль | `` <enter> `` | Ввести подмодуль | |
<kbd>d</kbd>: Удалить подмодуль | `` <space> `` | Ввести подмодуль | |
<kbd>u</kbd>: Обновить подмодуль | `` d `` | Удалить подмодуль | |
<kbd>n</kbd>: Добавить новый подмодуль | `` u `` | Обновить подмодуль | |
<kbd>e</kbd>: Обновить URL подмодуля | `` n `` | Добавить новый подмодуль | |
<kbd>i</kbd>: Инициализировать подмодуль | `` e `` | Обновить URL подмодуля | |
<kbd>b</kbd>: Просмотреть параметры массового подмодуля | `` i `` | Инициализировать подмодуль | |
<kbd>/</kbd>: Filter the current view by text | `` b `` | Просмотреть параметры массового подмодуля | |
</pre> | `` / `` | Filter the current view by text | |
## Сводка коммита ## Сводка коммита
<pre> | Key | Action | Info |
<kbd>&lt;enter&gt;</kbd>: Подтвердить |-----|--------|-------------|
<kbd>&lt;esc&gt;</kbd>: Закрыть | `` <enter> `` | Подтвердить | |
</pre> | `` <esc> `` | Закрыть | |
## Сохранить Изменения Файлов ## Сохранить Изменения Файлов
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: Скопировать закомиченное имя файла в буфер обмена |-----|--------|-------------|
<kbd>c</kbd>: Переключить файл | `` <c-o> `` | Скопировать закомиченное имя файла в буфер обмена | |
<kbd>d</kbd>: Отменить изменения коммита в этом файле | `` c `` | Переключить файл | |
<kbd>o</kbd>: Открыть файл | `` d `` | Отменить изменения коммита в этом файле | |
<kbd>e</kbd>: Редактировать файл | `` o `` | Открыть файл | |
<kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool) | `` e `` | Редактировать файл | |
<kbd>&lt;space&gt;</kbd>: Переключить файлы включённые в патч | `` <c-t> `` | Open external diff tool (git difftool) | |
<kbd>a</kbd>: Переключить все файлы, включённые в патч | `` <space> `` | Переключить файлы включённые в патч | |
<kbd>&lt;enter&gt;</kbd>: Введите файл, чтобы добавить выбранные строки в патч (или свернуть каталог переключения) | `` a `` | Переключить все файлы, включённые в патч | |
<kbd>`</kbd>: Переключить вид дерева файлов | `` <enter> `` | Введите файл, чтобы добавить выбранные строки в патч (или свернуть каталог переключения) | |
<kbd>/</kbd>: Найти | `` ` `` | Переключить вид дерева файлов | |
</pre> | `` / `` | Найти | |
## Статус ## Статус
<pre> | Key | Action | Info |
<kbd>o</kbd>: Открыть файл конфигурации |-----|--------|-------------|
<kbd>e</kbd>: Редактировать файл конфигурации | `` o `` | Открыть файл конфигурации | |
<kbd>u</kbd>: Проверить обновления | `` e `` | Редактировать файл конфигурации | |
<kbd>&lt;enter&gt;</kbd>: Переключиться на последний репозиторий | `` u `` | Проверить обновления | |
<kbd>a</kbd>: Показать все логи ветки | `` <enter> `` | Переключиться на последний репозиторий | |
</pre> | `` a `` | Показать все логи ветки | |
## Теги ## Теги
<pre> | Key | Action | Info |
<kbd>&lt;space&gt;</kbd>: Переключить |-----|--------|-------------|
<kbd>d</kbd>: View delete options | `` <space> `` | Переключить | |
<kbd>P</kbd>: Отправить тег | `` d `` | View delete options | |
<kbd>n</kbd>: Создать тег | `` P `` | Отправить тег | |
<kbd>g</kbd>: Просмотреть параметры сброса | `` n `` | Создать тег | |
<kbd>w</kbd>: View worktree options | `` g `` | Просмотреть параметры сброса | |
<kbd>&lt;enter&gt;</kbd>: Просмотреть коммиты | `` w `` | View worktree options | |
<kbd>/</kbd>: Filter the current view by text | `` <enter> `` | Просмотреть коммиты | |
</pre> | `` / `` | Filter the current view by text | |
## Удалённые ветки ## Удалённые ветки
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: Скопировать название ветки в буфер обмена |-----|--------|-------------|
<kbd>&lt;space&gt;</kbd>: Переключить | `` <c-o> `` | Скопировать название ветки в буфер обмена | |
<kbd>n</kbd>: Новая ветка | `` <space> `` | Переключить | |
<kbd>M</kbd>: Слияние с текущей переключённой веткой | `` n `` | Новая ветка | |
<kbd>r</kbd>: Перебазировать переключённую ветку на эту ветку | `` M `` | Слияние с текущей переключённой веткой | |
<kbd>d</kbd>: Delete remote tag | `` r `` | Перебазировать переключённую ветку на эту ветку | |
<kbd>u</kbd>: Установить как upstream-ветку переключённую ветку | `` d `` | Delete remote tag | |
<kbd>s</kbd>: Порядок сортировки | `` u `` | Установить как upstream-ветку переключённую ветку | |
<kbd>g</kbd>: Просмотреть параметры сброса | `` s `` | Порядок сортировки | |
<kbd>w</kbd>: View worktree options | `` g `` | Просмотреть параметры сброса | |
<kbd>&lt;enter&gt;</kbd>: Просмотреть коммиты | `` w `` | View worktree options | |
<kbd>/</kbd>: Filter the current view by text | `` <enter> `` | Просмотреть коммиты | |
</pre> | `` / `` | Filter the current view by text | |
## Удалённые репозитории ## Удалённые репозитории
<pre> | Key | Action | Info |
<kbd>f</kbd>: Получение изменения из удалённого репозитория |-----|--------|-------------|
<kbd>n</kbd>: Добавить новую удалённую ветку | `` f `` | Получение изменения из удалённого репозитория | |
<kbd>d</kbd>: Удалить удалённую ветку | `` n `` | Добавить новую удалённую ветку | |
<kbd>e</kbd>: Редактировать удалённый репозитории | `` d `` | Удалить удалённую ветку | |
<kbd>/</kbd>: Filter the current view by text | `` e `` | Редактировать удалённый репозитории | |
</pre> | `` / `` | Filter the current view by text | |
## Файлы ## Файлы
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: Скопировать название файла в буфер обмена |-----|--------|-------------|
<kbd>&lt;space&gt;</kbd>: Переключить индекс | `` <c-o> `` | Скопировать название файла в буфер обмена | |
<kbd>&lt;c-b&gt;</kbd>: Фильтровать файлы (проиндексированные/непроиндексированные) | `` <space> `` | Переключить индекс | |
<kbd>y</kbd>: Copy to clipboard | `` <c-b> `` | Фильтровать файлы (проиндексированные/непроиндексированные) | |
<kbd>c</kbd>: Сохранить изменения | `` y `` | Copy to clipboard | |
<kbd>w</kbd>: Закоммитить изменения без предварительного хука коммита | `` c `` | Сохранить изменения | |
<kbd>A</kbd>: Правка последнего коммита | `` w `` | Закоммитить изменения без предварительного хука коммита | |
<kbd>C</kbd>: Сохранить изменения с помощью редактора git | `` A `` | Правка последнего коммита | |
<kbd>&lt;c-f&gt;</kbd>: Find base commit for fixup | `` C `` | Сохранить изменения с помощью редактора git | |
<kbd>e</kbd>: Редактировать файл | `` <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> |
<kbd>o</kbd>: Открыть файл | `` e `` | Редактировать файл | |
<kbd>i</kbd>: Игнорировать или исключить файл | `` o `` | Открыть файл | |
<kbd>r</kbd>: Обновить файлы | `` i `` | Игнорировать или исключить файл | |
<kbd>s</kbd>: Припрятать все изменения | `` r `` | Обновить файлы | |
<kbd>S</kbd>: Просмотреть параметры хранилища | `` s `` | Припрятать все изменения | |
<kbd>a</kbd>: Все проиндексированные/непроиндексированные | `` S `` | Просмотреть параметры хранилища | |
<kbd>&lt;enter&gt;</kbd>: Проиндексировать отдельные части/строки для файла или свернуть/развернуть для каталога | `` a `` | Все проиндексированные/непроиндексированные | |
<kbd>d</kbd>: Просмотреть параметры «отмены изменении» | `` <enter> `` | Проиндексировать отдельные части/строки для файла или свернуть/развернуть для каталога | |
<kbd>g</kbd>: Просмотреть параметры сброса upstream-ветки | `` d `` | Просмотреть параметры «отмены изменении» | |
<kbd>D</kbd>: Просмотреть параметры сброса | `` g `` | Просмотреть параметры сброса upstream-ветки | |
<kbd>`</kbd>: Переключить вид дерева файлов | `` D `` | Просмотреть параметры сброса | |
<kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool) | `` ` `` | Переключить вид дерева файлов | |
<kbd>M</kbd>: Открыть внешний инструмент слияния (git mergetool) | `` <c-t> `` | Open external diff tool (git difftool) | |
<kbd>f</kbd>: Получить изменения | `` M `` | Открыть внешний инструмент слияния (git mergetool) | |
<kbd>/</kbd>: Найти | `` f `` | Получить изменения | |
</pre> | `` / `` | Найти | |
## Хранилище ## Хранилище
<pre> | Key | Action | Info |
<kbd>&lt;space&gt;</kbd>: Применить припрятанные изменения |-----|--------|-------------|
<kbd>g</kbd>: Применить припрятанные изменения и тут же удалить их из хранилища | `` <space> `` | Применить припрятанные изменения | |
<kbd>d</kbd>: Удалить припрятанные изменения из хранилища | `` g `` | Применить припрятанные изменения и тут же удалить их из хранилища | |
<kbd>n</kbd>: Новая ветка | `` d `` | Удалить припрятанные изменения из хранилища | |
<kbd>r</kbd>: Переименовать хранилище | `` n `` | Новая ветка | |
<kbd>w</kbd>: View worktree options | `` r `` | Переименовать хранилище | |
<kbd>&lt;enter&gt;</kbd>: Просмотреть файлы выбранного элемента | `` w `` | View worktree options | |
<kbd>/</kbd>: Filter the current view by text | `` <enter> `` | Просмотреть файлы выбранного элемента | |
</pre> | `` / `` | Filter the current view by text | |

View File

@ -6,356 +6,357 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
## 全局键绑定 ## 全局键绑定
<pre> | Key | Action | Info |
<kbd>&lt;c-r&gt;</kbd>: 切换到最近的仓库 |-----|--------|-------------|
<kbd>&lt;pgup&gt;</kbd>: 向上滚动主面板 (fn+up/shift+k) | `` <c-r> `` | 切换到最近的仓库 | |
<kbd>&lt;pgdown&gt;</kbd>: 向下滚动主面板 (fn+down/shift+j) | `` <pgup> (fn+up/shift+k) `` | 向上滚动主面板 | |
<kbd>@</kbd>: 打开命令日志菜单 | `` <pgdown> (fn+down/shift+j) `` | 向下滚动主面板 | |
<kbd>}</kbd>: 扩大差异视图中显示的上下文范围 | `` @ `` | 打开命令日志菜单 | |
<kbd>{</kbd>: 缩小差异视图中显示的上下文范围 | `` } `` | 扩大差异视图中显示的上下文范围 | |
<kbd>:</kbd>: 执行自定义命令 | `` { `` | 缩小差异视图中显示的上下文范围 | |
<kbd>&lt;c-p&gt;</kbd>: 查看自定义补丁选项 | `` : `` | 执行自定义命令 | |
<kbd>m</kbd>: 查看 合并/变基 选项 | `` <c-p> `` | 查看自定义补丁选项 | |
<kbd>R</kbd>: 刷新 | `` m `` | 查看 合并/变基 选项 | |
<kbd>+</kbd>: 下一屏模式(正常/半屏/全屏) | `` R `` | 刷新 | |
<kbd>_</kbd>: 上一屏模式 | `` + `` | 下一屏模式(正常/半屏/全屏) | |
<kbd>?</kbd>: 打开菜单 | `` _ `` | 上一屏模式 | |
<kbd>&lt;c-s&gt;</kbd>: 查看按路径过滤选项 | `` ? `` | 打开菜单 | |
<kbd>W</kbd>: 打开 diff 菜单 | `` <c-s> `` | 查看按路径过滤选项 | |
<kbd>&lt;c-e&gt;</kbd>: 打开 diff 菜单 | `` W `` | 打开 diff 菜单 | |
<kbd>&lt;c-w&gt;</kbd>: 切换是否在差异视图中显示空白字符差异 | `` <c-e> `` | 打开 diff 菜单 | |
<kbd>z</kbd>: (通过 reflog)撤销「实验功能」 | `` <c-w> `` | 切换是否在差异视图中显示空白字符差异 | |
<kbd>&lt;c-z&gt;</kbd>: (通过 reflog)重做「实验功能」 | `` z `` | (通过 reflog)撤销「实验功能」 | 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. |
<kbd>P</kbd>: 推送 | `` <c-z> `` | (通过 reflog)重做「实验功能」 | 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. |
<kbd>p</kbd>: 拉取 | `` P `` | 推送 | |
</pre> | `` p `` | 拉取 | |
## 列表面板导航 ## 列表面板导航
<pre> | Key | Action | Info |
<kbd>,</kbd>: 上一页 |-----|--------|-------------|
<kbd>.</kbd>: 下一页 | `` , `` | 上一页 | |
<kbd>&lt;</kbd>: 滚动到顶部 | `` . `` | 下一页 | |
<kbd>&gt;</kbd>: 滚动到底部 | `` < `` | 滚动到顶部 | |
<kbd>v</kbd>: 切换拖动选择 | `` > `` | 滚动到底部 | |
<kbd>&lt;s-down&gt;</kbd>: Range select down | `` v `` | 切换拖动选择 | |
<kbd>&lt;s-up&gt;</kbd>: Range select up | `` <s-down> `` | Range select down | |
<kbd>/</kbd>: 开始搜索 | `` <s-up> `` | Range select up | |
<kbd>H</kbd>: 向左滚动 | `` / `` | 开始搜索 | |
<kbd>L</kbd>: 向右滚动 | `` H `` | 向左滚动 | |
<kbd>]</kbd>: 下一个标签 | `` L `` | 向右滚动 | |
<kbd>[</kbd>: 上一个标签 | `` ] `` | 下一个标签 | |
</pre> | `` [ `` | 上一个标签 | |
## Reflog 页面 ## Reflog 页面
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: 将提交的 SHA 复制到剪贴板 |-----|--------|-------------|
<kbd>w</kbd>: View worktree options | `` <c-o> `` | 将提交的 SHA 复制到剪贴板 | |
<kbd>&lt;space&gt;</kbd>: 检出提交 | `` w `` | View worktree options | |
<kbd>y</kbd>: Copy commit attribute | `` <space> `` | 检出提交 | |
<kbd>o</kbd>: 在浏览器中打开提交 | `` y `` | Copy commit attribute | |
<kbd>n</kbd>: 从提交创建新分支 | `` o `` | 在浏览器中打开提交 | |
<kbd>g</kbd>: 查看重置选项 | `` n `` | 从提交创建新分支 | |
<kbd>C</kbd>: 复制提交(拣选) | `` g `` | 查看重置选项 | |
<kbd>&lt;c-r&gt;</kbd>: 重置已拣选(复制)的提交 | `` C `` | 复制提交(拣选) | |
<kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool) | `` <c-r> `` | 重置已拣选(复制)的提交 | |
<kbd>&lt;enter&gt;</kbd>: 查看提交 | `` <c-t> `` | Open external diff tool (git difftool) | |
<kbd>/</kbd>: Filter the current view by text | `` <enter> `` | 查看提交 | |
</pre> | `` / `` | Filter the current view by text | |
## Worktrees ## Worktrees
<pre> | Key | Action | Info |
<kbd>n</kbd>: Create worktree |-----|--------|-------------|
<kbd>&lt;space&gt;</kbd>: Switch to worktree | `` n `` | Create worktree | |
<kbd>&lt;enter&gt;</kbd>: Switch to worktree | `` <space> `` | Switch to worktree | |
<kbd>o</kbd>: Open in editor | `` <enter> `` | Switch to worktree | |
<kbd>d</kbd>: Remove worktree | `` o `` | Open in editor | |
<kbd>/</kbd>: Filter the current view by text | `` d `` | Remove worktree | |
</pre> | `` / `` | Filter the current view by text | |
## 分支页面 ## 分支页面
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: 将分支名称复制到剪贴板 |-----|--------|-------------|
<kbd>i</kbd>: 显示 git-flow 选项 | `` <c-o> `` | 将分支名称复制到剪贴板 | |
<kbd>&lt;space&gt;</kbd>: 检出 | `` i `` | 显示 git-flow 选项 | |
<kbd>n</kbd>: 新分支 | `` <space> `` | 检出 | |
<kbd>o</kbd>: 创建抓取请求 | `` n `` | 新分支 | |
<kbd>O</kbd>: 创建抓取请求选项 | `` o `` | 创建抓取请求 | |
<kbd>&lt;c-y&gt;</kbd>: 将抓取请求 URL 复制到剪贴板 | `` O `` | 创建抓取请求选项 | |
<kbd>c</kbd>: 按名称检出 | `` <c-y> `` | 将抓取请求 URL 复制到剪贴板 | |
<kbd>F</kbd>: 强制检出 | `` c `` | 按名称检出 | |
<kbd>d</kbd>: View delete options | `` F `` | 强制检出 | |
<kbd>r</kbd>: 将已检出的分支变基到该分支 | `` d `` | View delete options | |
<kbd>M</kbd>: 合并到当前检出的分支 | `` r `` | 将已检出的分支变基到该分支 | |
<kbd>f</kbd>: 从上游快进此分支 | `` M `` | 合并到当前检出的分支 | |
<kbd>T</kbd>: 创建标签 | `` f `` | 从上游快进此分支 | |
<kbd>s</kbd>: Sort order | `` T `` | 创建标签 | |
<kbd>g</kbd>: 查看重置选项 | `` s `` | Sort order | |
<kbd>R</kbd>: 重命名分支 | `` g `` | 查看重置选项 | |
<kbd>u</kbd>: View upstream options | `` R `` | 重命名分支 | |
<kbd>w</kbd>: View worktree options | `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream |
<kbd>&lt;enter&gt;</kbd>: 查看提交 | `` w `` | View worktree options | |
<kbd>/</kbd>: Filter the current view by text | `` <enter> `` | 查看提交 | |
</pre> | `` / `` | Filter the current view by text | |
## 子提交 ## 子提交
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: 将提交的 SHA 复制到剪贴板 |-----|--------|-------------|
<kbd>w</kbd>: View worktree options | `` <c-o> `` | 将提交的 SHA 复制到剪贴板 | |
<kbd>&lt;space&gt;</kbd>: 检出提交 | `` w `` | View worktree options | |
<kbd>y</kbd>: Copy commit attribute | `` <space> `` | 检出提交 | |
<kbd>o</kbd>: 在浏览器中打开提交 | `` y `` | Copy commit attribute | |
<kbd>n</kbd>: 从提交创建新分支 | `` o `` | 在浏览器中打开提交 | |
<kbd>g</kbd>: 查看重置选项 | `` n `` | 从提交创建新分支 | |
<kbd>C</kbd>: 复制提交(拣选) | `` g `` | 查看重置选项 | |
<kbd>&lt;c-r&gt;</kbd>: 重置已拣选(复制)的提交 | `` C `` | 复制提交(拣选) | |
<kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool) | `` <c-r> `` | 重置已拣选(复制)的提交 | |
<kbd>&lt;enter&gt;</kbd>: 查看提交的文件 | `` <c-t> `` | Open external diff tool (git difftool) | |
<kbd>/</kbd>: 开始搜索 | `` <enter> `` | 查看提交的文件 | |
</pre> | `` / `` | 开始搜索 | |
## 子模块 ## 子模块
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: 将子模块名称复制到剪贴板 |-----|--------|-------------|
<kbd>&lt;enter&gt;</kbd>: 输入子模块 | `` <c-o> `` | 将子模块名称复制到剪贴板 | |
<kbd>&lt;space&gt;</kbd>: 输入子模块 | `` <enter> `` | 输入子模块 | |
<kbd>d</kbd>: 删除子模块 | `` <space> `` | 输入子模块 | |
<kbd>u</kbd>: 更新子模块 | `` d `` | 删除子模块 | |
<kbd>n</kbd>: 添加新的子模块 | `` u `` | 更新子模块 | |
<kbd>e</kbd>: 更新子模块 URL | `` n `` | 添加新的子模块 | |
<kbd>i</kbd>: 初始化子模块 | `` e `` | 更新子模块 URL | |
<kbd>b</kbd>: 查看批量子模块选项 | `` i `` | 初始化子模块 | |
<kbd>/</kbd>: Filter the current view by text | `` b `` | 查看批量子模块选项 | |
</pre> | `` / `` | Filter the current view by text | |
## 提交 ## 提交
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: 将提交的 SHA 复制到剪贴板 |-----|--------|-------------|
<kbd>&lt;c-r&gt;</kbd>: 重置已拣选(复制)的提交 | `` <c-o> `` | 将提交的 SHA 复制到剪贴板 | |
<kbd>b</kbd>: 查看二分查找选项 | `` <c-r> `` | 重置已拣选(复制)的提交 | |
<kbd>s</kbd>: 向下压缩 | `` b `` | 查看二分查找选项 | |
<kbd>f</kbd>: 修正提交(fixup) | `` s `` | 向下压缩 | |
<kbd>r</kbd>: 改写提交 | `` f `` | 修正提交(fixup) | |
<kbd>R</kbd>: 使用编辑器重命名提交 | `` r `` | 改写提交 | |
<kbd>d</kbd>: 删除提交 | `` R `` | 使用编辑器重命名提交 | |
<kbd>e</kbd>: 编辑提交 | `` d `` | 删除提交 | |
<kbd>i</kbd>: Start interactive rebase | `` e `` | 编辑提交 | |
<kbd>p</kbd>: 选择提交(变基过程中) | `` 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.
<kbd>F</kbd>: 创建修正提交 If you would instead like to start an interactive rebase from the selected commit, press `e`. |
<kbd>S</kbd>: 压缩在所选提交之上的所有“fixup!”提交(自动压缩) | `` p `` | 选择提交(变基过程中) | |
<kbd>&lt;c-j&gt;</kbd>: 下移提交 | `` F `` | 创建修正提交 | |
<kbd>&lt;c-k&gt;</kbd>: 上移提交 | `` S `` | 压缩在所选提交之上的所有“fixup!”提交(自动压缩) | |
<kbd>V</kbd>: 粘贴提交(拣选) | `` <c-j> `` | 下移提交 | |
<kbd>B</kbd>: Mark commit as base commit for rebase | `` <c-k> `` | 上移提交 | |
<kbd>A</kbd>: 用已暂存的更改来修补提交 | `` V `` | 粘贴提交(拣选) | |
<kbd>a</kbd>: Set/Reset commit author | `` B `` | Mark commit as base commit for rebase | Select a base commit for the next rebase; this will effectively perform a 'git rebase --onto'. |
<kbd>t</kbd>: 还原提交 | `` A `` | 用已暂存的更改来修补提交 | |
<kbd>T</kbd>: 标签提交 | `` a `` | Set/Reset commit author | |
<kbd>&lt;c-l&gt;</kbd>: 打开日志菜单 | `` t `` | 还原提交 | |
<kbd>w</kbd>: View worktree options | `` T `` | 标签提交 | |
<kbd>&lt;space&gt;</kbd>: 检出提交 | `` <c-l> `` | 打开日志菜单 | |
<kbd>y</kbd>: Copy commit attribute | `` w `` | View worktree options | |
<kbd>o</kbd>: 在浏览器中打开提交 | `` <space> `` | 检出提交 | |
<kbd>n</kbd>: 从提交创建新分支 | `` y `` | Copy commit attribute | |
<kbd>g</kbd>: 查看重置选项 | `` o `` | 在浏览器中打开提交 | |
<kbd>C</kbd>: 复制提交(拣选) | `` n `` | 从提交创建新分支 | |
<kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool) | `` g `` | 查看重置选项 | |
<kbd>&lt;enter&gt;</kbd>: 查看提交的文件 | `` C `` | 复制提交(拣选) | |
<kbd>/</kbd>: 开始搜索 | `` <c-t> `` | Open external diff tool (git difftool) | |
</pre> | `` <enter> `` | 查看提交的文件 | |
| `` / `` | 开始搜索 | |
## 提交文件 ## 提交文件
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: 将提交的文件名复制到剪贴板 |-----|--------|-------------|
<kbd>c</kbd>: 检出文件 | `` <c-o> `` | 将提交的文件名复制到剪贴板 | |
<kbd>d</kbd>: 放弃对此文件的提交更改 | `` c `` | 检出文件 | |
<kbd>o</kbd>: 打开文件 | `` d `` | 放弃对此文件的提交更改 | |
<kbd>e</kbd>: 编辑文件 | `` o `` | 打开文件 | |
<kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool) | `` e `` | 编辑文件 | |
<kbd>&lt;space&gt;</kbd>: 补丁中包含的切换文件 | `` <c-t> `` | Open external diff tool (git difftool) | |
<kbd>a</kbd>: Toggle all files included in patch | `` <space> `` | 补丁中包含的切换文件 | |
<kbd>&lt;enter&gt;</kbd>: 输入文件以将所选行添加到补丁中(或切换目录折叠) | `` a `` | Toggle all files included in patch | |
<kbd>`</kbd>: 切换文件树视图 | `` <enter> `` | 输入文件以将所选行添加到补丁中(或切换目录折叠) | |
<kbd>/</kbd>: 开始搜索 | `` ` `` | 切换文件树视图 | |
</pre> | `` / `` | 开始搜索 | |
## 提交讯息 ## 提交讯息
<pre> | Key | Action | Info |
<kbd>&lt;enter&gt;</kbd>: 确认 |-----|--------|-------------|
<kbd>&lt;esc&gt;</kbd>: 关闭 | `` <enter> `` | 确认 | |
</pre> | `` <esc> `` | 关闭 | |
## 文件 ## 文件
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: 将文件名复制到剪贴板 |-----|--------|-------------|
<kbd>&lt;space&gt;</kbd>: 切换暂存状态 | `` <c-o> `` | 将文件名复制到剪贴板 | |
<kbd>&lt;c-b&gt;</kbd>: Filter files by status | `` <space> `` | 切换暂存状态 | |
<kbd>y</kbd>: Copy to clipboard | `` <c-b> `` | Filter files by status | |
<kbd>c</kbd>: 提交更改 | `` y `` | Copy to clipboard | |
<kbd>w</kbd>: 提交更改而无需预先提交钩子 | `` c `` | 提交更改 | |
<kbd>A</kbd>: 修补最后一次提交 | `` w `` | 提交更改而无需预先提交钩子 | |
<kbd>C</kbd>: 提交更改(使用编辑器编辑提交信息) | `` A `` | 修补最后一次提交 | |
<kbd>&lt;c-f&gt;</kbd>: Find base commit for fixup | `` C `` | 提交更改(使用编辑器编辑提交信息) | |
<kbd>e</kbd>: 编辑文件 | `` <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> |
<kbd>o</kbd>: 打开文件 | `` e `` | 编辑文件 | |
<kbd>i</kbd>: 忽略文件 | `` o `` | 打开文件 | |
<kbd>r</kbd>: 刷新文件 | `` i `` | 忽略文件 | |
<kbd>s</kbd>: 将所有更改加入贮藏 | `` r `` | 刷新文件 | |
<kbd>S</kbd>: 查看贮藏选项 | `` s `` | 将所有更改加入贮藏 | |
<kbd>a</kbd>: 切换所有文件的暂存状态 | `` S `` | 查看贮藏选项 | |
<kbd>&lt;enter&gt;</kbd>: 暂存单个 块/行 用于文件, 或 折叠/展开 目录 | `` a `` | 切换所有文件的暂存状态 | |
<kbd>d</kbd>: 查看'放弃更改'选项 | `` <enter> `` | 暂存单个 块/行 用于文件, 或 折叠/展开 目录 | |
<kbd>g</kbd>: 查看上游重置选项 | `` d `` | 查看'放弃更改'选项 | |
<kbd>D</kbd>: 查看重置选项 | `` g `` | 查看上游重置选项 | |
<kbd>`</kbd>: 切换文件树视图 | `` D `` | 查看重置选项 | |
<kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool) | `` ` `` | 切换文件树视图 | |
<kbd>M</kbd>: 打开外部合并工具 (git mergetool) | `` <c-t> `` | Open external diff tool (git difftool) | |
<kbd>f</kbd>: 抓取 | `` M `` | 打开外部合并工具 (git mergetool) | |
<kbd>/</kbd>: 开始搜索 | `` f `` | 抓取 | |
</pre> | `` / `` | 开始搜索 | |
## 构建补丁中 ## 构建补丁中
<pre> | Key | Action | Info |
<kbd>&lt;left&gt;</kbd>: 选择上一个区块 |-----|--------|-------------|
<kbd>&lt;right&gt;</kbd>: 选择下一个区块 | `` <left> `` | 选择上一个区块 | |
<kbd>v</kbd>: 切换拖动选择 | `` <right> `` | 选择下一个区块 | |
<kbd>a</kbd>: 切换选择区块 | `` v `` | 切换拖动选择 | |
<kbd>&lt;c-o&gt;</kbd>: 将选中文本复制到剪贴板 | `` a `` | 切换选择区块 | |
<kbd>o</kbd>: 打开文件 | `` <c-o> `` | 将选中文本复制到剪贴板 | |
<kbd>e</kbd>: 编辑文件 | `` o `` | 打开文件 | |
<kbd>&lt;space&gt;</kbd>: 添加/移除 行到补丁 | `` e `` | 编辑文件 | |
<kbd>&lt;esc&gt;</kbd>: 退出逐行模式 | `` <space> `` | 添加/移除 行到补丁 | |
<kbd>/</kbd>: 开始搜索 | `` <esc> `` | 退出逐行模式 | |
</pre> | `` / `` | 开始搜索 | |
## 标签页面 ## 标签页面
<pre> | Key | Action | Info |
<kbd>&lt;space&gt;</kbd>: 检出 |-----|--------|-------------|
<kbd>d</kbd>: View delete options | `` <space> `` | 检出 | |
<kbd>P</kbd>: 推送标签 | `` d `` | View delete options | |
<kbd>n</kbd>: 创建标签 | `` P `` | 推送标签 | |
<kbd>g</kbd>: 查看重置选项 | `` n `` | 创建标签 | |
<kbd>w</kbd>: View worktree options | `` g `` | 查看重置选项 | |
<kbd>&lt;enter&gt;</kbd>: 查看提交 | `` w `` | View worktree options | |
<kbd>/</kbd>: Filter the current view by text | `` <enter> `` | 查看提交 | |
</pre> | `` / `` | Filter the current view by text | |
## 正在合并 ## 正在合并
<pre> | Key | Action | Info |
<kbd>e</kbd>: 编辑文件 |-----|--------|-------------|
<kbd>o</kbd>: 打开文件 | `` e `` | 编辑文件 | |
<kbd>&lt;left&gt;</kbd>: 选择上一个冲突 | `` o `` | 打开文件 | |
<kbd>&lt;right&gt;</kbd>: 选择下一个冲突 | `` <left> `` | 选择上一个冲突 | |
<kbd>&lt;up&gt;</kbd>: 选择顶部块 | `` <right> `` | 选择下一个冲突 | |
<kbd>&lt;down&gt;</kbd>: 选择底部块 | `` <up> `` | 选择顶部块 | |
<kbd>z</kbd>: 撤销 | `` <down> `` | 选择底部块 | |
<kbd>M</kbd>: 打开外部合并工具 (git mergetool) | `` z `` | 撤销 | |
<kbd>&lt;space&gt;</kbd>: 选中区块 | `` M `` | 打开外部合并工具 (git mergetool) | |
<kbd>b</kbd>: 选中所有区块 | `` <space> `` | 选中区块 | |
<kbd>&lt;esc&gt;</kbd>: 返回文件面板 | `` b `` | 选中所有区块 | |
</pre> | `` <esc> `` | 返回文件面板 | |
## 正在暂存 ## 正在暂存
<pre> | Key | Action | Info |
<kbd>&lt;left&gt;</kbd>: 选择上一个区块 |-----|--------|-------------|
<kbd>&lt;right&gt;</kbd>: 选择下一个区块 | `` <left> `` | 选择上一个区块 | |
<kbd>v</kbd>: 切换拖动选择 | `` <right> `` | 选择下一个区块 | |
<kbd>a</kbd>: 切换选择区块 | `` v `` | 切换拖动选择 | |
<kbd>&lt;c-o&gt;</kbd>: 将选中文本复制到剪贴板 | `` a `` | 切换选择区块 | |
<kbd>o</kbd>: 打开文件 | `` <c-o> `` | 将选中文本复制到剪贴板 | |
<kbd>e</kbd>: 编辑文件 | `` o `` | 打开文件 | |
<kbd>&lt;esc&gt;</kbd>: 返回文件面板 | `` e `` | 编辑文件 | |
<kbd>&lt;tab&gt;</kbd>: 切换到其他面板 | `` <esc> `` | 返回文件面板 | |
<kbd>&lt;space&gt;</kbd>: 切换行暂存状态 | `` <tab> `` | 切换到其他面板 | |
<kbd>d</kbd>: 取消变更 (git reset) | `` <space> `` | 切换行暂存状态 | |
<kbd>E</kbd>: Edit hunk | `` d `` | 取消变更 (git reset) | |
<kbd>c</kbd>: 提交更改 | `` E `` | Edit hunk | |
<kbd>w</kbd>: 提交更改而无需预先提交钩子 | `` c `` | 提交更改 | |
<kbd>C</kbd>: 提交更改(使用编辑器编辑提交信息) | `` w `` | 提交更改而无需预先提交钩子 | |
<kbd>/</kbd>: 开始搜索 | `` C `` | 提交更改(使用编辑器编辑提交信息) | |
</pre> | `` / `` | 开始搜索 | |
## 正常 ## 正常
<pre> | Key | Action | Info |
<kbd>mouse wheel down</kbd>: 向下滚动 (fn+up) |-----|--------|-------------|
<kbd>mouse wheel up</kbd>: 向上滚动 (fn+down) | `` mouse wheel down (fn+up) `` | 向下滚动 | |
</pre> | `` mouse wheel up (fn+down) `` | 向上滚动 | |
## 状态 ## 状态
<pre> | Key | Action | Info |
<kbd>o</kbd>: 打开配置文件 |-----|--------|-------------|
<kbd>e</kbd>: 编辑配置文件 | `` o `` | 打开配置文件 | |
<kbd>u</kbd>: 检查更新 | `` e `` | 编辑配置文件 | |
<kbd>&lt;enter&gt;</kbd>: 切换到最近的仓库 | `` u `` | 检查更新 | |
<kbd>a</kbd>: 显示所有分支的日志 | `` <enter> `` | 切换到最近的仓库 | |
</pre> | `` a `` | 显示所有分支的日志 | |
## 确认面板 ## 确认面板
<pre> | Key | Action | Info |
<kbd>&lt;enter&gt;</kbd>: 确认 |-----|--------|-------------|
<kbd>&lt;esc&gt;</kbd>: 关闭 | `` <enter> `` | 确认 | |
</pre> | `` <esc> `` | 关闭 | |
## 菜单 ## 菜单
<pre> | Key | Action | Info |
<kbd>&lt;enter&gt;</kbd>: 执行 |-----|--------|-------------|
<kbd>&lt;esc&gt;</kbd>: 关闭 | `` <enter> `` | 执行 | |
<kbd>/</kbd>: Filter the current view by text | `` <esc> `` | 关闭 | |
</pre> | `` / `` | Filter the current view by text | |
## 贮藏 ## 贮藏
<pre> | Key | Action | Info |
<kbd>&lt;space&gt;</kbd>: 应用 |-----|--------|-------------|
<kbd>g</kbd>: 应用并删除 | `` <space> `` | 应用 | |
<kbd>d</kbd>: 删除 | `` g `` | 应用并删除 | |
<kbd>n</kbd>: 新分支 | `` d `` | 删除 | |
<kbd>r</kbd>: Rename stash | `` n `` | 新分支 | |
<kbd>w</kbd>: View worktree options | `` r `` | Rename stash | |
<kbd>&lt;enter&gt;</kbd>: 查看提交的文件 | `` w `` | View worktree options | |
<kbd>/</kbd>: Filter the current view by text | `` <enter> `` | 查看提交的文件 | |
</pre> | `` / `` | Filter the current view by text | |
## 远程分支 ## 远程分支
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: 将分支名称复制到剪贴板 |-----|--------|-------------|
<kbd>&lt;space&gt;</kbd>: 检出 | `` <c-o> `` | 将分支名称复制到剪贴板 | |
<kbd>n</kbd>: 新分支 | `` <space> `` | 检出 | |
<kbd>M</kbd>: 合并到当前检出的分支 | `` n `` | 新分支 | |
<kbd>r</kbd>: 将已检出的分支变基到该分支 | `` M `` | 合并到当前检出的分支 | |
<kbd>d</kbd>: Delete remote tag | `` r `` | 将已检出的分支变基到该分支 | |
<kbd>u</kbd>: 设置为检出分支的上游 | `` d `` | Delete remote tag | |
<kbd>s</kbd>: Sort order | `` u `` | 设置为检出分支的上游 | |
<kbd>g</kbd>: 查看重置选项 | `` s `` | Sort order | |
<kbd>w</kbd>: View worktree options | `` g `` | 查看重置选项 | |
<kbd>&lt;enter&gt;</kbd>: 查看提交 | `` w `` | View worktree options | |
<kbd>/</kbd>: Filter the current view by text | `` <enter> `` | 查看提交 | |
</pre> | `` / `` | Filter the current view by text | |
## 远程页面 ## 远程页面
<pre> | Key | Action | Info |
<kbd>f</kbd>: 抓取远程仓库 |-----|--------|-------------|
<kbd>n</kbd>: 添加新的远程仓库 | `` f `` | 抓取远程仓库 | |
<kbd>d</kbd>: 删除远程 | `` n `` | 添加新的远程仓库 | |
<kbd>e</kbd>: 编辑远程仓库 | `` d `` | 删除远程 | |
<kbd>/</kbd>: Filter the current view by text | `` e `` | 编辑远程仓库 | |
</pre> | `` / `` | Filter the current view by text | |

View File

@ -6,356 +6,357 @@ _說明:`<c-b>` 表示 Ctrl+B、`<a-b>` 表示 Alt+B,`B`表示 Shift+B_
## 全局快捷鍵 ## 全局快捷鍵
<pre> | Key | Action | Info |
<kbd>&lt;c-r&gt;</kbd>: 切換到最近使用的版本庫 |-----|--------|-------------|
<kbd>&lt;pgup&gt;</kbd>: 向上捲動主面板 (fn+up/shift+k) | `` <c-r> `` | 切換到最近使用的版本庫 | |
<kbd>&lt;pgdown&gt;</kbd>: 向下捲動主面板 (fn+down/shift+j) | `` <pgup> (fn+up/shift+k) `` | 向上捲動主面板 | |
<kbd>@</kbd>: 開啟命令記錄選單 | `` <pgdown> (fn+down/shift+j) `` | 向下捲動主面板 | |
<kbd>}</kbd>: 增加差異檢視中顯示變更周圍上下文的大小 | `` @ `` | 開啟命令記錄選單 | |
<kbd>{</kbd>: 減小差異檢視中顯示變更周圍上下文的大小 | `` } `` | 增加差異檢視中顯示變更周圍上下文的大小 | |
<kbd>:</kbd>: 執行自訂命令 | `` { `` | 減小差異檢視中顯示變更周圍上下文的大小 | |
<kbd>&lt;c-p&gt;</kbd>: 檢視自訂補丁選項 | `` : `` | 執行自訂命令 | |
<kbd>m</kbd>: 查看合併/變基選項 | `` <c-p> `` | 檢視自訂補丁選項 | |
<kbd>R</kbd>: 重新整理 | `` m `` | 查看合併/變基選項 | |
<kbd>+</kbd>: 下一個螢幕模式(常規/半螢幕/全螢幕) | `` R `` | 重新整理 | |
<kbd>_</kbd>: 上一個螢幕模式 | `` + `` | 下一個螢幕模式(常規/半螢幕/全螢幕) | |
<kbd>?</kbd>: 開啟選單 | `` _ `` | 上一個螢幕模式 | |
<kbd>&lt;c-s&gt;</kbd>: 檢視篩選路徑選項 | `` ? `` | 開啟選單 | |
<kbd>W</kbd>: 開啟差異比較選單 | `` <c-s> `` | 檢視篩選路徑選項 | |
<kbd>&lt;c-e&gt;</kbd>: 開啟差異比較選單 | `` W `` | 開啟差異比較選單 | |
<kbd>&lt;c-w&gt;</kbd>: 切換是否在差異檢視中顯示空格變更 | `` <c-e> `` | 開啟差異比較選單 | |
<kbd>z</kbd>: 復原 | `` <c-w> `` | 切換是否在差異檢視中顯示空格變更 | |
<kbd>&lt;c-z&gt;</kbd>: 取消復原 | `` z `` | 復原 | 將使用 reflog 確定要運行哪個 git 命令以復原上一個 git 命令。這不包括工作區的更改;只考慮提交。 |
<kbd>P</kbd>: 推送 | `` <c-z> `` | 取消復原 | 將使用 reflog 確定要運行哪個 git 命令以重作上一個 git 命令。這不包括工作區的更改;只考慮提交。 |
<kbd>p</kbd>: 拉取 | `` P `` | 推送 | |
</pre> | `` p `` | 拉取 | |
## 列表面板導航 ## 列表面板導航
<pre> | Key | Action | Info |
<kbd>,</kbd>: 上一頁 |-----|--------|-------------|
<kbd>.</kbd>: 下一頁 | `` , `` | 上一頁 | |
<kbd>&lt;</kbd>: 捲動到頂部 | `` . `` | 下一頁 | |
<kbd>&gt;</kbd>: 捲動到底部 | `` < `` | 捲動到頂部 | |
<kbd>v</kbd>: 切換拖曳選擇 | `` > `` | 捲動到底部 | |
<kbd>&lt;s-down&gt;</kbd>: Range select down | `` v `` | 切換拖曳選擇 | |
<kbd>&lt;s-up&gt;</kbd>: Range select up | `` <s-down> `` | Range select down | |
<kbd>/</kbd>: 開始搜尋 | `` <s-up> `` | Range select up | |
<kbd>H</kbd>: 向左捲動 | `` / `` | 開始搜尋 | |
<kbd>L</kbd>: 向右捲動 | `` H `` | 向左捲動 | |
<kbd>]</kbd>: 下一個索引標籤 | `` L `` | 向右捲動 | |
<kbd>[</kbd>: 上一個索引標籤 | `` ] `` | 下一個索引標籤 | |
</pre> | `` [ `` | 上一個索引標籤 | |
## Reflog ## Reflog
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: 複製提交 SHA 到剪貼簿 |-----|--------|-------------|
<kbd>w</kbd>: View worktree options | `` <c-o> `` | 複製提交 SHA 到剪貼簿 | |
<kbd>&lt;space&gt;</kbd>: 檢出提交 | `` w `` | View worktree options | |
<kbd>y</kbd>: 複製提交屬性 | `` <space> `` | 檢出提交 | |
<kbd>o</kbd>: 在瀏覽器中開啟提交 | `` y `` | 複製提交屬性 | |
<kbd>n</kbd>: 從提交建立新分支 | `` o `` | 在瀏覽器中開啟提交 | |
<kbd>g</kbd>: 檢視重設選項 | `` n `` | 從提交建立新分支 | |
<kbd>C</kbd>: 複製提交 (揀選) | `` g `` | 檢視重設選項 | |
<kbd>&lt;c-r&gt;</kbd>: 重設選定的揀選 (複製) 提交 | `` C `` | 複製提交 (揀選) | |
<kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool) | `` <c-r> `` | 重設選定的揀選 (複製) 提交 | |
<kbd>&lt;enter&gt;</kbd>: 檢視提交 | `` <c-t> `` | Open external diff tool (git difftool) | |
<kbd>/</kbd>: Filter the current view by text | `` <enter> `` | 檢視提交 | |
</pre> | `` / `` | Filter the current view by text | |
## Worktrees ## Worktrees
<pre> | Key | Action | Info |
<kbd>n</kbd>: Create worktree |-----|--------|-------------|
<kbd>&lt;space&gt;</kbd>: Switch to worktree | `` n `` | Create worktree | |
<kbd>&lt;enter&gt;</kbd>: Switch to worktree | `` <space> `` | Switch to worktree | |
<kbd>o</kbd>: Open in editor | `` <enter> `` | Switch to worktree | |
<kbd>d</kbd>: Remove worktree | `` o `` | Open in editor | |
<kbd>/</kbd>: Filter the current view by text | `` d `` | Remove worktree | |
</pre> | `` / `` | Filter the current view by text | |
## 主視窗 (一般) ## 主視窗 (一般)
<pre> | Key | Action | Info |
<kbd>mouse wheel down</kbd>: 向下捲動 (fn+up) |-----|--------|-------------|
<kbd>mouse wheel up</kbd>: 向上捲動 (fn+down) | `` mouse wheel down (fn+up) `` | 向下捲動 | |
</pre> | `` mouse wheel up (fn+down) `` | 向上捲動 | |
## 主視窗 (合併中) ## 主視窗 (合併中)
<pre> | Key | Action | Info |
<kbd>e</kbd>: 編輯檔案 |-----|--------|-------------|
<kbd>o</kbd>: 開啟檔案 | `` e `` | 編輯檔案 | |
<kbd>&lt;left&gt;</kbd>: 選擇上一個衝突 | `` o `` | 開啟檔案 | |
<kbd>&lt;right&gt;</kbd>: 選擇下一個衝突 | `` <left> `` | 選擇上一個衝突 | |
<kbd>&lt;up&gt;</kbd>: 選擇上一段 | `` <right> `` | 選擇下一個衝突 | |
<kbd>&lt;down&gt;</kbd>: 選擇下一段 | `` <up> `` | 選擇上一段 | |
<kbd>z</kbd>: 復原 | `` <down> `` | 選擇下一段 | |
<kbd>M</kbd>: 開啟外部合併工具 (git mergetool) | `` z `` | 復原 | |
<kbd>&lt;space&gt;</kbd>: 挑選程式碼片段 | `` M `` | 開啟外部合併工具 (git mergetool) | |
<kbd>b</kbd>: 挑選所有程式碼片段 | `` <space> `` | 挑選程式碼片段 | |
<kbd>&lt;esc&gt;</kbd>: 返回檔案面板 | `` b `` | 挑選所有程式碼片段 | |
</pre> | `` <esc> `` | 返回檔案面板 | |
## 主視窗 (預存中) ## 主視窗 (預存中)
<pre> | Key | Action | Info |
<kbd>&lt;left&gt;</kbd>: 選擇上一段 |-----|--------|-------------|
<kbd>&lt;right&gt;</kbd>: 選擇下一段 | `` <left> `` | 選擇上一段 | |
<kbd>v</kbd>: 切換拖曳選擇 | `` <right> `` | 選擇下一段 | |
<kbd>a</kbd>: 切換選擇程式碼塊 | `` v `` | 切換拖曳選擇 | |
<kbd>&lt;c-o&gt;</kbd>: 複製所選文本至剪貼簿 | `` a `` | 切換選擇程式碼塊 | |
<kbd>o</kbd>: 開啟檔案 | `` <c-o> `` | 複製所選文本至剪貼簿 | |
<kbd>e</kbd>: 編輯檔案 | `` o `` | 開啟檔案 | |
<kbd>&lt;esc&gt;</kbd>: 返回檔案面板 | `` e `` | 編輯檔案 | |
<kbd>&lt;tab&gt;</kbd>: 切換至另一個面板 (已預存/未預存更改) | `` <esc> `` | 返回檔案面板 | |
<kbd>&lt;space&gt;</kbd>: 切換現有行的狀態 (已預存/未預存) | `` <tab> `` | 切換至另一個面板 (已預存/未預存更改) | |
<kbd>d</kbd>: 刪除變更 (git reset) | `` <space> `` | 切換現有行的狀態 (已預存/未預存) | |
<kbd>E</kbd>: 編輯程式碼塊 | `` d `` | 刪除變更 (git reset) | |
<kbd>c</kbd>: 提交變更 | `` E `` | 編輯程式碼塊 | |
<kbd>w</kbd>: 沒有預提交 hook 就提交更改 | `` c `` | 提交變更 | |
<kbd>C</kbd>: 使用 git 編輯器提交變更 | `` w `` | 沒有預提交 hook 就提交更改 | |
<kbd>/</kbd>: 開始搜尋 | `` C `` | 使用 git 編輯器提交變更 | |
</pre> | `` / `` | 開始搜尋 | |
## 主面板 (補丁生成) ## 主面板 (補丁生成)
<pre> | Key | Action | Info |
<kbd>&lt;left&gt;</kbd>: 選擇上一段 |-----|--------|-------------|
<kbd>&lt;right&gt;</kbd>: 選擇下一段 | `` <left> `` | 選擇上一段 | |
<kbd>v</kbd>: 切換拖曳選擇 | `` <right> `` | 選擇下一段 | |
<kbd>a</kbd>: 切換選擇程式碼塊 | `` v `` | 切換拖曳選擇 | |
<kbd>&lt;c-o&gt;</kbd>: 複製所選文本至剪貼簿 | `` a `` | 切換選擇程式碼塊 | |
<kbd>o</kbd>: 開啟檔案 | `` <c-o> `` | 複製所選文本至剪貼簿 | |
<kbd>e</kbd>: 編輯檔案 | `` o `` | 開啟檔案 | |
<kbd>&lt;space&gt;</kbd>: 向 (或從) 補丁中添加/刪除行 | `` e `` | 編輯檔案 | |
<kbd>&lt;esc&gt;</kbd>: 退出自訂補丁建立器 | `` <space> `` | 向 (或從) 補丁中添加/刪除行 | |
<kbd>/</kbd>: 開始搜尋 | `` <esc> `` | 退出自訂補丁建立器 | |
</pre> | `` / `` | 開始搜尋 | |
## 功能表 ## 功能表
<pre> | Key | Action | Info |
<kbd>&lt;enter&gt;</kbd>: 執行 |-----|--------|-------------|
<kbd>&lt;esc&gt;</kbd>: 關閉 | `` <enter> `` | 執行 | |
<kbd>/</kbd>: Filter the current view by text | `` <esc> `` | 關閉 | |
</pre> | `` / `` | Filter the current view by text | |
## 子提交 ## 子提交
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: 複製提交 SHA 到剪貼簿 |-----|--------|-------------|
<kbd>w</kbd>: View worktree options | `` <c-o> `` | 複製提交 SHA 到剪貼簿 | |
<kbd>&lt;space&gt;</kbd>: 檢出提交 | `` w `` | View worktree options | |
<kbd>y</kbd>: 複製提交屬性 | `` <space> `` | 檢出提交 | |
<kbd>o</kbd>: 在瀏覽器中開啟提交 | `` y `` | 複製提交屬性 | |
<kbd>n</kbd>: 從提交建立新分支 | `` o `` | 在瀏覽器中開啟提交 | |
<kbd>g</kbd>: 檢視重設選項 | `` n `` | 從提交建立新分支 | |
<kbd>C</kbd>: 複製提交 (揀選) | `` g `` | 檢視重設選項 | |
<kbd>&lt;c-r&gt;</kbd>: 重設選定的揀選 (複製) 提交 | `` C `` | 複製提交 (揀選) | |
<kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool) | `` <c-r> `` | 重設選定的揀選 (複製) 提交 | |
<kbd>&lt;enter&gt;</kbd>: 檢視所選項目的檔案 | `` <c-t> `` | Open external diff tool (git difftool) | |
<kbd>/</kbd>: 開始搜尋 | `` <enter> `` | 檢視所選項目的檔案 | |
</pre> | `` / `` | 開始搜尋 | |
## 子模組 ## 子模組
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: 複製子模組名稱到剪貼簿 |-----|--------|-------------|
<kbd>&lt;enter&gt;</kbd>: 進入子模組 | `` <c-o> `` | 複製子模組名稱到剪貼簿 | |
<kbd>&lt;space&gt;</kbd>: 進入子模組 | `` <enter> `` | 進入子模組 | |
<kbd>d</kbd>: 移除子模組 | `` <space> `` | 進入子模組 | |
<kbd>u</kbd>: 更新子模組 | `` d `` | 移除子模組 | |
<kbd>n</kbd>: 新增子模組 | `` u `` | 更新子模組 | |
<kbd>e</kbd>: 更新子模組 URL | `` n `` | 新增子模組 | |
<kbd>i</kbd>: 初始化子模組 | `` e `` | 更新子模組 URL | |
<kbd>b</kbd>: 查看批量子模組選項 | `` i `` | 初始化子模組 | |
<kbd>/</kbd>: Filter the current view by text | `` b `` | 查看批量子模組選項 | |
</pre> | `` / `` | Filter the current view by text | |
## 提交 ## 提交
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: 複製提交 SHA 到剪貼簿 |-----|--------|-------------|
<kbd>&lt;c-r&gt;</kbd>: 重設選定的揀選 (複製) 提交 | `` <c-o> `` | 複製提交 SHA 到剪貼簿 | |
<kbd>b</kbd>: 查看二分選項 | `` <c-r> `` | 重設選定的揀選 (複製) 提交 | |
<kbd>s</kbd>: 向下壓縮 | `` b `` | 查看二分選項 | |
<kbd>f</kbd>: 修復提交 (Fixup) | `` s `` | 向下壓縮 | |
<kbd>r</kbd>: 改寫提交 | `` f `` | 修復提交 (Fixup) | |
<kbd>R</kbd>: 使用編輯器改寫提交 | `` r `` | 改寫提交 | |
<kbd>d</kbd>: 刪除提交 | `` R `` | 使用編輯器改寫提交 | |
<kbd>e</kbd>: 編輯提交 | `` d `` | 刪除提交 | |
<kbd>i</kbd>: Start interactive rebase | `` e `` | 編輯提交 | |
<kbd>p</kbd>: 挑選提交 (於變基過程中) | `` 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.
<kbd>F</kbd>: 為此提交建立修復提交 If you would instead like to start an interactive rebase from the selected commit, press `e`. |
<kbd>S</kbd>: 壓縮上方所有的“fixup!”提交 (自動壓縮) | `` p `` | 挑選提交 (於變基過程中) | |
<kbd>&lt;c-j&gt;</kbd>: 向下移動提交 | `` F `` | 為此提交建立修復提交 | |
<kbd>&lt;c-k&gt;</kbd>: 向上移動提交 | `` S `` | 壓縮上方所有的“fixup!”提交 (自動壓縮) | |
<kbd>V</kbd>: 貼上提交 (揀選) | `` <c-j> `` | 向下移動提交 | |
<kbd>B</kbd>: Mark commit as base commit for rebase | `` <c-k> `` | 向上移動提交 | |
<kbd>A</kbd>: 使用已預存的更改修正提交 | `` V `` | 貼上提交 (揀選) | |
<kbd>a</kbd>: 設置/重設提交作者 | `` B `` | Mark commit as base commit for rebase | Select a base commit for the next rebase; this will effectively perform a 'git rebase --onto'. |
<kbd>t</kbd>: 還原提交 | `` A `` | 使用已預存的更改修正提交 | |
<kbd>T</kbd>: 打標籤到提交 | `` a `` | 設置/重設提交作者 | |
<kbd>&lt;c-l&gt;</kbd>: 開啟記錄選單 | `` t `` | 還原提交 | |
<kbd>w</kbd>: View worktree options | `` T `` | 打標籤到提交 | |
<kbd>&lt;space&gt;</kbd>: 檢出提交 | `` <c-l> `` | 開啟記錄選單 | |
<kbd>y</kbd>: 複製提交屬性 | `` w `` | View worktree options | |
<kbd>o</kbd>: 在瀏覽器中開啟提交 | `` <space> `` | 檢出提交 | |
<kbd>n</kbd>: 從提交建立新分支 | `` y `` | 複製提交屬性 | |
<kbd>g</kbd>: 檢視重設選項 | `` o `` | 在瀏覽器中開啟提交 | |
<kbd>C</kbd>: 複製提交 (揀選) | `` n `` | 從提交建立新分支 | |
<kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool) | `` g `` | 檢視重設選項 | |
<kbd>&lt;enter&gt;</kbd>: 檢視所選項目的檔案 | `` C `` | 複製提交 (揀選) | |
<kbd>/</kbd>: 開始搜尋 | `` <c-t> `` | Open external diff tool (git difftool) | |
</pre> | `` <enter> `` | 檢視所選項目的檔案 | |
| `` / `` | 開始搜尋 | |
## 提交摘要 ## 提交摘要
<pre> | Key | Action | Info |
<kbd>&lt;enter&gt;</kbd>: 確認 |-----|--------|-------------|
<kbd>&lt;esc&gt;</kbd>: 關閉 | `` <enter> `` | 確認 | |
</pre> | `` <esc> `` | 關閉 | |
## 提交檔案 ## 提交檔案
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: 複製提交的檔案名稱到剪貼簿 |-----|--------|-------------|
<kbd>c</kbd>: 檢出檔案 | `` <c-o> `` | 複製提交的檔案名稱到剪貼簿 | |
<kbd>d</kbd>: 捨棄此提交對此檔案的更改 | `` c `` | 檢出檔案 | |
<kbd>o</kbd>: 開啟檔案 | `` d `` | 捨棄此提交對此檔案的更改 | |
<kbd>e</kbd>: 編輯檔案 | `` o `` | 開啟檔案 | |
<kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool) | `` e `` | 編輯檔案 | |
<kbd>&lt;space&gt;</kbd>: 切換檔案是否包含在補丁中 | `` <c-t> `` | Open external diff tool (git difftool) | |
<kbd>a</kbd>: 切換所有檔案是否包含在補丁中 | `` <space> `` | 切換檔案是否包含在補丁中 | |
<kbd>&lt;enter&gt;</kbd>: 輸入檔案以將選定的行添加至補丁(或切換目錄折疊) | `` a `` | 切換所有檔案是否包含在補丁中 | |
<kbd>`</kbd>: 切換檔案樹狀視圖 | `` <enter> `` | 輸入檔案以將選定的行添加至補丁(或切換目錄折疊) | |
<kbd>/</kbd>: 開始搜尋 | `` ` `` | 切換檔案樹狀視圖 | |
</pre> | `` / `` | 開始搜尋 | |
## 收藏 (Stash) ## 收藏 (Stash)
<pre> | Key | Action | Info |
<kbd>&lt;space&gt;</kbd>: 套用 |-----|--------|-------------|
<kbd>g</kbd>: 還原 | `` <space> `` | 套用 | |
<kbd>d</kbd>: 捨棄 | `` g `` | 還原 | |
<kbd>n</kbd>: 新分支 | `` d `` | 捨棄 | |
<kbd>r</kbd>: 重新命名收藏 | `` n `` | 新分支 | |
<kbd>w</kbd>: View worktree options | `` r `` | 重新命名收藏 | |
<kbd>&lt;enter&gt;</kbd>: 檢視所選項目的檔案 | `` w `` | View worktree options | |
<kbd>/</kbd>: Filter the current view by text | `` <enter> `` | 檢視所選項目的檔案 | |
</pre> | `` / `` | Filter the current view by text | |
## 本地分支 ## 本地分支
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: 複製分支名稱到剪貼簿 |-----|--------|-------------|
<kbd>i</kbd>: 顯示 git-flow 選項 | `` <c-o> `` | 複製分支名稱到剪貼簿 | |
<kbd>&lt;space&gt;</kbd>: 檢出 | `` i `` | 顯示 git-flow 選項 | |
<kbd>n</kbd>: 新分支 | `` <space> `` | 檢出 | |
<kbd>o</kbd>: 建立拉取請求 | `` n `` | 新分支 | |
<kbd>O</kbd>: 建立拉取請求選項 | `` o `` | 建立拉取請求 | |
<kbd>&lt;c-y&gt;</kbd>: 複製拉取請求的 URL 到剪貼板 | `` O `` | 建立拉取請求選項 | |
<kbd>c</kbd>: 根據名稱檢出 | `` <c-y> `` | 複製拉取請求的 URL 到剪貼板 | |
<kbd>F</kbd>: 強制檢出 | `` c `` | 根據名稱檢出 | |
<kbd>d</kbd>: View delete options | `` F `` | 強制檢出 | |
<kbd>r</kbd>: 將已檢出的分支變基至此分支 | `` d `` | View delete options | |
<kbd>M</kbd>: 合併到當前檢出的分支 | `` r `` | 將已檢出的分支變基至此分支 | |
<kbd>f</kbd>: 從上游快進此分支 | `` M `` | 合併到當前檢出的分支 | |
<kbd>T</kbd>: 建立標籤 | `` f `` | 從上游快進此分支 | |
<kbd>s</kbd>: Sort order | `` T `` | 建立標籤 | |
<kbd>g</kbd>: 檢視重設選項 | `` s `` | Sort order | |
<kbd>R</kbd>: 重新命名分支 | `` g `` | 檢視重設選項 | |
<kbd>u</kbd>: View upstream options | `` R `` | 重新命名分支 | |
<kbd>w</kbd>: View worktree options | `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream |
<kbd>&lt;enter&gt;</kbd>: 檢視提交 | `` w `` | View worktree options | |
<kbd>/</kbd>: Filter the current view by text | `` <enter> `` | 檢視提交 | |
</pre> | `` / `` | Filter the current view by text | |
## 標籤 ## 標籤
<pre> | Key | Action | Info |
<kbd>&lt;space&gt;</kbd>: 檢出 |-----|--------|-------------|
<kbd>d</kbd>: View delete options | `` <space> `` | 檢出 | |
<kbd>P</kbd>: 推送標籤 | `` d `` | View delete options | |
<kbd>n</kbd>: 建立標籤 | `` P `` | 推送標籤 | |
<kbd>g</kbd>: 檢視重設選項 | `` n `` | 建立標籤 | |
<kbd>w</kbd>: View worktree options | `` g `` | 檢視重設選項 | |
<kbd>&lt;enter&gt;</kbd>: 檢視提交 | `` w `` | View worktree options | |
<kbd>/</kbd>: Filter the current view by text | `` <enter> `` | 檢視提交 | |
</pre> | `` / `` | Filter the current view by text | |
## 檔案 ## 檔案
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: 複製檔案名稱到剪貼簿 |-----|--------|-------------|
<kbd>&lt;space&gt;</kbd>: 切換預存 | `` <c-o> `` | 複製檔案名稱到剪貼簿 | |
<kbd>&lt;c-b&gt;</kbd>: 篩選檔案 (預存/未預存) | `` <space> `` | 切換預存 | |
<kbd>y</kbd>: Copy to clipboard | `` <c-b> `` | 篩選檔案 (預存/未預存) | |
<kbd>c</kbd>: 提交變更 | `` y `` | Copy to clipboard | |
<kbd>w</kbd>: 沒有預提交 hook 就提交更改 | `` c `` | 提交變更 | |
<kbd>A</kbd>: 修正上次提交 | `` w `` | 沒有預提交 hook 就提交更改 | |
<kbd>C</kbd>: 使用 git 編輯器提交變更 | `` A `` | 修正上次提交 | |
<kbd>&lt;c-f&gt;</kbd>: Find base commit for fixup | `` C `` | 使用 git 編輯器提交變更 | |
<kbd>e</kbd>: 編輯檔案 | `` <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> |
<kbd>o</kbd>: 開啟檔案 | `` e `` | 編輯檔案 | |
<kbd>i</kbd>: 忽略或排除檔案 | `` o `` | 開啟檔案 | |
<kbd>r</kbd>: 重新整理檔案 | `` i `` | 忽略或排除檔案 | |
<kbd>s</kbd>: 收藏所有變更 | `` r `` | 重新整理檔案 | |
<kbd>S</kbd>: 檢視收藏選項 | `` s `` | 收藏所有變更 | |
<kbd>a</kbd>: 全部預存/取消預存 | `` S `` | 檢視收藏選項 | |
<kbd>&lt;enter&gt;</kbd>: 選擇檔案中的單個程式碼塊/行,或展開/折疊目錄 | `` a `` | 全部預存/取消預存 | |
<kbd>d</kbd>: 檢視“捨棄更改”的選項 | `` <enter> `` | 選擇檔案中的單個程式碼塊/行,或展開/折疊目錄 | |
<kbd>g</kbd>: 檢視上游重設選項 | `` d `` | 檢視“捨棄更改”的選項 | |
<kbd>D</kbd>: 檢視重設選項 | `` g `` | 檢視上游重設選項 | |
<kbd>`</kbd>: 切換檔案樹狀視圖 | `` D `` | 檢視重設選項 | |
<kbd>&lt;c-t&gt;</kbd>: Open external diff tool (git difftool) | `` ` `` | 切換檔案樹狀視圖 | |
<kbd>M</kbd>: 開啟外部合併工具 (git mergetool) | `` <c-t> `` | Open external diff tool (git difftool) | |
<kbd>f</kbd>: 擷取 | `` M `` | 開啟外部合併工具 (git mergetool) | |
<kbd>/</kbd>: 開始搜尋 | `` f `` | 擷取 | |
</pre> | `` / `` | 開始搜尋 | |
## 狀態 ## 狀態
<pre> | Key | Action | Info |
<kbd>o</kbd>: 開啟設定檔案 |-----|--------|-------------|
<kbd>e</kbd>: 編輯設定檔案 | `` o `` | 開啟設定檔案 | |
<kbd>u</kbd>: 檢查更新 | `` e `` | 編輯設定檔案 | |
<kbd>&lt;enter&gt;</kbd>: 切換到最近使用的版本庫 | `` u `` | 檢查更新 | |
<kbd>a</kbd>: 顯示所有分支日誌 | `` <enter> `` | 切換到最近使用的版本庫 | |
</pre> | `` a `` | 顯示所有分支日誌 | |
## 確認面板 ## 確認面板
<pre> | Key | Action | Info |
<kbd>&lt;enter&gt;</kbd>: 確認 |-----|--------|-------------|
<kbd>&lt;esc&gt;</kbd>: 關閉/取消 | `` <enter> `` | 確認 | |
</pre> | `` <esc> `` | 關閉/取消 | |
## 遠端 ## 遠端
<pre> | Key | Action | Info |
<kbd>f</kbd>: 擷取遠端 |-----|--------|-------------|
<kbd>n</kbd>: 新增遠端 | `` f `` | 擷取遠端 | |
<kbd>d</kbd>: 移除遠端 | `` n `` | 新增遠端 | |
<kbd>e</kbd>: 編輯遠端 | `` d `` | 移除遠端 | |
<kbd>/</kbd>: Filter the current view by text | `` e `` | 編輯遠端 | |
</pre> | `` / `` | Filter the current view by text | |
## 遠端分支 ## 遠端分支
<pre> | Key | Action | Info |
<kbd>&lt;c-o&gt;</kbd>: 複製分支名稱到剪貼簿 |-----|--------|-------------|
<kbd>&lt;space&gt;</kbd>: 檢出 | `` <c-o> `` | 複製分支名稱到剪貼簿 | |
<kbd>n</kbd>: 新分支 | `` <space> `` | 檢出 | |
<kbd>M</kbd>: 合併到當前檢出的分支 | `` n `` | 新分支 | |
<kbd>r</kbd>: 將已檢出的分支變基至此分支 | `` M `` | 合併到當前檢出的分支 | |
<kbd>d</kbd>: Delete remote tag | `` r `` | 將已檢出的分支變基至此分支 | |
<kbd>u</kbd>: 將此分支設為當前分支之上游 | `` d `` | Delete remote tag | |
<kbd>s</kbd>: Sort order | `` u `` | 將此分支設為當前分支之上游 | |
<kbd>g</kbd>: 檢視重設選項 | `` s `` | Sort order | |
<kbd>w</kbd>: View worktree options | `` g `` | 檢視重設選項 | |
<kbd>&lt;enter&gt;</kbd>: 檢視提交 | `` w `` | View worktree options | |
<kbd>/</kbd>: Filter the current view by text | `` <enter> `` | 檢視提交 | |
</pre> | `` / `` | Filter the current view by text | |

View File

@ -14,7 +14,6 @@ import (
"fmt" "fmt"
"log" "log"
"os" "os"
"strings"
"github.com/jesseduffield/generics/maps" "github.com/jesseduffield/generics/maps"
"github.com/jesseduffield/lazycore/pkg/utils" "github.com/jesseduffield/lazycore/pkg/utils"
@ -191,11 +190,11 @@ func formatSections(tr *i18n.TranslationSet, bindingSections []*bindingSection)
for _, section := range bindingSections { for _, section := range bindingSections {
content += formatTitle(section.title) content += formatTitle(section.title)
content += "<pre>\n" content += "| Key | Action | Info |\n"
content += "|-----|--------|-------------|\n"
for _, binding := range section.bindings { for _, binding := range section.bindings {
content += formatBinding(binding) content += formatBinding(binding)
} }
content += "</pre>\n"
} }
return content return content
@ -206,19 +205,15 @@ func formatTitle(title string) string {
} }
func formatBinding(binding *types.Binding) string { func formatBinding(binding *types.Binding) string {
result := fmt.Sprintf(" <kbd>%s</kbd>: %s", escapeAngleBrackets(keybindings.LabelFromKey(binding.Key)), binding.Description) action := keybindings.LabelFromKey(binding.Key)
description := binding.Description
if binding.Alternative != "" { if binding.Alternative != "" {
result += fmt.Sprintf(" (%s)", binding.Alternative) action += fmt.Sprintf(" (%s)", binding.Alternative)
} }
result += "\n"
return result // Use backticks for keyboard keys. Two backticks are needed with an inner space
} // to escape a key that is itself a backtick.
return fmt.Sprintf("| `` %s `` | %s | %s |\n", action, description, binding.Tooltip)
func escapeAngleBrackets(str string) string {
result := strings.ReplaceAll(str, ">", "&gt;")
result = strings.ReplaceAll(result, "<", "&lt;")
return result
} }
func italicize(str string) string { func italicize(str string) string {