mirror of
				https://github.com/jesseduffield/lazygit.git
				synced 2025-10-30 23:57:43 +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:
		| @@ -6,356 +6,357 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ | ||||
|  | ||||
| ## Global keybindings | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-r></kbd>: Switch to a recent repo | ||||
|   <kbd><pgup></kbd>: Scroll up main panel (fn+up/shift+k) | ||||
|   <kbd><pgdown></kbd>: Scroll down main panel (fn+down/shift+j) | ||||
|   <kbd>@</kbd>: Open command log menu | ||||
|   <kbd>}</kbd>: Increase the size of the context shown around changes in the diff view | ||||
|   <kbd>{</kbd>: Decrease the size of the context shown around changes in the diff view | ||||
|   <kbd>:</kbd>: Execute custom command | ||||
|   <kbd><c-p></kbd>: View custom patch options | ||||
|   <kbd>m</kbd>: View merge/rebase options | ||||
|   <kbd>R</kbd>: Refresh | ||||
|   <kbd>+</kbd>: Next screen mode (normal/half/fullscreen) | ||||
|   <kbd>_</kbd>: Prev screen mode | ||||
|   <kbd>?</kbd>: Open menu | ||||
|   <kbd><c-s></kbd>: View filter-by-path options | ||||
|   <kbd>W</kbd>: Open diff menu | ||||
|   <kbd><c-e></kbd>: Open diff menu | ||||
|   <kbd><c-w></kbd>: Toggle whether or not whitespace changes are shown in the diff view | ||||
|   <kbd>z</kbd>: Undo | ||||
|   <kbd><c-z></kbd>: Redo | ||||
|   <kbd>P</kbd>: Push | ||||
|   <kbd>p</kbd>: Pull | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-r> `` | Switch to a recent repo |  | | ||||
| | `` <pgup> (fn+up/shift+k) `` | Scroll up main panel |  | | ||||
| | `` <pgdown> (fn+down/shift+j) `` | Scroll down main panel |  | | ||||
| | `` @ `` | Open command log menu |  | | ||||
| | `` } `` | Increase the size of the context shown around changes in the diff view |  | | ||||
| | `` { `` | Decrease the size of the context shown around changes in the diff view |  | | ||||
| | `` : `` | Execute custom command |  | | ||||
| | `` <c-p> `` | View custom patch options |  | | ||||
| | `` m `` | View merge/rebase options |  | | ||||
| | `` R `` | Refresh |  | | ||||
| | `` + `` | Next screen mode (normal/half/fullscreen) |  | | ||||
| | `` _ `` | Prev screen mode |  | | ||||
| | `` ? `` | Open menu |  | | ||||
| | `` <c-s> `` | View filter-by-path options |  | | ||||
| | `` W `` | Open diff menu |  | | ||||
| | `` <c-e> `` | Open diff menu |  | | ||||
| | `` <c-w> `` | Toggle whether or not whitespace changes are shown in the diff view |  | | ||||
| | `` z `` | Undo | The reflog will be used to determine what git command to run to undo the last git command. This does not include changes to the working tree; only commits are taken into consideration. | | ||||
| | `` <c-z> `` | Redo | The reflog will be used to determine what git command to run to redo the last git command. This does not include changes to the working tree; only commits are taken into consideration. | | ||||
| | `` P `` | Push |  | | ||||
| | `` p `` | Pull |  | | ||||
|  | ||||
| ## List panel navigation | ||||
|  | ||||
| <pre> | ||||
|   <kbd>,</kbd>: Previous page | ||||
|   <kbd>.</kbd>: Next page | ||||
|   <kbd><</kbd>: Scroll to top | ||||
|   <kbd>></kbd>: Scroll to bottom | ||||
|   <kbd>v</kbd>: Toggle range select | ||||
|   <kbd><s-down></kbd>: Range select down | ||||
|   <kbd><s-up></kbd>: Range select up | ||||
|   <kbd>/</kbd>: Search the current view by text | ||||
|   <kbd>H</kbd>: Scroll left | ||||
|   <kbd>L</kbd>: Scroll right | ||||
|   <kbd>]</kbd>: Next tab | ||||
|   <kbd>[</kbd>: Previous tab | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` , `` | Previous page |  | | ||||
| | `` . `` | Next page |  | | ||||
| | `` < `` | Scroll to top |  | | ||||
| | `` > `` | Scroll to bottom |  | | ||||
| | `` v `` | Toggle range select |  | | ||||
| | `` <s-down> `` | Range select down |  | | ||||
| | `` <s-up> `` | Range select up |  | | ||||
| | `` / `` | Search the current view by text |  | | ||||
| | `` H `` | Scroll left |  | | ||||
| | `` L `` | Scroll right |  | | ||||
| | `` ] `` | Next tab |  | | ||||
| | `` [ `` | Previous tab |  | | ||||
|  | ||||
| ## Commit files | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: Copy the committed file name to the clipboard | ||||
|   <kbd>c</kbd>: Checkout file | ||||
|   <kbd>d</kbd>: Discard this commit's changes to this file | ||||
|   <kbd>o</kbd>: Open file | ||||
|   <kbd>e</kbd>: Edit file | ||||
|   <kbd><c-t></kbd>: Open external diff tool (git difftool) | ||||
|   <kbd><space></kbd>: Toggle file included in patch | ||||
|   <kbd>a</kbd>: Toggle all files included in patch | ||||
|   <kbd><enter></kbd>: Enter file to add selected lines to the patch (or toggle directory collapsed) | ||||
|   <kbd>`</kbd>: Toggle file tree view | ||||
|   <kbd>/</kbd>: Search the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | Copy the committed file name to the clipboard |  | | ||||
| | `` c `` | Checkout file |  | | ||||
| | `` d `` | Discard this commit's changes to this file |  | | ||||
| | `` o `` | Open file |  | | ||||
| | `` e `` | Edit file |  | | ||||
| | `` <c-t> `` | Open external diff tool (git difftool) |  | | ||||
| | `` <space> `` | Toggle file included in patch |  | | ||||
| | `` a `` | Toggle all files included in patch |  | | ||||
| | `` <enter> `` | Enter file to add selected lines to the patch (or toggle directory collapsed) |  | | ||||
| | `` ` `` | Toggle file tree view |  | | ||||
| | `` / `` | Search the current view by text |  | | ||||
|  | ||||
| ## Commit summary | ||||
|  | ||||
| <pre> | ||||
|   <kbd><enter></kbd>: Confirm | ||||
|   <kbd><esc></kbd>: Close | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <enter> `` | Confirm |  | | ||||
| | `` <esc> `` | Close |  | | ||||
|  | ||||
| ## Commits | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: Copy commit SHA to clipboard | ||||
|   <kbd><c-r></kbd>: Reset cherry-picked (copied) commits selection | ||||
|   <kbd>b</kbd>: View bisect options | ||||
|   <kbd>s</kbd>: Squash down | ||||
|   <kbd>f</kbd>: Fixup commit | ||||
|   <kbd>r</kbd>: Reword commit | ||||
|   <kbd>R</kbd>: Reword commit with editor | ||||
|   <kbd>d</kbd>: Delete commit | ||||
|   <kbd>e</kbd>: Edit commit | ||||
|   <kbd>i</kbd>: Start interactive rebase | ||||
|   <kbd>p</kbd>: Pick commit (when mid-rebase) | ||||
|   <kbd>F</kbd>: Create fixup commit for this commit | ||||
|   <kbd>S</kbd>: Squash all 'fixup!' commits above selected commit (autosquash) | ||||
|   <kbd><c-j></kbd>: Move commit down one | ||||
|   <kbd><c-k></kbd>: Move commit up one | ||||
|   <kbd>V</kbd>: Paste commits (cherry-pick) | ||||
|   <kbd>B</kbd>: Mark commit as base commit for rebase | ||||
|   <kbd>A</kbd>: Amend commit with staged changes | ||||
|   <kbd>a</kbd>: Set/Reset commit author | ||||
|   <kbd>t</kbd>: Revert commit | ||||
|   <kbd>T</kbd>: Tag commit | ||||
|   <kbd><c-l></kbd>: Open log menu | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><space></kbd>: Checkout commit | ||||
|   <kbd>y</kbd>: Copy commit attribute | ||||
|   <kbd>o</kbd>: Open commit in browser | ||||
|   <kbd>n</kbd>: Create new branch off of commit | ||||
|   <kbd>g</kbd>: View reset options | ||||
|   <kbd>C</kbd>: Copy commit (cherry-pick) | ||||
|   <kbd><c-t></kbd>: Open external diff tool (git difftool) | ||||
|   <kbd><enter></kbd>: View selected item's files | ||||
|   <kbd>/</kbd>: Search the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | Copy commit SHA to clipboard |  | | ||||
| | `` <c-r> `` | Reset cherry-picked (copied) commits selection |  | | ||||
| | `` b `` | View bisect options |  | | ||||
| | `` s `` | Squash down |  | | ||||
| | `` f `` | Fixup commit |  | | ||||
| | `` r `` | Reword commit |  | | ||||
| | `` R `` | Reword commit with editor |  | | ||||
| | `` d `` | Delete commit |  | | ||||
| | `` e `` | Edit commit |  | | ||||
| | `` i `` | Start interactive rebase | Start an interactive rebase for the commits on your branch. This will include all commits from the HEAD commit down to the first merge commit or main branch commit. | ||||
| If you would instead like to start an interactive rebase from the selected commit, press `e`. | | ||||
| | `` p `` | Pick commit (when mid-rebase) |  | | ||||
| | `` F `` | Create fixup commit for this commit |  | | ||||
| | `` S `` | Squash all 'fixup!' commits above selected commit (autosquash) |  | | ||||
| | `` <c-j> `` | Move commit down one |  | | ||||
| | `` <c-k> `` | Move commit up one |  | | ||||
| | `` V `` | Paste commits (cherry-pick) |  | | ||||
| | `` B `` | Mark commit as base commit for rebase | Select a base commit for the next rebase; this will effectively perform a 'git rebase --onto'. | | ||||
| | `` A `` | Amend commit with staged changes |  | | ||||
| | `` a `` | Set/Reset commit author |  | | ||||
| | `` t `` | Revert commit |  | | ||||
| | `` T `` | Tag commit |  | | ||||
| | `` <c-l> `` | Open log menu |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <space> `` | Checkout commit |  | | ||||
| | `` y `` | Copy commit attribute |  | | ||||
| | `` o `` | Open commit in browser |  | | ||||
| | `` n `` | Create new branch off of commit |  | | ||||
| | `` g `` | View reset options |  | | ||||
| | `` C `` | Copy commit (cherry-pick) |  | | ||||
| | `` <c-t> `` | Open external diff tool (git difftool) |  | | ||||
| | `` <enter> `` | View selected item's files |  | | ||||
| | `` / `` | Search the current view by text |  | | ||||
|  | ||||
| ## Confirmation panel | ||||
|  | ||||
| <pre> | ||||
|   <kbd><enter></kbd>: Confirm | ||||
|   <kbd><esc></kbd>: Close/Cancel | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <enter> `` | Confirm |  | | ||||
| | `` <esc> `` | Close/Cancel |  | | ||||
|  | ||||
| ## Files | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: Copy the file name to the clipboard | ||||
|   <kbd><space></kbd>: Toggle staged | ||||
|   <kbd><c-b></kbd>: Filter files by status | ||||
|   <kbd>y</kbd>: Copy to clipboard | ||||
|   <kbd>c</kbd>: Commit changes | ||||
|   <kbd>w</kbd>: Commit changes without pre-commit hook | ||||
|   <kbd>A</kbd>: Amend last commit | ||||
|   <kbd>C</kbd>: Commit changes using git editor | ||||
|   <kbd><c-f></kbd>: Find base commit for fixup | ||||
|   <kbd>e</kbd>: Edit file | ||||
|   <kbd>o</kbd>: Open file | ||||
|   <kbd>i</kbd>: Ignore or exclude file | ||||
|   <kbd>r</kbd>: Refresh files | ||||
|   <kbd>s</kbd>: Stash all changes | ||||
|   <kbd>S</kbd>: View stash options | ||||
|   <kbd>a</kbd>: Stage/unstage all | ||||
|   <kbd><enter></kbd>: Stage individual hunks/lines for file, or collapse/expand for directory | ||||
|   <kbd>d</kbd>: View 'discard changes' options | ||||
|   <kbd>g</kbd>: View upstream reset options | ||||
|   <kbd>D</kbd>: View reset options | ||||
|   <kbd>`</kbd>: Toggle file tree view | ||||
|   <kbd><c-t></kbd>: Open external diff tool (git difftool) | ||||
|   <kbd>M</kbd>: Open external merge tool (git mergetool) | ||||
|   <kbd>f</kbd>: Fetch | ||||
|   <kbd>/</kbd>: Search the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | Copy the file name to the clipboard |  | | ||||
| | `` <space> `` | Toggle staged |  | | ||||
| | `` <c-b> `` | Filter files by status |  | | ||||
| | `` y `` | Copy to clipboard |  | | ||||
| | `` c `` | Commit changes |  | | ||||
| | `` w `` | Commit changes without pre-commit hook |  | | ||||
| | `` A `` | Amend last commit |  | | ||||
| | `` C `` | Commit changes using git editor |  | | ||||
| | `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> | | ||||
| | `` e `` | Edit file |  | | ||||
| | `` o `` | Open file |  | | ||||
| | `` i `` | Ignore or exclude file |  | | ||||
| | `` r `` | Refresh files |  | | ||||
| | `` s `` | Stash all changes |  | | ||||
| | `` S `` | View stash options |  | | ||||
| | `` a `` | Stage/unstage all |  | | ||||
| | `` <enter> `` | Stage individual hunks/lines for file, or collapse/expand for directory |  | | ||||
| | `` d `` | View 'discard changes' options |  | | ||||
| | `` g `` | View upstream reset options |  | | ||||
| | `` D `` | View reset options |  | | ||||
| | `` ` `` | Toggle file tree view |  | | ||||
| | `` <c-t> `` | Open external diff tool (git difftool) |  | | ||||
| | `` M `` | Open external merge tool (git mergetool) |  | | ||||
| | `` f `` | Fetch |  | | ||||
| | `` / `` | Search the current view by text |  | | ||||
|  | ||||
| ## Local branches | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: Copy branch name to clipboard | ||||
|   <kbd>i</kbd>: Show git-flow options | ||||
|   <kbd><space></kbd>: Checkout | ||||
|   <kbd>n</kbd>: New branch | ||||
|   <kbd>o</kbd>: Create pull request | ||||
|   <kbd>O</kbd>: Create pull request options | ||||
|   <kbd><c-y></kbd>: Copy pull request URL to clipboard | ||||
|   <kbd>c</kbd>: Checkout by name, enter '-' to switch to last | ||||
|   <kbd>F</kbd>: Force checkout | ||||
|   <kbd>d</kbd>: View delete options | ||||
|   <kbd>r</kbd>: Rebase checked-out branch onto this branch | ||||
|   <kbd>M</kbd>: Merge into currently checked out branch | ||||
|   <kbd>f</kbd>: Fast-forward this branch from its upstream | ||||
|   <kbd>T</kbd>: Create tag | ||||
|   <kbd>s</kbd>: Sort order | ||||
|   <kbd>g</kbd>: View reset options | ||||
|   <kbd>R</kbd>: Rename branch | ||||
|   <kbd>u</kbd>: View upstream options | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><enter></kbd>: View commits | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | Copy branch name to clipboard |  | | ||||
| | `` i `` | Show git-flow options |  | | ||||
| | `` <space> `` | Checkout |  | | ||||
| | `` n `` | New branch |  | | ||||
| | `` o `` | Create pull request |  | | ||||
| | `` O `` | Create pull request options |  | | ||||
| | `` <c-y> `` | Copy pull request URL to clipboard |  | | ||||
| | `` c `` | Checkout by name, enter '-' to switch to last |  | | ||||
| | `` F `` | Force checkout |  | | ||||
| | `` d `` | View delete options |  | | ||||
| | `` r `` | Rebase checked-out branch onto this branch |  | | ||||
| | `` M `` | Merge into currently checked out branch |  | | ||||
| | `` f `` | Fast-forward this branch from its upstream |  | | ||||
| | `` T `` | Create tag |  | | ||||
| | `` s `` | Sort order |  | | ||||
| | `` g `` | View reset options |  | | ||||
| | `` R `` | Rename branch |  | | ||||
| | `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <enter> `` | View commits |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## Main panel (merging) | ||||
|  | ||||
| <pre> | ||||
|   <kbd>e</kbd>: Edit file | ||||
|   <kbd>o</kbd>: Open file | ||||
|   <kbd><left></kbd>: Select previous conflict | ||||
|   <kbd><right></kbd>: Select next conflict | ||||
|   <kbd><up></kbd>: Select previous hunk | ||||
|   <kbd><down></kbd>: Select next hunk | ||||
|   <kbd>z</kbd>: Undo | ||||
|   <kbd>M</kbd>: Open external merge tool (git mergetool) | ||||
|   <kbd><space></kbd>: Pick hunk | ||||
|   <kbd>b</kbd>: Pick all hunks | ||||
|   <kbd><esc></kbd>: Return to files panel | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` e `` | Edit file |  | | ||||
| | `` o `` | Open file |  | | ||||
| | `` <left> `` | Select previous conflict |  | | ||||
| | `` <right> `` | Select next conflict |  | | ||||
| | `` <up> `` | Select previous hunk |  | | ||||
| | `` <down> `` | Select next hunk |  | | ||||
| | `` z `` | Undo |  | | ||||
| | `` M `` | Open external merge tool (git mergetool) |  | | ||||
| | `` <space> `` | Pick hunk |  | | ||||
| | `` b `` | Pick all hunks |  | | ||||
| | `` <esc> `` | Return to files panel |  | | ||||
|  | ||||
| ## Main panel (normal) | ||||
|  | ||||
| <pre> | ||||
|   <kbd>mouse wheel down</kbd>: Scroll down (fn+up) | ||||
|   <kbd>mouse wheel up</kbd>: Scroll up (fn+down) | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` mouse wheel down (fn+up) `` | Scroll down |  | | ||||
| | `` mouse wheel up (fn+down) `` | Scroll up |  | | ||||
|  | ||||
| ## Main panel (patch building) | ||||
|  | ||||
| <pre> | ||||
|   <kbd><left></kbd>: Select previous hunk | ||||
|   <kbd><right></kbd>: Select next hunk | ||||
|   <kbd>v</kbd>: Toggle range select | ||||
|   <kbd>a</kbd>: Toggle select hunk | ||||
|   <kbd><c-o></kbd>: Copy the selected text to the clipboard | ||||
|   <kbd>o</kbd>: Open file | ||||
|   <kbd>e</kbd>: Edit file | ||||
|   <kbd><space></kbd>: Add/Remove line(s) to patch | ||||
|   <kbd><esc></kbd>: Exit custom patch builder | ||||
|   <kbd>/</kbd>: Search the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <left> `` | Select previous hunk |  | | ||||
| | `` <right> `` | Select next hunk |  | | ||||
| | `` v `` | Toggle range select |  | | ||||
| | `` a `` | Toggle select hunk |  | | ||||
| | `` <c-o> `` | Copy the selected text to the clipboard |  | | ||||
| | `` o `` | Open file |  | | ||||
| | `` e `` | Edit file |  | | ||||
| | `` <space> `` | Add/Remove line(s) to patch |  | | ||||
| | `` <esc> `` | Exit custom patch builder |  | | ||||
| | `` / `` | Search the current view by text |  | | ||||
|  | ||||
| ## Main panel (staging) | ||||
|  | ||||
| <pre> | ||||
|   <kbd><left></kbd>: Select previous hunk | ||||
|   <kbd><right></kbd>: Select next hunk | ||||
|   <kbd>v</kbd>: Toggle range select | ||||
|   <kbd>a</kbd>: Toggle select hunk | ||||
|   <kbd><c-o></kbd>: Copy the selected text to the clipboard | ||||
|   <kbd>o</kbd>: Open file | ||||
|   <kbd>e</kbd>: Edit file | ||||
|   <kbd><esc></kbd>: Return to files panel | ||||
|   <kbd><tab></kbd>: Switch to other panel (staged/unstaged changes) | ||||
|   <kbd><space></kbd>: Toggle line staged / unstaged | ||||
|   <kbd>d</kbd>: Discard change (git reset) | ||||
|   <kbd>E</kbd>: Edit hunk | ||||
|   <kbd>c</kbd>: Commit changes | ||||
|   <kbd>w</kbd>: Commit changes without pre-commit hook | ||||
|   <kbd>C</kbd>: Commit changes using git editor | ||||
|   <kbd>/</kbd>: Search the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <left> `` | Select previous hunk |  | | ||||
| | `` <right> `` | Select next hunk |  | | ||||
| | `` v `` | Toggle range select |  | | ||||
| | `` a `` | Toggle select hunk |  | | ||||
| | `` <c-o> `` | Copy the selected text to the clipboard |  | | ||||
| | `` o `` | Open file |  | | ||||
| | `` e `` | Edit file |  | | ||||
| | `` <esc> `` | Return to files panel |  | | ||||
| | `` <tab> `` | Switch to other panel (staged/unstaged changes) |  | | ||||
| | `` <space> `` | Toggle line staged / unstaged |  | | ||||
| | `` d `` | Discard change (git reset) |  | | ||||
| | `` E `` | Edit hunk |  | | ||||
| | `` c `` | Commit changes |  | | ||||
| | `` w `` | Commit changes without pre-commit hook |  | | ||||
| | `` C `` | Commit changes using git editor |  | | ||||
| | `` / `` | Search the current view by text |  | | ||||
|  | ||||
| ## Menu | ||||
|  | ||||
| <pre> | ||||
|   <kbd><enter></kbd>: Execute | ||||
|   <kbd><esc></kbd>: Close | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <enter> `` | Execute |  | | ||||
| | `` <esc> `` | Close |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## Reflog | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: Copy commit SHA to clipboard | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><space></kbd>: Checkout commit | ||||
|   <kbd>y</kbd>: Copy commit attribute | ||||
|   <kbd>o</kbd>: Open commit in browser | ||||
|   <kbd>n</kbd>: Create new branch off of commit | ||||
|   <kbd>g</kbd>: View reset options | ||||
|   <kbd>C</kbd>: Copy commit (cherry-pick) | ||||
|   <kbd><c-r></kbd>: Reset cherry-picked (copied) commits selection | ||||
|   <kbd><c-t></kbd>: Open external diff tool (git difftool) | ||||
|   <kbd><enter></kbd>: View commits | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | Copy commit SHA to clipboard |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <space> `` | Checkout commit |  | | ||||
| | `` y `` | Copy commit attribute |  | | ||||
| | `` o `` | Open commit in browser |  | | ||||
| | `` n `` | Create new branch off of commit |  | | ||||
| | `` g `` | View reset options |  | | ||||
| | `` C `` | Copy commit (cherry-pick) |  | | ||||
| | `` <c-r> `` | Reset cherry-picked (copied) commits selection |  | | ||||
| | `` <c-t> `` | Open external diff tool (git difftool) |  | | ||||
| | `` <enter> `` | View commits |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## Remote branches | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: Copy branch name to clipboard | ||||
|   <kbd><space></kbd>: Checkout | ||||
|   <kbd>n</kbd>: New branch | ||||
|   <kbd>M</kbd>: Merge into currently checked out branch | ||||
|   <kbd>r</kbd>: Rebase checked-out branch onto this branch | ||||
|   <kbd>d</kbd>: Delete remote tag | ||||
|   <kbd>u</kbd>: Set as upstream of checked-out branch | ||||
|   <kbd>s</kbd>: Sort order | ||||
|   <kbd>g</kbd>: View reset options | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><enter></kbd>: View commits | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | Copy branch name to clipboard |  | | ||||
| | `` <space> `` | Checkout |  | | ||||
| | `` n `` | New branch |  | | ||||
| | `` M `` | Merge into currently checked out branch |  | | ||||
| | `` r `` | Rebase checked-out branch onto this branch |  | | ||||
| | `` d `` | Delete remote tag |  | | ||||
| | `` u `` | Set as upstream of checked-out branch |  | | ||||
| | `` s `` | Sort order |  | | ||||
| | `` g `` | View reset options |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <enter> `` | View commits |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## Remotes | ||||
|  | ||||
| <pre> | ||||
|   <kbd>f</kbd>: Fetch remote | ||||
|   <kbd>n</kbd>: Add new remote | ||||
|   <kbd>d</kbd>: Remove remote | ||||
|   <kbd>e</kbd>: Edit remote | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` f `` | Fetch remote |  | | ||||
| | `` n `` | Add new remote |  | | ||||
| | `` d `` | Remove remote |  | | ||||
| | `` e `` | Edit remote |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## Stash | ||||
|  | ||||
| <pre> | ||||
|   <kbd><space></kbd>: Apply | ||||
|   <kbd>g</kbd>: Pop | ||||
|   <kbd>d</kbd>: Drop | ||||
|   <kbd>n</kbd>: New branch | ||||
|   <kbd>r</kbd>: Rename stash | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><enter></kbd>: View selected item's files | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <space> `` | Apply |  | | ||||
| | `` g `` | Pop |  | | ||||
| | `` d `` | Drop |  | | ||||
| | `` n `` | New branch |  | | ||||
| | `` r `` | Rename stash |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <enter> `` | View selected item's files |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## Status | ||||
|  | ||||
| <pre> | ||||
|   <kbd>o</kbd>: Open config file | ||||
|   <kbd>e</kbd>: Edit config file | ||||
|   <kbd>u</kbd>: Check for update | ||||
|   <kbd><enter></kbd>: Switch to a recent repo | ||||
|   <kbd>a</kbd>: Show all branch logs | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` o `` | Open config file |  | | ||||
| | `` e `` | Edit config file |  | | ||||
| | `` u `` | Check for update |  | | ||||
| | `` <enter> `` | Switch to a recent repo |  | | ||||
| | `` a `` | Show all branch logs |  | | ||||
|  | ||||
| ## Sub-commits | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: Copy commit SHA to clipboard | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><space></kbd>: Checkout commit | ||||
|   <kbd>y</kbd>: Copy commit attribute | ||||
|   <kbd>o</kbd>: Open commit in browser | ||||
|   <kbd>n</kbd>: Create new branch off of commit | ||||
|   <kbd>g</kbd>: View reset options | ||||
|   <kbd>C</kbd>: Copy commit (cherry-pick) | ||||
|   <kbd><c-r></kbd>: Reset cherry-picked (copied) commits selection | ||||
|   <kbd><c-t></kbd>: Open external diff tool (git difftool) | ||||
|   <kbd><enter></kbd>: View selected item's files | ||||
|   <kbd>/</kbd>: Search the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | Copy commit SHA to clipboard |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <space> `` | Checkout commit |  | | ||||
| | `` y `` | Copy commit attribute |  | | ||||
| | `` o `` | Open commit in browser |  | | ||||
| | `` n `` | Create new branch off of commit |  | | ||||
| | `` g `` | View reset options |  | | ||||
| | `` C `` | Copy commit (cherry-pick) |  | | ||||
| | `` <c-r> `` | Reset cherry-picked (copied) commits selection |  | | ||||
| | `` <c-t> `` | Open external diff tool (git difftool) |  | | ||||
| | `` <enter> `` | View selected item's files |  | | ||||
| | `` / `` | Search the current view by text |  | | ||||
|  | ||||
| ## Submodules | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: Copy submodule name to clipboard | ||||
|   <kbd><enter></kbd>: Enter submodule | ||||
|   <kbd><space></kbd>: Enter submodule | ||||
|   <kbd>d</kbd>: Remove submodule | ||||
|   <kbd>u</kbd>: Update submodule | ||||
|   <kbd>n</kbd>: Add new submodule | ||||
|   <kbd>e</kbd>: Update submodule URL | ||||
|   <kbd>i</kbd>: Initialize submodule | ||||
|   <kbd>b</kbd>: View bulk submodule options | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | Copy submodule name to clipboard |  | | ||||
| | `` <enter> `` | Enter submodule |  | | ||||
| | `` <space> `` | Enter submodule |  | | ||||
| | `` d `` | Remove submodule |  | | ||||
| | `` u `` | Update submodule |  | | ||||
| | `` n `` | Add new submodule |  | | ||||
| | `` e `` | Update submodule URL |  | | ||||
| | `` i `` | Initialize submodule |  | | ||||
| | `` b `` | View bulk submodule options |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## Tags | ||||
|  | ||||
| <pre> | ||||
|   <kbd><space></kbd>: Checkout | ||||
|   <kbd>d</kbd>: View delete options | ||||
|   <kbd>P</kbd>: Push tag | ||||
|   <kbd>n</kbd>: Create tag | ||||
|   <kbd>g</kbd>: View reset options | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><enter></kbd>: View commits | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <space> `` | Checkout |  | | ||||
| | `` d `` | View delete options |  | | ||||
| | `` P `` | Push tag |  | | ||||
| | `` n `` | Create tag |  | | ||||
| | `` g `` | View reset options |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <enter> `` | View commits |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## Worktrees | ||||
|  | ||||
| <pre> | ||||
|   <kbd>n</kbd>: Create worktree | ||||
|   <kbd><space></kbd>: Switch to worktree | ||||
|   <kbd><enter></kbd>: Switch to worktree | ||||
|   <kbd>o</kbd>: Open in editor | ||||
|   <kbd>d</kbd>: Remove worktree | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` n `` | Create worktree |  | | ||||
| | `` <space> `` | Switch to worktree |  | | ||||
| | `` <enter> `` | Switch to worktree |  | | ||||
| | `` o `` | Open in editor |  | | ||||
| | `` d `` | Remove worktree |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|   | ||||
| @@ -6,356 +6,357 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ | ||||
|  | ||||
| ## グローバルキーバインド | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-r></kbd>: 最近使用したリポジトリに切り替え | ||||
|   <kbd><pgup></kbd>: メインパネルを上にスクロール (fn+up/shift+k) | ||||
|   <kbd><pgdown></kbd>: メインパネルを下にスクロール (fn+down/shift+j) | ||||
|   <kbd>@</kbd>: コマンドログメニューを開く | ||||
|   <kbd>}</kbd>: Increase the size of the context shown around changes in the diff view | ||||
|   <kbd>{</kbd>: Decrease the size of the context shown around changes in the diff view | ||||
|   <kbd>:</kbd>: カスタムコマンドを実行 | ||||
|   <kbd><c-p></kbd>: View custom patch options | ||||
|   <kbd>m</kbd>: View merge/rebase options | ||||
|   <kbd>R</kbd>: リフレッシュ | ||||
|   <kbd>+</kbd>: 次のスクリーンモード (normal/half/fullscreen) | ||||
|   <kbd>_</kbd>: 前のスクリーンモード | ||||
|   <kbd>?</kbd>: メニューを開く | ||||
|   <kbd><c-s></kbd>: View filter-by-path options | ||||
|   <kbd>W</kbd>: 差分メニューを開く | ||||
|   <kbd><c-e></kbd>: 差分メニューを開く | ||||
|   <kbd><c-w></kbd>: 空白文字の差分の表示有無を切り替え | ||||
|   <kbd>z</kbd>: アンドゥ (via reflog) (experimental) | ||||
|   <kbd><c-z></kbd>: リドゥ (via reflog) (experimental) | ||||
|   <kbd>P</kbd>: Push | ||||
|   <kbd>p</kbd>: Pull | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-r> `` | 最近使用したリポジトリに切り替え |  | | ||||
| | `` <pgup> (fn+up/shift+k) `` | メインパネルを上にスクロール |  | | ||||
| | `` <pgdown> (fn+down/shift+j) `` | メインパネルを下にスクロール |  | | ||||
| | `` @ `` | コマンドログメニューを開く |  | | ||||
| | `` } `` | Increase the size of the context shown around changes in the diff view |  | | ||||
| | `` { `` | Decrease the size of the context shown around changes in the diff view |  | | ||||
| | `` : `` | カスタムコマンドを実行 |  | | ||||
| | `` <c-p> `` | View custom patch options |  | | ||||
| | `` m `` | View merge/rebase options |  | | ||||
| | `` R `` | リフレッシュ |  | | ||||
| | `` + `` | 次のスクリーンモード (normal/half/fullscreen) |  | | ||||
| | `` _ `` | 前のスクリーンモード |  | | ||||
| | `` ? `` | メニューを開く |  | | ||||
| | `` <c-s> `` | View filter-by-path options |  | | ||||
| | `` W `` | 差分メニューを開く |  | | ||||
| | `` <c-e> `` | 差分メニューを開く |  | | ||||
| | `` <c-w> `` | 空白文字の差分の表示有無を切り替え |  | | ||||
| | `` z `` | アンドゥ (via reflog) (experimental) | The reflog will be used to determine what git command to run to undo the last git command. This does not include changes to the working tree; only commits are taken into consideration. | | ||||
| | `` <c-z> `` | リドゥ (via reflog) (experimental) | The reflog will be used to determine what git command to run to redo the last git command. This does not include changes to the working tree; only commits are taken into consideration. | | ||||
| | `` P `` | Push |  | | ||||
| | `` p `` | Pull |  | | ||||
|  | ||||
| ## 一覧パネルの操作 | ||||
|  | ||||
| <pre> | ||||
|   <kbd>,</kbd>: 前のページ | ||||
|   <kbd>.</kbd>: 次のページ | ||||
|   <kbd><</kbd>: 最上部までスクロール | ||||
|   <kbd>></kbd>: 最下部までスクロール | ||||
|   <kbd>v</kbd>: 範囲選択を切り替え | ||||
|   <kbd><s-down></kbd>: Range select down | ||||
|   <kbd><s-up></kbd>: Range select up | ||||
|   <kbd>/</kbd>: 検索を開始 | ||||
|   <kbd>H</kbd>: 左スクロール | ||||
|   <kbd>L</kbd>: 右スクロール | ||||
|   <kbd>]</kbd>: 次のタブ | ||||
|   <kbd>[</kbd>: 前のタブ | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` , `` | 前のページ |  | | ||||
| | `` . `` | 次のページ |  | | ||||
| | `` < `` | 最上部までスクロール |  | | ||||
| | `` > `` | 最下部までスクロール |  | | ||||
| | `` v `` | 範囲選択を切り替え |  | | ||||
| | `` <s-down> `` | Range select down |  | | ||||
| | `` <s-up> `` | Range select up |  | | ||||
| | `` / `` | 検索を開始 |  | | ||||
| | `` H `` | 左スクロール |  | | ||||
| | `` L `` | 右スクロール |  | | ||||
| | `` ] `` | 次のタブ |  | | ||||
| | `` [ `` | 前のタブ |  | | ||||
|  | ||||
| ## Stash | ||||
|  | ||||
| <pre> | ||||
|   <kbd><space></kbd>: 適用 | ||||
|   <kbd>g</kbd>: Pop | ||||
|   <kbd>d</kbd>: Drop | ||||
|   <kbd>n</kbd>: 新しいブランチを作成 | ||||
|   <kbd>r</kbd>: Stashを変更 | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><enter></kbd>: View selected item's files | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <space> `` | 適用 |  | | ||||
| | `` g `` | Pop |  | | ||||
| | `` d `` | Drop |  | | ||||
| | `` n `` | 新しいブランチを作成 |  | | ||||
| | `` r `` | Stashを変更 |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <enter> `` | View selected item's files |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## Sub-commits | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: コミットのSHAをクリップボードにコピー | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><space></kbd>: コミットをチェックアウト | ||||
|   <kbd>y</kbd>: コミットの情報をコピー | ||||
|   <kbd>o</kbd>: ブラウザでコミットを開く | ||||
|   <kbd>n</kbd>: コミットにブランチを作成 | ||||
|   <kbd>g</kbd>: View reset options | ||||
|   <kbd>C</kbd>: コミットをコピー (cherry-pick) | ||||
|   <kbd><c-r></kbd>: Reset cherry-picked (copied) commits selection | ||||
|   <kbd><c-t></kbd>: Open external diff tool (git difftool) | ||||
|   <kbd><enter></kbd>: View selected item's files | ||||
|   <kbd>/</kbd>: 検索を開始 | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | コミットのSHAをクリップボードにコピー |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <space> `` | コミットをチェックアウト |  | | ||||
| | `` y `` | コミットの情報をコピー |  | | ||||
| | `` o `` | ブラウザでコミットを開く |  | | ||||
| | `` n `` | コミットにブランチを作成 |  | | ||||
| | `` g `` | View reset options |  | | ||||
| | `` C `` | コミットをコピー (cherry-pick) |  | | ||||
| | `` <c-r> `` | Reset cherry-picked (copied) commits selection |  | | ||||
| | `` <c-t> `` | Open external diff tool (git difftool) |  | | ||||
| | `` <enter> `` | View selected item's files |  | | ||||
| | `` / `` | 検索を開始 |  | | ||||
|  | ||||
| ## Worktrees | ||||
|  | ||||
| <pre> | ||||
|   <kbd>n</kbd>: Create worktree | ||||
|   <kbd><space></kbd>: Switch to worktree | ||||
|   <kbd><enter></kbd>: Switch to worktree | ||||
|   <kbd>o</kbd>: Open in editor | ||||
|   <kbd>d</kbd>: Remove worktree | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` n `` | Create worktree |  | | ||||
| | `` <space> `` | Switch to worktree |  | | ||||
| | `` <enter> `` | Switch to worktree |  | | ||||
| | `` o `` | Open in editor |  | | ||||
| | `` d `` | Remove worktree |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## コミット | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: コミットのSHAをクリップボードにコピー | ||||
|   <kbd><c-r></kbd>: Reset cherry-picked (copied) commits selection | ||||
|   <kbd>b</kbd>: View bisect options | ||||
|   <kbd>s</kbd>: Squash down | ||||
|   <kbd>f</kbd>: Fixup commit | ||||
|   <kbd>r</kbd>: コミットメッセージを変更 | ||||
|   <kbd>R</kbd>: エディタでコミットメッセージを編集 | ||||
|   <kbd>d</kbd>: コミットを削除 | ||||
|   <kbd>e</kbd>: コミットを編集 | ||||
|   <kbd>i</kbd>: Start interactive rebase | ||||
|   <kbd>p</kbd>: Pick commit (when mid-rebase) | ||||
|   <kbd>F</kbd>: このコミットに対するfixupコミットを作成 | ||||
|   <kbd>S</kbd>: Squash all 'fixup!' commits above selected commit (autosquash) | ||||
|   <kbd><c-j></kbd>: コミットを1つ下に移動 | ||||
|   <kbd><c-k></kbd>: コミットを1つ上に移動 | ||||
|   <kbd>V</kbd>: コミットを貼り付け (cherry-pick) | ||||
|   <kbd>B</kbd>: Mark commit as base commit for rebase | ||||
|   <kbd>A</kbd>: ステージされた変更でamendコミット | ||||
|   <kbd>a</kbd>: Set/Reset commit author | ||||
|   <kbd>t</kbd>: コミットをrevert | ||||
|   <kbd>T</kbd>: タグを作成 | ||||
|   <kbd><c-l></kbd>: ログメニューを開く | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><space></kbd>: コミットをチェックアウト | ||||
|   <kbd>y</kbd>: コミットの情報をコピー | ||||
|   <kbd>o</kbd>: ブラウザでコミットを開く | ||||
|   <kbd>n</kbd>: コミットにブランチを作成 | ||||
|   <kbd>g</kbd>: View reset options | ||||
|   <kbd>C</kbd>: コミットをコピー (cherry-pick) | ||||
|   <kbd><c-t></kbd>: Open external diff tool (git difftool) | ||||
|   <kbd><enter></kbd>: View selected item's files | ||||
|   <kbd>/</kbd>: 検索を開始 | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | コミットのSHAをクリップボードにコピー |  | | ||||
| | `` <c-r> `` | Reset cherry-picked (copied) commits selection |  | | ||||
| | `` b `` | View bisect options |  | | ||||
| | `` s `` | Squash down |  | | ||||
| | `` f `` | Fixup commit |  | | ||||
| | `` r `` | コミットメッセージを変更 |  | | ||||
| | `` R `` | エディタでコミットメッセージを編集 |  | | ||||
| | `` d `` | コミットを削除 |  | | ||||
| | `` e `` | コミットを編集 |  | | ||||
| | `` i `` | Start interactive rebase | Start an interactive rebase for the commits on your branch. This will include all commits from the HEAD commit down to the first merge commit or main branch commit. | ||||
| If you would instead like to start an interactive rebase from the selected commit, press `e`. | | ||||
| | `` p `` | Pick commit (when mid-rebase) |  | | ||||
| | `` F `` | このコミットに対するfixupコミットを作成 |  | | ||||
| | `` S `` | Squash all 'fixup!' commits above selected commit (autosquash) |  | | ||||
| | `` <c-j> `` | コミットを1つ下に移動 |  | | ||||
| | `` <c-k> `` | コミットを1つ上に移動 |  | | ||||
| | `` V `` | コミットを貼り付け (cherry-pick) |  | | ||||
| | `` B `` | Mark commit as base commit for rebase | Select a base commit for the next rebase; this will effectively perform a 'git rebase --onto'. | | ||||
| | `` A `` | ステージされた変更でamendコミット |  | | ||||
| | `` a `` | Set/Reset commit author |  | | ||||
| | `` t `` | コミットをrevert |  | | ||||
| | `` T `` | タグを作成 |  | | ||||
| | `` <c-l> `` | ログメニューを開く |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <space> `` | コミットをチェックアウト |  | | ||||
| | `` y `` | コミットの情報をコピー |  | | ||||
| | `` o `` | ブラウザでコミットを開く |  | | ||||
| | `` n `` | コミットにブランチを作成 |  | | ||||
| | `` g `` | View reset options |  | | ||||
| | `` C `` | コミットをコピー (cherry-pick) |  | | ||||
| | `` <c-t> `` | Open external diff tool (git difftool) |  | | ||||
| | `` <enter> `` | View selected item's files |  | | ||||
| | `` / `` | 検索を開始 |  | | ||||
|  | ||||
| ## コミットファイル | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: コミットされたファイル名をクリップボードにコピー | ||||
|   <kbd>c</kbd>: Checkout file | ||||
|   <kbd>d</kbd>: Discard this commit's changes to this file | ||||
|   <kbd>o</kbd>: ファイルを開く | ||||
|   <kbd>e</kbd>: ファイルを編集 | ||||
|   <kbd><c-t></kbd>: Open external diff tool (git difftool) | ||||
|   <kbd><space></kbd>: Toggle file included in patch | ||||
|   <kbd>a</kbd>: Toggle all files included in patch | ||||
|   <kbd><enter></kbd>: Enter file to add selected lines to the patch (or toggle directory collapsed) | ||||
|   <kbd>`</kbd>: ファイルツリーの表示を切り替え | ||||
|   <kbd>/</kbd>: 検索を開始 | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | コミットされたファイル名をクリップボードにコピー |  | | ||||
| | `` c `` | Checkout file |  | | ||||
| | `` d `` | Discard this commit's changes to this file |  | | ||||
| | `` o `` | ファイルを開く |  | | ||||
| | `` e `` | ファイルを編集 |  | | ||||
| | `` <c-t> `` | Open external diff tool (git difftool) |  | | ||||
| | `` <space> `` | Toggle file included in patch |  | | ||||
| | `` a `` | Toggle all files included in patch |  | | ||||
| | `` <enter> `` | Enter file to add selected lines to the patch (or toggle directory collapsed) |  | | ||||
| | `` ` `` | ファイルツリーの表示を切り替え |  | | ||||
| | `` / `` | 検索を開始 |  | | ||||
|  | ||||
| ## コミットメッセージ | ||||
|  | ||||
| <pre> | ||||
|   <kbd><enter></kbd>: 確認 | ||||
|   <kbd><esc></kbd>: 閉じる | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <enter> `` | 確認 |  | | ||||
| | `` <esc> `` | 閉じる |  | | ||||
|  | ||||
| ## サブモジュール | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: サブモジュール名をクリップボードにコピー | ||||
|   <kbd><enter></kbd>: サブモジュールを開く | ||||
|   <kbd><space></kbd>: サブモジュールを開く | ||||
|   <kbd>d</kbd>: サブモジュールを削除 | ||||
|   <kbd>u</kbd>: サブモジュールを更新 | ||||
|   <kbd>n</kbd>: サブモジュールを新規追加 | ||||
|   <kbd>e</kbd>: サブモジュールのURLを更新 | ||||
|   <kbd>i</kbd>: サブモジュールを初期化 | ||||
|   <kbd>b</kbd>: View bulk submodule options | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | サブモジュール名をクリップボードにコピー |  | | ||||
| | `` <enter> `` | サブモジュールを開く |  | | ||||
| | `` <space> `` | サブモジュールを開く |  | | ||||
| | `` d `` | サブモジュールを削除 |  | | ||||
| | `` u `` | サブモジュールを更新 |  | | ||||
| | `` n `` | サブモジュールを新規追加 |  | | ||||
| | `` e `` | サブモジュールのURLを更新 |  | | ||||
| | `` i `` | サブモジュールを初期化 |  | | ||||
| | `` b `` | View bulk submodule options |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## ステータス | ||||
|  | ||||
| <pre> | ||||
|   <kbd>o</kbd>: 設定ファイルを開く | ||||
|   <kbd>e</kbd>: 設定ファイルを編集 | ||||
|   <kbd>u</kbd>: 更新を確認 | ||||
|   <kbd><enter></kbd>: 最近使用したリポジトリに切り替え | ||||
|   <kbd>a</kbd>: すべてのブランチログを表示 | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` o `` | 設定ファイルを開く |  | | ||||
| | `` e `` | 設定ファイルを編集 |  | | ||||
| | `` u `` | 更新を確認 |  | | ||||
| | `` <enter> `` | 最近使用したリポジトリに切り替え |  | | ||||
| | `` a `` | すべてのブランチログを表示 |  | | ||||
|  | ||||
| ## タグ | ||||
|  | ||||
| <pre> | ||||
|   <kbd><space></kbd>: チェックアウト | ||||
|   <kbd>d</kbd>: View delete options | ||||
|   <kbd>P</kbd>: タグをpush | ||||
|   <kbd>n</kbd>: タグを作成 | ||||
|   <kbd>g</kbd>: View reset options | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><enter></kbd>: コミットを閲覧 | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <space> `` | チェックアウト |  | | ||||
| | `` d `` | View delete options |  | | ||||
| | `` P `` | タグをpush |  | | ||||
| | `` n `` | タグを作成 |  | | ||||
| | `` g `` | View reset options |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <enter> `` | コミットを閲覧 |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## ファイル | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: ファイル名をクリップボードにコピー | ||||
|   <kbd><space></kbd>: ステージ/アンステージ | ||||
|   <kbd><c-b></kbd>: ファイルをフィルタ (ステージ/アンステージ) | ||||
|   <kbd>y</kbd>: Copy to clipboard | ||||
|   <kbd>c</kbd>: 変更をコミット | ||||
|   <kbd>w</kbd>: pre-commitフックを実行せずに変更をコミット | ||||
|   <kbd>A</kbd>: 最新のコミットにamend | ||||
|   <kbd>C</kbd>: gitエディタを使用して変更をコミット | ||||
|   <kbd><c-f></kbd>: Find base commit for fixup | ||||
|   <kbd>e</kbd>: ファイルを編集 | ||||
|   <kbd>o</kbd>: ファイルを開く | ||||
|   <kbd>i</kbd>: ファイルをignore | ||||
|   <kbd>r</kbd>: ファイルをリフレッシュ | ||||
|   <kbd>s</kbd>: 変更をstash | ||||
|   <kbd>S</kbd>: View stash options | ||||
|   <kbd>a</kbd>: すべての変更をステージ/アンステージ | ||||
|   <kbd><enter></kbd>: Stage individual hunks/lines for file, or collapse/expand for directory | ||||
|   <kbd>d</kbd>: View 'discard changes' options | ||||
|   <kbd>g</kbd>: View upstream reset options | ||||
|   <kbd>D</kbd>: View reset options | ||||
|   <kbd>`</kbd>: ファイルツリーの表示を切り替え | ||||
|   <kbd><c-t></kbd>: Open external diff tool (git difftool) | ||||
|   <kbd>M</kbd>: Git mergetoolを開く | ||||
|   <kbd>f</kbd>: Fetch | ||||
|   <kbd>/</kbd>: 検索を開始 | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | ファイル名をクリップボードにコピー |  | | ||||
| | `` <space> `` | ステージ/アンステージ |  | | ||||
| | `` <c-b> `` | ファイルをフィルタ (ステージ/アンステージ) |  | | ||||
| | `` y `` | Copy to clipboard |  | | ||||
| | `` c `` | 変更をコミット |  | | ||||
| | `` w `` | pre-commitフックを実行せずに変更をコミット |  | | ||||
| | `` A `` | 最新のコミットにamend |  | | ||||
| | `` C `` | gitエディタを使用して変更をコミット |  | | ||||
| | `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> | | ||||
| | `` e `` | ファイルを編集 |  | | ||||
| | `` o `` | ファイルを開く |  | | ||||
| | `` i `` | ファイルをignore |  | | ||||
| | `` r `` | ファイルをリフレッシュ |  | | ||||
| | `` s `` | 変更をstash |  | | ||||
| | `` S `` | View stash options |  | | ||||
| | `` a `` | すべての変更をステージ/アンステージ |  | | ||||
| | `` <enter> `` | Stage individual hunks/lines for file, or collapse/expand for directory |  | | ||||
| | `` d `` | View 'discard changes' options |  | | ||||
| | `` g `` | View upstream reset options |  | | ||||
| | `` D `` | View reset options |  | | ||||
| | `` ` `` | ファイルツリーの表示を切り替え |  | | ||||
| | `` <c-t> `` | Open external diff tool (git difftool) |  | | ||||
| | `` M `` | Git mergetoolを開く |  | | ||||
| | `` f `` | Fetch |  | | ||||
| | `` / `` | 検索を開始 |  | | ||||
|  | ||||
| ## ブランチ | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: ブランチ名をクリップボードにコピー | ||||
|   <kbd>i</kbd>: Show git-flow options | ||||
|   <kbd><space></kbd>: チェックアウト | ||||
|   <kbd>n</kbd>: 新しいブランチを作成 | ||||
|   <kbd>o</kbd>: Pull Requestを作成 | ||||
|   <kbd>O</kbd>: Create pull request options | ||||
|   <kbd><c-y></kbd>: Pull RequestのURLをクリップボードにコピー | ||||
|   <kbd>c</kbd>: Checkout by name, enter '-' to switch to last | ||||
|   <kbd>F</kbd>: Force checkout | ||||
|   <kbd>d</kbd>: View delete options | ||||
|   <kbd>r</kbd>: Rebase checked-out branch onto this branch | ||||
|   <kbd>M</kbd>: 現在のブランチにマージ | ||||
|   <kbd>f</kbd>: Fast-forward this branch from its upstream | ||||
|   <kbd>T</kbd>: タグを作成 | ||||
|   <kbd>s</kbd>: 並び替え | ||||
|   <kbd>g</kbd>: View reset options | ||||
|   <kbd>R</kbd>: ブランチ名を変更 | ||||
|   <kbd>u</kbd>: View upstream options | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><enter></kbd>: コミットを閲覧 | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | ブランチ名をクリップボードにコピー |  | | ||||
| | `` i `` | Show git-flow options |  | | ||||
| | `` <space> `` | チェックアウト |  | | ||||
| | `` n `` | 新しいブランチを作成 |  | | ||||
| | `` o `` | Pull Requestを作成 |  | | ||||
| | `` O `` | Create pull request options |  | | ||||
| | `` <c-y> `` | Pull RequestのURLをクリップボードにコピー |  | | ||||
| | `` c `` | Checkout by name, enter '-' to switch to last |  | | ||||
| | `` F `` | Force checkout |  | | ||||
| | `` d `` | View delete options |  | | ||||
| | `` r `` | Rebase checked-out branch onto this branch |  | | ||||
| | `` M `` | 現在のブランチにマージ |  | | ||||
| | `` f `` | Fast-forward this branch from its upstream |  | | ||||
| | `` T `` | タグを作成 |  | | ||||
| | `` s `` | 並び替え |  | | ||||
| | `` g `` | View reset options |  | | ||||
| | `` R `` | ブランチ名を変更 |  | | ||||
| | `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <enter> `` | コミットを閲覧 |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## メインパネル (Merging) | ||||
|  | ||||
| <pre> | ||||
|   <kbd>e</kbd>: ファイルを編集 | ||||
|   <kbd>o</kbd>: ファイルを開く | ||||
|   <kbd><left></kbd>: 前のコンフリクトを選択 | ||||
|   <kbd><right></kbd>: 次のコンフリクトを選択 | ||||
|   <kbd><up></kbd>: 前のhunkを選択 | ||||
|   <kbd><down></kbd>: 次のhunkを選択 | ||||
|   <kbd>z</kbd>: アンドゥ | ||||
|   <kbd>M</kbd>: Git mergetoolを開く | ||||
|   <kbd><space></kbd>: Pick hunk | ||||
|   <kbd>b</kbd>: Pick all hunks | ||||
|   <kbd><esc></kbd>: ファイル一覧に戻る | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` e `` | ファイルを編集 |  | | ||||
| | `` o `` | ファイルを開く |  | | ||||
| | `` <left> `` | 前のコンフリクトを選択 |  | | ||||
| | `` <right> `` | 次のコンフリクトを選択 |  | | ||||
| | `` <up> `` | 前のhunkを選択 |  | | ||||
| | `` <down> `` | 次のhunkを選択 |  | | ||||
| | `` z `` | アンドゥ |  | | ||||
| | `` M `` | Git mergetoolを開く |  | | ||||
| | `` <space> `` | Pick hunk |  | | ||||
| | `` b `` | Pick all hunks |  | | ||||
| | `` <esc> `` | ファイル一覧に戻る |  | | ||||
|  | ||||
| ## メインパネル (Normal) | ||||
|  | ||||
| <pre> | ||||
|   <kbd>mouse wheel down</kbd>: 下にスクロール (fn+up) | ||||
|   <kbd>mouse wheel up</kbd>: 上にスクロール (fn+down) | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` mouse wheel down (fn+up) `` | 下にスクロール |  | | ||||
| | `` mouse wheel up (fn+down) `` | 上にスクロール |  | | ||||
|  | ||||
| ## メインパネル (Patch Building) | ||||
|  | ||||
| <pre> | ||||
|   <kbd><left></kbd>: 前のhunkを選択 | ||||
|   <kbd><right></kbd>: 次のhunkを選択 | ||||
|   <kbd>v</kbd>: 範囲選択を切り替え | ||||
|   <kbd>a</kbd>: Hunk選択を切り替え | ||||
|   <kbd><c-o></kbd>: 選択されたテキストをクリップボードにコピー | ||||
|   <kbd>o</kbd>: ファイルを開く | ||||
|   <kbd>e</kbd>: ファイルを編集 | ||||
|   <kbd><space></kbd>: 行をパッチに追加/削除 | ||||
|   <kbd><esc></kbd>: Exit custom patch builder | ||||
|   <kbd>/</kbd>: 検索を開始 | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <left> `` | 前のhunkを選択 |  | | ||||
| | `` <right> `` | 次のhunkを選択 |  | | ||||
| | `` v `` | 範囲選択を切り替え |  | | ||||
| | `` a `` | Hunk選択を切り替え |  | | ||||
| | `` <c-o> `` | 選択されたテキストをクリップボードにコピー |  | | ||||
| | `` o `` | ファイルを開く |  | | ||||
| | `` e `` | ファイルを編集 |  | | ||||
| | `` <space> `` | 行をパッチに追加/削除 |  | | ||||
| | `` <esc> `` | Exit custom patch builder |  | | ||||
| | `` / `` | 検索を開始 |  | | ||||
|  | ||||
| ## メインパネル (Staging) | ||||
|  | ||||
| <pre> | ||||
|   <kbd><left></kbd>: 前のhunkを選択 | ||||
|   <kbd><right></kbd>: 次のhunkを選択 | ||||
|   <kbd>v</kbd>: 範囲選択を切り替え | ||||
|   <kbd>a</kbd>: Hunk選択を切り替え | ||||
|   <kbd><c-o></kbd>: 選択されたテキストをクリップボードにコピー | ||||
|   <kbd>o</kbd>: ファイルを開く | ||||
|   <kbd>e</kbd>: ファイルを編集 | ||||
|   <kbd><esc></kbd>: ファイル一覧に戻る | ||||
|   <kbd><tab></kbd>: パネルを切り替え | ||||
|   <kbd><space></kbd>: 選択行をステージ/アンステージ | ||||
|   <kbd>d</kbd>: 変更を削除 (git reset) | ||||
|   <kbd>E</kbd>: Edit hunk | ||||
|   <kbd>c</kbd>: 変更をコミット | ||||
|   <kbd>w</kbd>: pre-commitフックを実行せずに変更をコミット | ||||
|   <kbd>C</kbd>: gitエディタを使用して変更をコミット | ||||
|   <kbd>/</kbd>: 検索を開始 | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <left> `` | 前のhunkを選択 |  | | ||||
| | `` <right> `` | 次のhunkを選択 |  | | ||||
| | `` v `` | 範囲選択を切り替え |  | | ||||
| | `` a `` | Hunk選択を切り替え |  | | ||||
| | `` <c-o> `` | 選択されたテキストをクリップボードにコピー |  | | ||||
| | `` o `` | ファイルを開く |  | | ||||
| | `` e `` | ファイルを編集 |  | | ||||
| | `` <esc> `` | ファイル一覧に戻る |  | | ||||
| | `` <tab> `` | パネルを切り替え |  | | ||||
| | `` <space> `` | 選択行をステージ/アンステージ |  | | ||||
| | `` d `` | 変更を削除 (git reset) |  | | ||||
| | `` E `` | Edit hunk |  | | ||||
| | `` c `` | 変更をコミット |  | | ||||
| | `` w `` | pre-commitフックを実行せずに変更をコミット |  | | ||||
| | `` C `` | gitエディタを使用して変更をコミット |  | | ||||
| | `` / `` | 検索を開始 |  | | ||||
|  | ||||
| ## メニュー | ||||
|  | ||||
| <pre> | ||||
|   <kbd><enter></kbd>: 実行 | ||||
|   <kbd><esc></kbd>: 閉じる | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <enter> `` | 実行 |  | | ||||
| | `` <esc> `` | 閉じる |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## リモート | ||||
|  | ||||
| <pre> | ||||
|   <kbd>f</kbd>: リモートをfetch | ||||
|   <kbd>n</kbd>: リモートを新規追加 | ||||
|   <kbd>d</kbd>: リモートを削除 | ||||
|   <kbd>e</kbd>: リモートを編集 | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` f `` | リモートをfetch |  | | ||||
| | `` n `` | リモートを新規追加 |  | | ||||
| | `` d `` | リモートを削除 |  | | ||||
| | `` e `` | リモートを編集 |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## リモートブランチ | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: ブランチ名をクリップボードにコピー | ||||
|   <kbd><space></kbd>: チェックアウト | ||||
|   <kbd>n</kbd>: 新しいブランチを作成 | ||||
|   <kbd>M</kbd>: 現在のブランチにマージ | ||||
|   <kbd>r</kbd>: Rebase checked-out branch onto this branch | ||||
|   <kbd>d</kbd>: Delete remote tag | ||||
|   <kbd>u</kbd>: Set as upstream of checked-out branch | ||||
|   <kbd>s</kbd>: 並び替え | ||||
|   <kbd>g</kbd>: View reset options | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><enter></kbd>: コミットを閲覧 | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | ブランチ名をクリップボードにコピー |  | | ||||
| | `` <space> `` | チェックアウト |  | | ||||
| | `` n `` | 新しいブランチを作成 |  | | ||||
| | `` M `` | 現在のブランチにマージ |  | | ||||
| | `` r `` | Rebase checked-out branch onto this branch |  | | ||||
| | `` d `` | Delete remote tag |  | | ||||
| | `` u `` | Set as upstream of checked-out branch |  | | ||||
| | `` s `` | 並び替え |  | | ||||
| | `` g `` | View reset options |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <enter> `` | コミットを閲覧 |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## 参照ログ | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: コミットのSHAをクリップボードにコピー | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><space></kbd>: コミットをチェックアウト | ||||
|   <kbd>y</kbd>: コミットの情報をコピー | ||||
|   <kbd>o</kbd>: ブラウザでコミットを開く | ||||
|   <kbd>n</kbd>: コミットにブランチを作成 | ||||
|   <kbd>g</kbd>: View reset options | ||||
|   <kbd>C</kbd>: コミットをコピー (cherry-pick) | ||||
|   <kbd><c-r></kbd>: Reset cherry-picked (copied) commits selection | ||||
|   <kbd><c-t></kbd>: Open external diff tool (git difftool) | ||||
|   <kbd><enter></kbd>: コミットを閲覧 | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | コミットのSHAをクリップボードにコピー |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <space> `` | コミットをチェックアウト |  | | ||||
| | `` y `` | コミットの情報をコピー |  | | ||||
| | `` o `` | ブラウザでコミットを開く |  | | ||||
| | `` n `` | コミットにブランチを作成 |  | | ||||
| | `` g `` | View reset options |  | | ||||
| | `` C `` | コミットをコピー (cherry-pick) |  | | ||||
| | `` <c-r> `` | Reset cherry-picked (copied) commits selection |  | | ||||
| | `` <c-t> `` | Open external diff tool (git difftool) |  | | ||||
| | `` <enter> `` | コミットを閲覧 |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## 確認パネル | ||||
|  | ||||
| <pre> | ||||
|   <kbd><enter></kbd>: 確認 | ||||
|   <kbd><esc></kbd>: 閉じる/キャンセル | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <enter> `` | 確認 |  | | ||||
| | `` <esc> `` | 閉じる/キャンセル |  | | ||||
|   | ||||
| @@ -6,356 +6,357 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ | ||||
|  | ||||
| ## 글로벌 키 바인딩 | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-r></kbd>: 최근에 사용한 저장소로 전환 | ||||
|   <kbd><pgup></kbd>: 메인 패널을 위로 스크롤 (fn+up/shift+k) | ||||
|   <kbd><pgdown></kbd>: 메인 패널을 아래로로 스크롤 (fn+down/shift+j) | ||||
|   <kbd>@</kbd>: 명령어 로그 메뉴 열기 | ||||
|   <kbd>}</kbd>: Diff 보기의 변경 사항 주위에 표시되는 컨텍스트의 크기를 늘리기 | ||||
|   <kbd>{</kbd>: Diff 보기의 변경 사항 주위에 표시되는 컨텍스트 크기 줄이기 | ||||
|   <kbd>:</kbd>: Execute custom command | ||||
|   <kbd><c-p></kbd>: 커스텀 Patch 옵션 보기 | ||||
|   <kbd>m</kbd>: View merge/rebase options | ||||
|   <kbd>R</kbd>: 새로고침 | ||||
|   <kbd>+</kbd>: 다음 스크린 모드 (normal/half/fullscreen) | ||||
|   <kbd>_</kbd>: 이전 스크린 모드 | ||||
|   <kbd>?</kbd>: 매뉴 열기 | ||||
|   <kbd><c-s></kbd>: View filter-by-path options | ||||
|   <kbd>W</kbd>: Diff 메뉴 열기 | ||||
|   <kbd><c-e></kbd>: Diff 메뉴 열기 | ||||
|   <kbd><c-w></kbd>: 공백문자를 Diff 뷰에서 표시 여부 전환 | ||||
|   <kbd>z</kbd>: 되돌리기 (reflog) (실험적) | ||||
|   <kbd><c-z></kbd>: 다시 실행 (reflog) (실험적) | ||||
|   <kbd>P</kbd>: 푸시 | ||||
|   <kbd>p</kbd>: 업데이트 | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-r> `` | 최근에 사용한 저장소로 전환 |  | | ||||
| | `` <pgup> (fn+up/shift+k) `` | 메인 패널을 위로 스크롤 |  | | ||||
| | `` <pgdown> (fn+down/shift+j) `` | 메인 패널을 아래로로 스크롤 |  | | ||||
| | `` @ `` | 명령어 로그 메뉴 열기 |  | | ||||
| | `` } `` | Diff 보기의 변경 사항 주위에 표시되는 컨텍스트의 크기를 늘리기 |  | | ||||
| | `` { `` | Diff 보기의 변경 사항 주위에 표시되는 컨텍스트 크기 줄이기 |  | | ||||
| | `` : `` | Execute custom command |  | | ||||
| | `` <c-p> `` | 커스텀 Patch 옵션 보기 |  | | ||||
| | `` m `` | View merge/rebase options |  | | ||||
| | `` R `` | 새로고침 |  | | ||||
| | `` + `` | 다음 스크린 모드 (normal/half/fullscreen) |  | | ||||
| | `` _ `` | 이전 스크린 모드 |  | | ||||
| | `` ? `` | 매뉴 열기 |  | | ||||
| | `` <c-s> `` | View filter-by-path options |  | | ||||
| | `` W `` | Diff 메뉴 열기 |  | | ||||
| | `` <c-e> `` | Diff 메뉴 열기 |  | | ||||
| | `` <c-w> `` | 공백문자를 Diff 뷰에서 표시 여부 전환 |  | | ||||
| | `` 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. | | ||||
| | `` <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. | | ||||
| | `` P `` | 푸시 |  | | ||||
| | `` p `` | 업데이트 |  | | ||||
|  | ||||
| ## List panel navigation | ||||
|  | ||||
| <pre> | ||||
|   <kbd>,</kbd>: 이전 페이지 | ||||
|   <kbd>.</kbd>: 다음 페이지 | ||||
|   <kbd><</kbd>: 맨 위로 스크롤  | ||||
|   <kbd>></kbd>: 맨 아래로 스크롤  | ||||
|   <kbd>v</kbd>: 드래그 선택 전환 | ||||
|   <kbd><s-down></kbd>: Range select down | ||||
|   <kbd><s-up></kbd>: Range select up | ||||
|   <kbd>/</kbd>: 검색 시작 | ||||
|   <kbd>H</kbd>: 우 스크롤 | ||||
|   <kbd>L</kbd>: 좌 스크롤 | ||||
|   <kbd>]</kbd>: 이전 탭 | ||||
|   <kbd>[</kbd>: 다음 탭 | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` , `` | 이전 페이지 |  | | ||||
| | `` . `` | 다음 페이지 |  | | ||||
| | `` < `` | 맨 위로 스크롤  |  | | ||||
| | `` > `` | 맨 아래로 스크롤  |  | | ||||
| | `` v `` | 드래그 선택 전환 |  | | ||||
| | `` <s-down> `` | Range select down |  | | ||||
| | `` <s-up> `` | Range select up |  | | ||||
| | `` / `` | 검색 시작 |  | | ||||
| | `` H `` | 우 스크롤 |  | | ||||
| | `` L `` | 좌 스크롤 |  | | ||||
| | `` ] `` | 이전 탭 |  | | ||||
| | `` [ `` | 다음 탭 |  | | ||||
|  | ||||
| ## Reflog | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: 커밋 SHA를 클립보드에 복사 | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><space></kbd>: 커밋을 체크아웃 | ||||
|   <kbd>y</kbd>: 커밋 attribute 복사 | ||||
|   <kbd>o</kbd>: 브라우저에서 커밋 열기 | ||||
|   <kbd>n</kbd>: 커밋에서 새 브랜치를 만듭니다. | ||||
|   <kbd>g</kbd>: View reset options | ||||
|   <kbd>C</kbd>: 커밋을 복사 (cherry-pick) | ||||
|   <kbd><c-r></kbd>: Reset cherry-picked (copied) commits selection | ||||
|   <kbd><c-t></kbd>: Open external diff tool (git difftool) | ||||
|   <kbd><enter></kbd>: 커밋 보기 | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | 커밋 SHA를 클립보드에 복사 |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <space> `` | 커밋을 체크아웃 |  | | ||||
| | `` y `` | 커밋 attribute 복사 |  | | ||||
| | `` o `` | 브라우저에서 커밋 열기 |  | | ||||
| | `` n `` | 커밋에서 새 브랜치를 만듭니다. |  | | ||||
| | `` g `` | View reset options |  | | ||||
| | `` C `` | 커밋을 복사 (cherry-pick) |  | | ||||
| | `` <c-r> `` | Reset cherry-picked (copied) commits selection |  | | ||||
| | `` <c-t> `` | Open external diff tool (git difftool) |  | | ||||
| | `` <enter> `` | 커밋 보기 |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## Stash | ||||
|  | ||||
| <pre> | ||||
|   <kbd><space></kbd>: 적용 | ||||
|   <kbd>g</kbd>: Pop | ||||
|   <kbd>d</kbd>: Drop | ||||
|   <kbd>n</kbd>: 새 브랜치 생성 | ||||
|   <kbd>r</kbd>: Rename stash | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><enter></kbd>: View selected item's files | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <space> `` | 적용 |  | | ||||
| | `` g `` | Pop |  | | ||||
| | `` d `` | Drop |  | | ||||
| | `` n `` | 새 브랜치 생성 |  | | ||||
| | `` r `` | Rename stash |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <enter> `` | View selected item's files |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## Sub-commits | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: 커밋 SHA를 클립보드에 복사 | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><space></kbd>: 커밋을 체크아웃 | ||||
|   <kbd>y</kbd>: 커밋 attribute 복사 | ||||
|   <kbd>o</kbd>: 브라우저에서 커밋 열기 | ||||
|   <kbd>n</kbd>: 커밋에서 새 브랜치를 만듭니다. | ||||
|   <kbd>g</kbd>: View reset options | ||||
|   <kbd>C</kbd>: 커밋을 복사 (cherry-pick) | ||||
|   <kbd><c-r></kbd>: Reset cherry-picked (copied) commits selection | ||||
|   <kbd><c-t></kbd>: Open external diff tool (git difftool) | ||||
|   <kbd><enter></kbd>: View selected item's files | ||||
|   <kbd>/</kbd>: 검색 시작 | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | 커밋 SHA를 클립보드에 복사 |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <space> `` | 커밋을 체크아웃 |  | | ||||
| | `` y `` | 커밋 attribute 복사 |  | | ||||
| | `` o `` | 브라우저에서 커밋 열기 |  | | ||||
| | `` n `` | 커밋에서 새 브랜치를 만듭니다. |  | | ||||
| | `` g `` | View reset options |  | | ||||
| | `` C `` | 커밋을 복사 (cherry-pick) |  | | ||||
| | `` <c-r> `` | Reset cherry-picked (copied) commits selection |  | | ||||
| | `` <c-t> `` | Open external diff tool (git difftool) |  | | ||||
| | `` <enter> `` | View selected item's files |  | | ||||
| | `` / `` | 검색 시작 |  | | ||||
|  | ||||
| ## Worktrees | ||||
|  | ||||
| <pre> | ||||
|   <kbd>n</kbd>: Create worktree | ||||
|   <kbd><space></kbd>: Switch to worktree | ||||
|   <kbd><enter></kbd>: Switch to worktree | ||||
|   <kbd>o</kbd>: Open in editor | ||||
|   <kbd>d</kbd>: Remove worktree | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` n `` | Create worktree |  | | ||||
| | `` <space> `` | Switch to worktree |  | | ||||
| | `` <enter> `` | Switch to worktree |  | | ||||
| | `` o `` | Open in editor |  | | ||||
| | `` d `` | Remove worktree |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## 메뉴 | ||||
|  | ||||
| <pre> | ||||
|   <kbd><enter></kbd>: 실행 | ||||
|   <kbd><esc></kbd>: 닫기 | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <enter> `` | 실행 |  | | ||||
| | `` <esc> `` | 닫기 |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## 메인 패널 (Merging) | ||||
|  | ||||
| <pre> | ||||
|   <kbd>e</kbd>: 파일 편집 | ||||
|   <kbd>o</kbd>: 파일 닫기 | ||||
|   <kbd><left></kbd>: 이전 충돌을 선택 | ||||
|   <kbd><right></kbd>: 다음 충돌을 선택 | ||||
|   <kbd><up></kbd>: 이전 hunk를 선택 | ||||
|   <kbd><down></kbd>: 다음 hunk를 선택 | ||||
|   <kbd>z</kbd>: 되돌리기 | ||||
|   <kbd>M</kbd>: Git mergetool를 열기 | ||||
|   <kbd><space></kbd>: Pick hunk | ||||
|   <kbd>b</kbd>: Pick all hunks | ||||
|   <kbd><esc></kbd>: 파일 목록으로 돌아가기 | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` e `` | 파일 편집 |  | | ||||
| | `` o `` | 파일 닫기 |  | | ||||
| | `` <left> `` | 이전 충돌을 선택 |  | | ||||
| | `` <right> `` | 다음 충돌을 선택 |  | | ||||
| | `` <up> `` | 이전 hunk를 선택 |  | | ||||
| | `` <down> `` | 다음 hunk를 선택 |  | | ||||
| | `` z `` | 되돌리기 |  | | ||||
| | `` M `` | Git mergetool를 열기 |  | | ||||
| | `` <space> `` | Pick hunk |  | | ||||
| | `` b `` | Pick all hunks |  | | ||||
| | `` <esc> `` | 파일 목록으로 돌아가기 |  | | ||||
|  | ||||
| ## 메인 패널 (Normal) | ||||
|  | ||||
| <pre> | ||||
|   <kbd>mouse wheel down</kbd>: 아래로 스크롤 (fn+up) | ||||
|   <kbd>mouse wheel up</kbd>: 위로 스크롤 (fn+down) | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` mouse wheel down (fn+up) `` | 아래로 스크롤 |  | | ||||
| | `` mouse wheel up (fn+down) `` | 위로 스크롤 |  | | ||||
|  | ||||
| ## 메인 패널 (Patch Building) | ||||
|  | ||||
| <pre> | ||||
|   <kbd><left></kbd>: 이전 hunk를 선택 | ||||
|   <kbd><right></kbd>: 다음 hunk를 선택 | ||||
|   <kbd>v</kbd>: 드래그 선택 전환 | ||||
|   <kbd>a</kbd>: Toggle select hunk | ||||
|   <kbd><c-o></kbd>: 선택한 텍스트를 클립보드에 복사 | ||||
|   <kbd>o</kbd>: 파일 닫기 | ||||
|   <kbd>e</kbd>: 파일 편집 | ||||
|   <kbd><space></kbd>: Line(s)을 패치에 추가/삭제 | ||||
|   <kbd><esc></kbd>: Exit custom patch builder | ||||
|   <kbd>/</kbd>: 검색 시작 | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <left> `` | 이전 hunk를 선택 |  | | ||||
| | `` <right> `` | 다음 hunk를 선택 |  | | ||||
| | `` v `` | 드래그 선택 전환 |  | | ||||
| | `` a `` | Toggle select hunk |  | | ||||
| | `` <c-o> `` | 선택한 텍스트를 클립보드에 복사 |  | | ||||
| | `` o `` | 파일 닫기 |  | | ||||
| | `` e `` | 파일 편집 |  | | ||||
| | `` <space> `` | Line(s)을 패치에 추가/삭제 |  | | ||||
| | `` <esc> `` | Exit custom patch builder |  | | ||||
| | `` / `` | 검색 시작 |  | | ||||
|  | ||||
| ## 메인 패널 (Staging) | ||||
|  | ||||
| <pre> | ||||
|   <kbd><left></kbd>: 이전 hunk를 선택 | ||||
|   <kbd><right></kbd>: 다음 hunk를 선택 | ||||
|   <kbd>v</kbd>: 드래그 선택 전환 | ||||
|   <kbd>a</kbd>: Toggle select hunk | ||||
|   <kbd><c-o></kbd>: 선택한 텍스트를 클립보드에 복사 | ||||
|   <kbd>o</kbd>: 파일 닫기 | ||||
|   <kbd>e</kbd>: 파일 편집 | ||||
|   <kbd><esc></kbd>: 파일 목록으로 돌아가기 | ||||
|   <kbd><tab></kbd>: 패널 전환 | ||||
|   <kbd><space></kbd>: 선택한 행을 staged / unstaged | ||||
|   <kbd>d</kbd>: 변경을 삭제 (git reset) | ||||
|   <kbd>E</kbd>: Edit hunk | ||||
|   <kbd>c</kbd>: 커밋 변경내용 | ||||
|   <kbd>w</kbd>: Commit changes without pre-commit hook | ||||
|   <kbd>C</kbd>: Git 편집기를 사용하여 변경 내용을 커밋합니다. | ||||
|   <kbd>/</kbd>: 검색 시작 | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <left> `` | 이전 hunk를 선택 |  | | ||||
| | `` <right> `` | 다음 hunk를 선택 |  | | ||||
| | `` v `` | 드래그 선택 전환 |  | | ||||
| | `` a `` | Toggle select hunk |  | | ||||
| | `` <c-o> `` | 선택한 텍스트를 클립보드에 복사 |  | | ||||
| | `` o `` | 파일 닫기 |  | | ||||
| | `` e `` | 파일 편집 |  | | ||||
| | `` <esc> `` | 파일 목록으로 돌아가기 |  | | ||||
| | `` <tab> `` | 패널 전환 |  | | ||||
| | `` <space> `` | 선택한 행을 staged / unstaged |  | | ||||
| | `` d `` | 변경을 삭제 (git reset) |  | | ||||
| | `` E `` | Edit hunk |  | | ||||
| | `` c `` | 커밋 변경내용 |  | | ||||
| | `` w `` | Commit changes without pre-commit hook |  | | ||||
| | `` C `` | Git 편집기를 사용하여 변경 내용을 커밋합니다. |  | | ||||
| | `` / `` | 검색 시작 |  | | ||||
|  | ||||
| ## 브랜치 | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: 브랜치명을 클립보드에 복사 | ||||
|   <kbd>i</kbd>: Git-flow 옵션 보기 | ||||
|   <kbd><space></kbd>: 체크아웃 | ||||
|   <kbd>n</kbd>: 새 브랜치 생성 | ||||
|   <kbd>o</kbd>: 풀 리퀘스트 생성 | ||||
|   <kbd>O</kbd>: 풀 리퀘스트 생성 옵션 | ||||
|   <kbd><c-y></kbd>: 풀 리퀘스트 URL을 클립보드에 복사 | ||||
|   <kbd>c</kbd>: 이름으로 체크아웃 | ||||
|   <kbd>F</kbd>: 강제 체크아웃 | ||||
|   <kbd>d</kbd>: View delete options | ||||
|   <kbd>r</kbd>: 체크아웃된 브랜치를 이 브랜치에 리베이스 | ||||
|   <kbd>M</kbd>: 현재 브랜치에 병합 | ||||
|   <kbd>f</kbd>: Fast-forward this branch from its upstream | ||||
|   <kbd>T</kbd>: 태그를 생성 | ||||
|   <kbd>s</kbd>: Sort order | ||||
|   <kbd>g</kbd>: View reset options | ||||
|   <kbd>R</kbd>: 브랜치 이름 변경 | ||||
|   <kbd>u</kbd>: View upstream options | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><enter></kbd>: 커밋 보기 | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | 브랜치명을 클립보드에 복사 |  | | ||||
| | `` i `` | Git-flow 옵션 보기 |  | | ||||
| | `` <space> `` | 체크아웃 |  | | ||||
| | `` n `` | 새 브랜치 생성 |  | | ||||
| | `` o `` | 풀 리퀘스트 생성 |  | | ||||
| | `` O `` | 풀 리퀘스트 생성 옵션 |  | | ||||
| | `` <c-y> `` | 풀 리퀘스트 URL을 클립보드에 복사 |  | | ||||
| | `` c `` | 이름으로 체크아웃 |  | | ||||
| | `` F `` | 강제 체크아웃 |  | | ||||
| | `` d `` | View delete options |  | | ||||
| | `` r `` | 체크아웃된 브랜치를 이 브랜치에 리베이스 |  | | ||||
| | `` M `` | 현재 브랜치에 병합 |  | | ||||
| | `` f `` | Fast-forward this branch from its upstream |  | | ||||
| | `` T `` | 태그를 생성 |  | | ||||
| | `` s `` | Sort order |  | | ||||
| | `` g `` | View reset options |  | | ||||
| | `` R `` | 브랜치 이름 변경 |  | | ||||
| | `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <enter> `` | 커밋 보기 |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## 상태 | ||||
|  | ||||
| <pre> | ||||
|   <kbd>o</kbd>: 설정 파일 열기 | ||||
|   <kbd>e</kbd>: 설정 파일 수정 | ||||
|   <kbd>u</kbd>: 업데이트 확인 | ||||
|   <kbd><enter></kbd>: 최근에 사용한 저장소로 전환 | ||||
|   <kbd>a</kbd>: 모든 브랜치 로그 표시 | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` o `` | 설정 파일 열기 |  | | ||||
| | `` e `` | 설정 파일 수정 |  | | ||||
| | `` u `` | 업데이트 확인 |  | | ||||
| | `` <enter> `` | 최근에 사용한 저장소로 전환 |  | | ||||
| | `` a `` | 모든 브랜치 로그 표시 |  | | ||||
|  | ||||
| ## 서브모듈 | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: 서브모듈 이름을 클립보드에 복사 | ||||
|   <kbd><enter></kbd>: 서브모듈 열기 | ||||
|   <kbd><space></kbd>: 서브모듈 열기 | ||||
|   <kbd>d</kbd>: 서브모듈 삭제 | ||||
|   <kbd>u</kbd>: 서브모듈 업데이트 | ||||
|   <kbd>n</kbd>: 새로운 서브모듈 추가 | ||||
|   <kbd>e</kbd>: 서브모듈의 URL을 수정 | ||||
|   <kbd>i</kbd>: 서브모듈 초기화 | ||||
|   <kbd>b</kbd>: View bulk submodule options | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | 서브모듈 이름을 클립보드에 복사 |  | | ||||
| | `` <enter> `` | 서브모듈 열기 |  | | ||||
| | `` <space> `` | 서브모듈 열기 |  | | ||||
| | `` d `` | 서브모듈 삭제 |  | | ||||
| | `` u `` | 서브모듈 업데이트 |  | | ||||
| | `` n `` | 새로운 서브모듈 추가 |  | | ||||
| | `` e `` | 서브모듈의 URL을 수정 |  | | ||||
| | `` i `` | 서브모듈 초기화 |  | | ||||
| | `` b `` | View bulk submodule options |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## 원격 | ||||
|  | ||||
| <pre> | ||||
|   <kbd>f</kbd>: 원격을 업데이트 | ||||
|   <kbd>n</kbd>: 새로운 Remote 추가 | ||||
|   <kbd>d</kbd>: Remote를 삭제 | ||||
|   <kbd>e</kbd>: Remote를 수정 | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` f `` | 원격을 업데이트 |  | | ||||
| | `` n `` | 새로운 Remote 추가 |  | | ||||
| | `` d `` | Remote를 삭제 |  | | ||||
| | `` e `` | Remote를 수정 |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## 원격 브랜치 | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: 브랜치명을 클립보드에 복사 | ||||
|   <kbd><space></kbd>: 체크아웃 | ||||
|   <kbd>n</kbd>: 새 브랜치 생성 | ||||
|   <kbd>M</kbd>: 현재 브랜치에 병합 | ||||
|   <kbd>r</kbd>: 체크아웃된 브랜치를 이 브랜치에 리베이스 | ||||
|   <kbd>d</kbd>: Delete remote tag | ||||
|   <kbd>u</kbd>: Set as upstream of checked-out branch | ||||
|   <kbd>s</kbd>: Sort order | ||||
|   <kbd>g</kbd>: View reset options | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><enter></kbd>: 커밋 보기 | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | 브랜치명을 클립보드에 복사 |  | | ||||
| | `` <space> `` | 체크아웃 |  | | ||||
| | `` n `` | 새 브랜치 생성 |  | | ||||
| | `` M `` | 현재 브랜치에 병합 |  | | ||||
| | `` r `` | 체크아웃된 브랜치를 이 브랜치에 리베이스 |  | | ||||
| | `` d `` | Delete remote tag |  | | ||||
| | `` u `` | Set as upstream of checked-out branch |  | | ||||
| | `` s `` | Sort order |  | | ||||
| | `` g `` | View reset options |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <enter> `` | 커밋 보기 |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## 커밋 | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: 커밋 SHA를 클립보드에 복사 | ||||
|   <kbd><c-r></kbd>: Reset cherry-picked (copied) commits selection | ||||
|   <kbd>b</kbd>: Bisect 옵션 보기 | ||||
|   <kbd>s</kbd>: Squash down | ||||
|   <kbd>f</kbd>: Fixup commit | ||||
|   <kbd>r</kbd>: 커밋메시지 변경 | ||||
|   <kbd>R</kbd>: 에디터에서 커밋메시지 수정 | ||||
|   <kbd>d</kbd>: 커밋 삭제 | ||||
|   <kbd>e</kbd>: 커밋을 편집 | ||||
|   <kbd>i</kbd>: Start interactive rebase | ||||
|   <kbd>p</kbd>: Pick commit (when mid-rebase) | ||||
|   <kbd>F</kbd>: Create fixup commit for this commit | ||||
|   <kbd>S</kbd>: Squash all 'fixup!' commits above selected commit (autosquash) | ||||
|   <kbd><c-j></kbd>: 커밋을 1개 아래로 이동 | ||||
|   <kbd><c-k></kbd>: 커밋을 1개 위로 이동 | ||||
|   <kbd>V</kbd>: 커밋을 붙여넣기 (cherry-pick) | ||||
|   <kbd>B</kbd>: Mark commit as base commit for rebase | ||||
|   <kbd>A</kbd>: Amend commit with staged changes | ||||
|   <kbd>a</kbd>: Set/Reset commit author | ||||
|   <kbd>t</kbd>: 커밋 되돌리기 | ||||
|   <kbd>T</kbd>: Tag commit | ||||
|   <kbd><c-l></kbd>: 로그 메뉴 열기 | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><space></kbd>: 커밋을 체크아웃 | ||||
|   <kbd>y</kbd>: 커밋 attribute 복사 | ||||
|   <kbd>o</kbd>: 브라우저에서 커밋 열기 | ||||
|   <kbd>n</kbd>: 커밋에서 새 브랜치를 만듭니다. | ||||
|   <kbd>g</kbd>: View reset options | ||||
|   <kbd>C</kbd>: 커밋을 복사 (cherry-pick) | ||||
|   <kbd><c-t></kbd>: Open external diff tool (git difftool) | ||||
|   <kbd><enter></kbd>: View selected item's files | ||||
|   <kbd>/</kbd>: 검색 시작 | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | 커밋 SHA를 클립보드에 복사 |  | | ||||
| | `` <c-r> `` | Reset cherry-picked (copied) commits selection |  | | ||||
| | `` b `` | Bisect 옵션 보기 |  | | ||||
| | `` s `` | Squash down |  | | ||||
| | `` f `` | Fixup commit |  | | ||||
| | `` r `` | 커밋메시지 변경 |  | | ||||
| | `` R `` | 에디터에서 커밋메시지 수정 |  | | ||||
| | `` d `` | 커밋 삭제 |  | | ||||
| | `` e `` | 커밋을 편집 |  | | ||||
| | `` i `` | Start interactive rebase | Start an interactive rebase for the commits on your branch. This will include all commits from the HEAD commit down to the first merge commit or main branch commit. | ||||
| If you would instead like to start an interactive rebase from the selected commit, press `e`. | | ||||
| | `` p `` | Pick commit (when mid-rebase) |  | | ||||
| | `` F `` | Create fixup commit for this commit |  | | ||||
| | `` S `` | Squash all 'fixup!' commits above selected commit (autosquash) |  | | ||||
| | `` <c-j> `` | 커밋을 1개 아래로 이동 |  | | ||||
| | `` <c-k> `` | 커밋을 1개 위로 이동 |  | | ||||
| | `` V `` | 커밋을 붙여넣기 (cherry-pick) |  | | ||||
| | `` B `` | Mark commit as base commit for rebase | Select a base commit for the next rebase; this will effectively perform a 'git rebase --onto'. | | ||||
| | `` A `` | Amend commit with staged changes |  | | ||||
| | `` a `` | Set/Reset commit author |  | | ||||
| | `` t `` | 커밋 되돌리기 |  | | ||||
| | `` T `` | Tag commit |  | | ||||
| | `` <c-l> `` | 로그 메뉴 열기 |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <space> `` | 커밋을 체크아웃 |  | | ||||
| | `` y `` | 커밋 attribute 복사 |  | | ||||
| | `` o `` | 브라우저에서 커밋 열기 |  | | ||||
| | `` n `` | 커밋에서 새 브랜치를 만듭니다. |  | | ||||
| | `` g `` | View reset options |  | | ||||
| | `` C `` | 커밋을 복사 (cherry-pick) |  | | ||||
| | `` <c-t> `` | Open external diff tool (git difftool) |  | | ||||
| | `` <enter> `` | View selected item's files |  | | ||||
| | `` / `` | 검색 시작 |  | | ||||
|  | ||||
| ## 커밋 파일 | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: 커밋한 파일명을 클립보드에 복사 | ||||
|   <kbd>c</kbd>: Checkout file | ||||
|   <kbd>d</kbd>: Discard this commit's changes to this file | ||||
|   <kbd>o</kbd>: 파일 닫기 | ||||
|   <kbd>e</kbd>: 파일 편집 | ||||
|   <kbd><c-t></kbd>: Open external diff tool (git difftool) | ||||
|   <kbd><space></kbd>: Toggle file included in patch | ||||
|   <kbd>a</kbd>: Toggle all files included in patch | ||||
|   <kbd><enter></kbd>: Enter file to add selected lines to the patch (or toggle directory collapsed) | ||||
|   <kbd>`</kbd>: 파일 트리뷰로 전환 | ||||
|   <kbd>/</kbd>: 검색 시작 | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | 커밋한 파일명을 클립보드에 복사 |  | | ||||
| | `` c `` | Checkout file |  | | ||||
| | `` d `` | Discard this commit's changes to this file |  | | ||||
| | `` o `` | 파일 닫기 |  | | ||||
| | `` e `` | 파일 편집 |  | | ||||
| | `` <c-t> `` | Open external diff tool (git difftool) |  | | ||||
| | `` <space> `` | Toggle file included in patch |  | | ||||
| | `` a `` | Toggle all files included in patch |  | | ||||
| | `` <enter> `` | Enter file to add selected lines to the patch (or toggle directory collapsed) |  | | ||||
| | `` ` `` | 파일 트리뷰로 전환 |  | | ||||
| | `` / `` | 검색 시작 |  | | ||||
|  | ||||
| ## 커밋메시지 | ||||
|  | ||||
| <pre> | ||||
|   <kbd><enter></kbd>: 확인 | ||||
|   <kbd><esc></kbd>: 닫기 | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <enter> `` | 확인 |  | | ||||
| | `` <esc> `` | 닫기 |  | | ||||
|  | ||||
| ## 태그 | ||||
|  | ||||
| <pre> | ||||
|   <kbd><space></kbd>: 체크아웃 | ||||
|   <kbd>d</kbd>: View delete options | ||||
|   <kbd>P</kbd>: 태그를 push | ||||
|   <kbd>n</kbd>: 태그를 생성 | ||||
|   <kbd>g</kbd>: View reset options | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><enter></kbd>: 커밋 보기 | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <space> `` | 체크아웃 |  | | ||||
| | `` d `` | View delete options |  | | ||||
| | `` P `` | 태그를 push |  | | ||||
| | `` n `` | 태그를 생성 |  | | ||||
| | `` g `` | View reset options |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <enter> `` | 커밋 보기 |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## 파일 | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: 파일명을 클립보드에 복사 | ||||
|   <kbd><space></kbd>: Staged 전환 | ||||
|   <kbd><c-b></kbd>: 파일을 필터하기 (Staged/unstaged) | ||||
|   <kbd>y</kbd>: Copy to clipboard | ||||
|   <kbd>c</kbd>: 커밋 변경내용 | ||||
|   <kbd>w</kbd>: Commit changes without pre-commit hook | ||||
|   <kbd>A</kbd>: 마지맛 커밋 수정 | ||||
|   <kbd>C</kbd>: Git 편집기를 사용하여 변경 내용을 커밋합니다. | ||||
|   <kbd><c-f></kbd>: Find base commit for fixup | ||||
|   <kbd>e</kbd>: 파일 편집 | ||||
|   <kbd>o</kbd>: 파일 닫기 | ||||
|   <kbd>i</kbd>: Ignore file | ||||
|   <kbd>r</kbd>: 파일 새로고침 | ||||
|   <kbd>s</kbd>: 변경사항을 Stash | ||||
|   <kbd>S</kbd>: Stash 옵션 보기 | ||||
|   <kbd>a</kbd>: 모든 변경을 Staged/unstaged으로 전환 | ||||
|   <kbd><enter></kbd>: Stage individual hunks/lines for file, or collapse/expand for directory | ||||
|   <kbd>d</kbd>: View 'discard changes' options | ||||
|   <kbd>g</kbd>: View upstream reset options | ||||
|   <kbd>D</kbd>: View reset options | ||||
|   <kbd>`</kbd>: 파일 트리뷰로 전환 | ||||
|   <kbd><c-t></kbd>: Open external diff tool (git difftool) | ||||
|   <kbd>M</kbd>: Git mergetool를 열기 | ||||
|   <kbd>f</kbd>: Fetch | ||||
|   <kbd>/</kbd>: 검색 시작 | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | 파일명을 클립보드에 복사 |  | | ||||
| | `` <space> `` | Staged 전환 |  | | ||||
| | `` <c-b> `` | 파일을 필터하기 (Staged/unstaged) |  | | ||||
| | `` y `` | Copy to clipboard |  | | ||||
| | `` c `` | 커밋 변경내용 |  | | ||||
| | `` w `` | Commit changes without pre-commit hook |  | | ||||
| | `` A `` | 마지맛 커밋 수정 |  | | ||||
| | `` C `` | Git 편집기를 사용하여 변경 내용을 커밋합니다. |  | | ||||
| | `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> | | ||||
| | `` e `` | 파일 편집 |  | | ||||
| | `` o `` | 파일 닫기 |  | | ||||
| | `` i `` | Ignore file |  | | ||||
| | `` r `` | 파일 새로고침 |  | | ||||
| | `` s `` | 변경사항을 Stash |  | | ||||
| | `` S `` | Stash 옵션 보기 |  | | ||||
| | `` a `` | 모든 변경을 Staged/unstaged으로 전환 |  | | ||||
| | `` <enter> `` | Stage individual hunks/lines for file, or collapse/expand for directory |  | | ||||
| | `` d `` | View 'discard changes' options |  | | ||||
| | `` g `` | View upstream reset options |  | | ||||
| | `` D `` | View reset options |  | | ||||
| | `` ` `` | 파일 트리뷰로 전환 |  | | ||||
| | `` <c-t> `` | Open external diff tool (git difftool) |  | | ||||
| | `` M `` | Git mergetool를 열기 |  | | ||||
| | `` f `` | Fetch |  | | ||||
| | `` / `` | 검색 시작 |  | | ||||
|  | ||||
| ## 확인 패널 | ||||
|  | ||||
| <pre> | ||||
|   <kbd><enter></kbd>: 확인 | ||||
|   <kbd><esc></kbd>: 닫기/취소 | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <enter> `` | 확인 |  | | ||||
| | `` <esc> `` | 닫기/취소 |  | | ||||
|   | ||||
| @@ -6,356 +6,357 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ | ||||
|  | ||||
| ## Globale sneltoetsen | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-r></kbd>: Wissel naar een recente repo | ||||
|   <kbd><pgup></kbd>: Scroll naar beneden vanaf hoofdpaneel (fn+up/shift+k) | ||||
|   <kbd><pgdown></kbd>: Scroll naar beneden vanaf hoofdpaneel (fn+down/shift+j) | ||||
|   <kbd>@</kbd>: Open command log menu | ||||
|   <kbd>}</kbd>: Increase the size of the context shown around changes in the diff view | ||||
|   <kbd>{</kbd>: Decrease the size of the context shown around changes in the diff view | ||||
|   <kbd>:</kbd>: Voer aangepaste commando uit | ||||
|   <kbd><c-p></kbd>: Bekijk aangepaste patch opties | ||||
|   <kbd>m</kbd>: Bekijk merge/rebase opties | ||||
|   <kbd>R</kbd>: Verversen | ||||
|   <kbd>+</kbd>: Volgende scherm modus (normaal/half/groot) | ||||
|   <kbd>_</kbd>: Vorige scherm modus | ||||
|   <kbd>?</kbd>: Open menu | ||||
|   <kbd><c-s></kbd>: Bekijk scoping opties | ||||
|   <kbd>W</kbd>: Open diff menu | ||||
|   <kbd><c-e></kbd>: Open diff menu | ||||
|   <kbd><c-w></kbd>: Toggle whether or not whitespace changes are shown in the diff view | ||||
|   <kbd>z</kbd>: Ongedaan maken (via reflog) (experimenteel) | ||||
|   <kbd><c-z></kbd>: Redo (via reflog) (experimenteel) | ||||
|   <kbd>P</kbd>: Push | ||||
|   <kbd>p</kbd>: Pull | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-r> `` | Wissel naar een recente repo |  | | ||||
| | `` <pgup> (fn+up/shift+k) `` | Scroll naar beneden vanaf hoofdpaneel |  | | ||||
| | `` <pgdown> (fn+down/shift+j) `` | Scroll naar beneden vanaf hoofdpaneel |  | | ||||
| | `` @ `` | Open command log menu |  | | ||||
| | `` } `` | Increase the size of the context shown around changes in the diff view |  | | ||||
| | `` { `` | Decrease the size of the context shown around changes in the diff view |  | | ||||
| | `` : `` | Voer aangepaste commando uit |  | | ||||
| | `` <c-p> `` | Bekijk aangepaste patch opties |  | | ||||
| | `` m `` | Bekijk merge/rebase opties |  | | ||||
| | `` R `` | Verversen |  | | ||||
| | `` + `` | Volgende scherm modus (normaal/half/groot) |  | | ||||
| | `` _ `` | Vorige scherm modus |  | | ||||
| | `` ? `` | Open menu |  | | ||||
| | `` <c-s> `` | Bekijk scoping opties |  | | ||||
| | `` W `` | Open diff menu |  | | ||||
| | `` <c-e> `` | Open diff menu |  | | ||||
| | `` <c-w> `` | Toggle whether or not whitespace changes are shown in the diff view |  | | ||||
| | `` 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. | | ||||
| | `` <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. | | ||||
| | `` P `` | Push |  | | ||||
| | `` p `` | Pull |  | | ||||
|  | ||||
| ## Lijstpaneel navigatie | ||||
|  | ||||
| <pre> | ||||
|   <kbd>,</kbd>: Vorige pagina | ||||
|   <kbd>.</kbd>: Volgende pagina | ||||
|   <kbd><</kbd>: Scroll naar boven | ||||
|   <kbd>></kbd>: Scroll naar beneden | ||||
|   <kbd>v</kbd>: Toggle drag selecteer | ||||
|   <kbd><s-down></kbd>: Range select down | ||||
|   <kbd><s-up></kbd>: Range select up | ||||
|   <kbd>/</kbd>: Start met zoeken | ||||
|   <kbd>H</kbd>: Scroll left | ||||
|   <kbd>L</kbd>: Scroll right | ||||
|   <kbd>]</kbd>: Volgende tabblad | ||||
|   <kbd>[</kbd>: Vorige tabblad | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` , `` | Vorige pagina |  | | ||||
| | `` . `` | Volgende pagina |  | | ||||
| | `` < `` | Scroll naar boven |  | | ||||
| | `` > `` | Scroll naar beneden |  | | ||||
| | `` v `` | Toggle drag selecteer |  | | ||||
| | `` <s-down> `` | Range select down |  | | ||||
| | `` <s-up> `` | Range select up |  | | ||||
| | `` / `` | Start met zoeken |  | | ||||
| | `` H `` | Scroll left |  | | ||||
| | `` L `` | Scroll right |  | | ||||
| | `` ] `` | Volgende tabblad |  | | ||||
| | `` [ `` | Vorige tabblad |  | | ||||
|  | ||||
| ## Bestanden | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: Kopieer de bestandsnaam naar het klembord | ||||
|   <kbd><space></kbd>: Toggle staged | ||||
|   <kbd><c-b></kbd>: Filter files by status | ||||
|   <kbd>y</kbd>: Copy to clipboard | ||||
|   <kbd>c</kbd>: Commit veranderingen | ||||
|   <kbd>w</kbd>: Commit veranderingen zonder pre-commit hook | ||||
|   <kbd>A</kbd>: Wijzig laatste commit | ||||
|   <kbd>C</kbd>: Commit veranderingen met de git editor | ||||
|   <kbd><c-f></kbd>: Find base commit for fixup | ||||
|   <kbd>e</kbd>: Verander bestand | ||||
|   <kbd>o</kbd>: Open bestand | ||||
|   <kbd>i</kbd>: Ignore or exclude file | ||||
|   <kbd>r</kbd>: Refresh bestanden | ||||
|   <kbd>s</kbd>: Stash-bestanden | ||||
|   <kbd>S</kbd>: Bekijk stash opties | ||||
|   <kbd>a</kbd>: Toggle staged alle | ||||
|   <kbd><enter></kbd>: Stage individuele hunks/lijnen | ||||
|   <kbd>d</kbd>: Bekijk 'veranderingen ongedaan maken' opties | ||||
|   <kbd>g</kbd>: Bekijk upstream reset opties | ||||
|   <kbd>D</kbd>: Bekijk reset opties | ||||
|   <kbd>`</kbd>: Toggle bestandsboom weergave | ||||
|   <kbd><c-t></kbd>: Open external diff tool (git difftool) | ||||
|   <kbd>M</kbd>: Open external merge tool (git mergetool) | ||||
|   <kbd>f</kbd>: Fetch | ||||
|   <kbd>/</kbd>: Start met zoeken | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | Kopieer de bestandsnaam naar het klembord |  | | ||||
| | `` <space> `` | Toggle staged |  | | ||||
| | `` <c-b> `` | Filter files by status |  | | ||||
| | `` y `` | Copy to clipboard |  | | ||||
| | `` c `` | Commit veranderingen |  | | ||||
| | `` w `` | Commit veranderingen zonder pre-commit hook |  | | ||||
| | `` A `` | Wijzig laatste commit |  | | ||||
| | `` C `` | Commit veranderingen met de git editor |  | | ||||
| | `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> | | ||||
| | `` e `` | Verander bestand |  | | ||||
| | `` o `` | Open bestand |  | | ||||
| | `` i `` | Ignore or exclude file |  | | ||||
| | `` r `` | Refresh bestanden |  | | ||||
| | `` s `` | Stash-bestanden |  | | ||||
| | `` S `` | Bekijk stash opties |  | | ||||
| | `` a `` | Toggle staged alle |  | | ||||
| | `` <enter> `` | Stage individuele hunks/lijnen |  | | ||||
| | `` d `` | Bekijk 'veranderingen ongedaan maken' opties |  | | ||||
| | `` g `` | Bekijk upstream reset opties |  | | ||||
| | `` D `` | Bekijk reset opties |  | | ||||
| | `` ` `` | Toggle bestandsboom weergave |  | | ||||
| | `` <c-t> `` | Open external diff tool (git difftool) |  | | ||||
| | `` M `` | Open external merge tool (git mergetool) |  | | ||||
| | `` f `` | Fetch |  | | ||||
| | `` / `` | Start met zoeken |  | | ||||
|  | ||||
| ## Bevestigingspaneel | ||||
|  | ||||
| <pre> | ||||
|   <kbd><enter></kbd>: Bevestig | ||||
|   <kbd><esc></kbd>: Sluiten | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <enter> `` | Bevestig |  | | ||||
| | `` <esc> `` | Sluiten |  | | ||||
|  | ||||
| ## Branches | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: Kopieer branch name naar klembord | ||||
|   <kbd>i</kbd>: Laat git-flow opties zien | ||||
|   <kbd><space></kbd>: Uitchecken | ||||
|   <kbd>n</kbd>: Nieuwe branch | ||||
|   <kbd>o</kbd>: Maak een pull-request | ||||
|   <kbd>O</kbd>: Bekijk opties voor pull-aanvraag | ||||
|   <kbd><c-y></kbd>: Kopieer de URL van het pull-verzoek naar het klembord | ||||
|   <kbd>c</kbd>: Uitchecken bij naam | ||||
|   <kbd>F</kbd>: Forceer checkout | ||||
|   <kbd>d</kbd>: View delete options | ||||
|   <kbd>r</kbd>: Rebase branch | ||||
|   <kbd>M</kbd>: Merge in met huidige checked out branch | ||||
|   <kbd>f</kbd>: Fast-forward deze branch vanaf zijn upstream | ||||
|   <kbd>T</kbd>: Creëer tag | ||||
|   <kbd>s</kbd>: Sort order | ||||
|   <kbd>g</kbd>: Bekijk reset opties | ||||
|   <kbd>R</kbd>: Hernoem branch | ||||
|   <kbd>u</kbd>: View upstream options | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><enter></kbd>: Bekijk commits | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | Kopieer branch name naar klembord |  | | ||||
| | `` i `` | Laat git-flow opties zien |  | | ||||
| | `` <space> `` | Uitchecken |  | | ||||
| | `` n `` | Nieuwe branch |  | | ||||
| | `` o `` | Maak een pull-request |  | | ||||
| | `` O `` | Bekijk opties voor pull-aanvraag |  | | ||||
| | `` <c-y> `` | Kopieer de URL van het pull-verzoek naar het klembord |  | | ||||
| | `` c `` | Uitchecken bij naam |  | | ||||
| | `` F `` | Forceer checkout |  | | ||||
| | `` d `` | View delete options |  | | ||||
| | `` r `` | Rebase branch |  | | ||||
| | `` M `` | Merge in met huidige checked out branch |  | | ||||
| | `` f `` | Fast-forward deze branch vanaf zijn upstream |  | | ||||
| | `` T `` | Creëer tag |  | | ||||
| | `` s `` | Sort order |  | | ||||
| | `` g `` | Bekijk reset opties |  | | ||||
| | `` R `` | Hernoem branch |  | | ||||
| | `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <enter> `` | Bekijk commits |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## Commit bericht | ||||
|  | ||||
| <pre> | ||||
|   <kbd><enter></kbd>: Bevestig | ||||
|   <kbd><esc></kbd>: Sluiten | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <enter> `` | Bevestig |  | | ||||
| | `` <esc> `` | Sluiten |  | | ||||
|  | ||||
| ## Commit bestanden | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: Kopieer de vastgelegde bestandsnaam naar het klembord | ||||
|   <kbd>c</kbd>: Bestand uitchecken | ||||
|   <kbd>d</kbd>: Uitsluit deze commit zijn veranderingen aan dit bestand | ||||
|   <kbd>o</kbd>: Open bestand | ||||
|   <kbd>e</kbd>: Verander bestand | ||||
|   <kbd><c-t></kbd>: Open external diff tool (git difftool) | ||||
|   <kbd><space></kbd>: Toggle bestand inbegrepen in patch | ||||
|   <kbd>a</kbd>: Toggle all files included in patch | ||||
|   <kbd><enter></kbd>: Enter bestand om geselecteerde regels toe te voegen aan de patch | ||||
|   <kbd>`</kbd>: Toggle bestandsboom weergave | ||||
|   <kbd>/</kbd>: Start met zoeken | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | Kopieer de vastgelegde bestandsnaam naar het klembord |  | | ||||
| | `` c `` | Bestand uitchecken |  | | ||||
| | `` d `` | Uitsluit deze commit zijn veranderingen aan dit bestand |  | | ||||
| | `` o `` | Open bestand |  | | ||||
| | `` e `` | Verander bestand |  | | ||||
| | `` <c-t> `` | Open external diff tool (git difftool) |  | | ||||
| | `` <space> `` | Toggle bestand inbegrepen in patch |  | | ||||
| | `` a `` | Toggle all files included in patch |  | | ||||
| | `` <enter> `` | Enter bestand om geselecteerde regels toe te voegen aan de patch |  | | ||||
| | `` ` `` | Toggle bestandsboom weergave |  | | ||||
| | `` / `` | Start met zoeken |  | | ||||
|  | ||||
| ## Commits | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: Kopieer commit SHA naar klembord | ||||
|   <kbd><c-r></kbd>: Reset cherry-picked (gekopieerde) commits selectie | ||||
|   <kbd>b</kbd>: View bisect options | ||||
|   <kbd>s</kbd>: Squash beneden | ||||
|   <kbd>f</kbd>: Fixup commit | ||||
|   <kbd>r</kbd>: Hernoem commit | ||||
|   <kbd>R</kbd>: Hernoem commit met editor | ||||
|   <kbd>d</kbd>: Verwijder commit | ||||
|   <kbd>e</kbd>: Wijzig commit | ||||
|   <kbd>i</kbd>: Start interactive rebase | ||||
|   <kbd>p</kbd>: Kies commit (wanneer midden in rebase) | ||||
|   <kbd>F</kbd>: Creëer fixup commit | ||||
|   <kbd>S</kbd>: Squash bovenstaande commits | ||||
|   <kbd><c-j></kbd>: Verplaats commit 1 naar beneden | ||||
|   <kbd><c-k></kbd>: Verplaats commit 1 naar boven | ||||
|   <kbd>V</kbd>: Plak commits (cherry-pick) | ||||
|   <kbd>B</kbd>: Mark commit as base commit for rebase | ||||
|   <kbd>A</kbd>: Wijzig commit met staged veranderingen | ||||
|   <kbd>a</kbd>: Set/Reset commit author | ||||
|   <kbd>t</kbd>: Commit ongedaan maken | ||||
|   <kbd>T</kbd>: Tag commit | ||||
|   <kbd><c-l></kbd>: Open log menu | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><space></kbd>: Checkout commit | ||||
|   <kbd>y</kbd>: Copy commit attribute | ||||
|   <kbd>o</kbd>: Open commit in browser | ||||
|   <kbd>n</kbd>: Creëer nieuwe branch van commit | ||||
|   <kbd>g</kbd>: Bekijk reset opties | ||||
|   <kbd>C</kbd>: Kopieer commit (cherry-pick) | ||||
|   <kbd><c-t></kbd>: Open external diff tool (git difftool) | ||||
|   <kbd><enter></kbd>: Bekijk gecommite bestanden | ||||
|   <kbd>/</kbd>: Start met zoeken | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | Kopieer commit SHA naar klembord |  | | ||||
| | `` <c-r> `` | Reset cherry-picked (gekopieerde) commits selectie |  | | ||||
| | `` b `` | View bisect options |  | | ||||
| | `` s `` | Squash beneden |  | | ||||
| | `` f `` | Fixup commit |  | | ||||
| | `` r `` | Hernoem commit |  | | ||||
| | `` R `` | Hernoem commit met editor |  | | ||||
| | `` d `` | Verwijder commit |  | | ||||
| | `` e `` | Wijzig commit |  | | ||||
| | `` i `` | Start interactive rebase | Start an interactive rebase for the commits on your branch. This will include all commits from the HEAD commit down to the first merge commit or main branch commit. | ||||
| If you would instead like to start an interactive rebase from the selected commit, press `e`. | | ||||
| | `` p `` | Kies commit (wanneer midden in rebase) |  | | ||||
| | `` F `` | Creëer fixup commit |  | | ||||
| | `` S `` | Squash bovenstaande commits |  | | ||||
| | `` <c-j> `` | Verplaats commit 1 naar beneden |  | | ||||
| | `` <c-k> `` | Verplaats commit 1 naar boven |  | | ||||
| | `` V `` | Plak commits (cherry-pick) |  | | ||||
| | `` B `` | Mark commit as base commit for rebase | Select a base commit for the next rebase; this will effectively perform a 'git rebase --onto'. | | ||||
| | `` A `` | Wijzig commit met staged veranderingen |  | | ||||
| | `` a `` | Set/Reset commit author |  | | ||||
| | `` t `` | Commit ongedaan maken |  | | ||||
| | `` T `` | Tag commit |  | | ||||
| | `` <c-l> `` | Open log menu |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <space> `` | Checkout commit |  | | ||||
| | `` y `` | Copy commit attribute |  | | ||||
| | `` o `` | Open commit in browser |  | | ||||
| | `` n `` | Creëer nieuwe branch van commit |  | | ||||
| | `` g `` | Bekijk reset opties |  | | ||||
| | `` C `` | Kopieer commit (cherry-pick) |  | | ||||
| | `` <c-t> `` | Open external diff tool (git difftool) |  | | ||||
| | `` <enter> `` | Bekijk gecommite bestanden |  | | ||||
| | `` / `` | Start met zoeken |  | | ||||
|  | ||||
| ## Menu | ||||
|  | ||||
| <pre> | ||||
|   <kbd><enter></kbd>: Uitvoeren | ||||
|   <kbd><esc></kbd>: Sluiten | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <enter> `` | Uitvoeren |  | | ||||
| | `` <esc> `` | Sluiten |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## Mergen | ||||
|  | ||||
| <pre> | ||||
|   <kbd>e</kbd>: Verander bestand | ||||
|   <kbd>o</kbd>: Open bestand | ||||
|   <kbd><left></kbd>: Selecteer voorgaand conflict | ||||
|   <kbd><right></kbd>: Selecteer volgende conflict | ||||
|   <kbd><up></kbd>: Selecteer bovenste hunk | ||||
|   <kbd><down></kbd>: Selecteer onderste hunk | ||||
|   <kbd>z</kbd>: Ongedaan maken | ||||
|   <kbd>M</kbd>: Open external merge tool (git mergetool) | ||||
|   <kbd><space></kbd>: Kies stuk | ||||
|   <kbd>b</kbd>: Kies beide stukken | ||||
|   <kbd><esc></kbd>: Ga terug naar het bestanden paneel | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` e `` | Verander bestand |  | | ||||
| | `` o `` | Open bestand |  | | ||||
| | `` <left> `` | Selecteer voorgaand conflict |  | | ||||
| | `` <right> `` | Selecteer volgende conflict |  | | ||||
| | `` <up> `` | Selecteer bovenste hunk |  | | ||||
| | `` <down> `` | Selecteer onderste hunk |  | | ||||
| | `` z `` | Ongedaan maken |  | | ||||
| | `` M `` | Open external merge tool (git mergetool) |  | | ||||
| | `` <space> `` | Kies stuk |  | | ||||
| | `` b `` | Kies beide stukken |  | | ||||
| | `` <esc> `` | Ga terug naar het bestanden paneel |  | | ||||
|  | ||||
| ## Normaal | ||||
|  | ||||
| <pre> | ||||
|   <kbd>mouse wheel down</kbd>: Scroll omlaag (fn+up) | ||||
|   <kbd>mouse wheel up</kbd>: Scroll omhoog (fn+down) | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` mouse wheel down (fn+up) `` | Scroll omlaag |  | | ||||
| | `` mouse wheel up (fn+down) `` | Scroll omhoog |  | | ||||
|  | ||||
| ## Patch bouwen | ||||
|  | ||||
| <pre> | ||||
|   <kbd><left></kbd>: Selecteer de vorige hunk | ||||
|   <kbd><right></kbd>: Selecteer de volgende hunk | ||||
|   <kbd>v</kbd>: Toggle drag selecteer | ||||
|   <kbd>a</kbd>: Toggle selecteer hunk | ||||
|   <kbd><c-o></kbd>: Copy the selected text to the clipboard | ||||
|   <kbd>o</kbd>: Open bestand | ||||
|   <kbd>e</kbd>: Verander bestand | ||||
|   <kbd><space></kbd>: Voeg toe/verwijder lijn(en) in patch | ||||
|   <kbd><esc></kbd>: Sluit lijn-bij-lijn modus | ||||
|   <kbd>/</kbd>: Start met zoeken | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <left> `` | Selecteer de vorige hunk |  | | ||||
| | `` <right> `` | Selecteer de volgende hunk |  | | ||||
| | `` v `` | Toggle drag selecteer |  | | ||||
| | `` a `` | Toggle selecteer hunk |  | | ||||
| | `` <c-o> `` | Copy the selected text to the clipboard |  | | ||||
| | `` o `` | Open bestand |  | | ||||
| | `` e `` | Verander bestand |  | | ||||
| | `` <space> `` | Voeg toe/verwijder lijn(en) in patch |  | | ||||
| | `` <esc> `` | Sluit lijn-bij-lijn modus |  | | ||||
| | `` / `` | Start met zoeken |  | | ||||
|  | ||||
| ## Reflog | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: Kopieer commit SHA naar klembord | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><space></kbd>: Checkout commit | ||||
|   <kbd>y</kbd>: Copy commit attribute | ||||
|   <kbd>o</kbd>: Open commit in browser | ||||
|   <kbd>n</kbd>: Creëer nieuwe branch van commit | ||||
|   <kbd>g</kbd>: Bekijk reset opties | ||||
|   <kbd>C</kbd>: Kopieer commit (cherry-pick) | ||||
|   <kbd><c-r></kbd>: Reset cherry-picked (gekopieerde) commits selectie | ||||
|   <kbd><c-t></kbd>: Open external diff tool (git difftool) | ||||
|   <kbd><enter></kbd>: Bekijk commits | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | Kopieer commit SHA naar klembord |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <space> `` | Checkout commit |  | | ||||
| | `` y `` | Copy commit attribute |  | | ||||
| | `` o `` | Open commit in browser |  | | ||||
| | `` n `` | Creëer nieuwe branch van commit |  | | ||||
| | `` g `` | Bekijk reset opties |  | | ||||
| | `` C `` | Kopieer commit (cherry-pick) |  | | ||||
| | `` <c-r> `` | Reset cherry-picked (gekopieerde) commits selectie |  | | ||||
| | `` <c-t> `` | Open external diff tool (git difftool) |  | | ||||
| | `` <enter> `` | Bekijk commits |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## Remote branches | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: Kopieer branch name naar klembord | ||||
|   <kbd><space></kbd>: Uitchecken | ||||
|   <kbd>n</kbd>: Nieuwe branch | ||||
|   <kbd>M</kbd>: Merge in met huidige checked out branch | ||||
|   <kbd>r</kbd>: Rebase branch | ||||
|   <kbd>d</kbd>: Delete remote tag | ||||
|   <kbd>u</kbd>: Stel in als upstream van uitgecheckte branch | ||||
|   <kbd>s</kbd>: Sort order | ||||
|   <kbd>g</kbd>: Bekijk reset opties | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><enter></kbd>: Bekijk commits | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | Kopieer branch name naar klembord |  | | ||||
| | `` <space> `` | Uitchecken |  | | ||||
| | `` n `` | Nieuwe branch |  | | ||||
| | `` M `` | Merge in met huidige checked out branch |  | | ||||
| | `` r `` | Rebase branch |  | | ||||
| | `` d `` | Delete remote tag |  | | ||||
| | `` u `` | Stel in als upstream van uitgecheckte branch |  | | ||||
| | `` s `` | Sort order |  | | ||||
| | `` g `` | Bekijk reset opties |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <enter> `` | Bekijk commits |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## Remotes | ||||
|  | ||||
| <pre> | ||||
|   <kbd>f</kbd>: Fetch remote | ||||
|   <kbd>n</kbd>: Voeg een nieuwe remote toe | ||||
|   <kbd>d</kbd>: Verwijder remote | ||||
|   <kbd>e</kbd>: Wijzig remote | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` f `` | Fetch remote |  | | ||||
| | `` n `` | Voeg een nieuwe remote toe |  | | ||||
| | `` d `` | Verwijder remote |  | | ||||
| | `` e `` | Wijzig remote |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## Staging | ||||
|  | ||||
| <pre> | ||||
|   <kbd><left></kbd>: Selecteer de vorige hunk | ||||
|   <kbd><right></kbd>: Selecteer de volgende hunk | ||||
|   <kbd>v</kbd>: Toggle drag selecteer | ||||
|   <kbd>a</kbd>: Toggle selecteer hunk | ||||
|   <kbd><c-o></kbd>: Copy the selected text to the clipboard | ||||
|   <kbd>o</kbd>: Open bestand | ||||
|   <kbd>e</kbd>: Verander bestand | ||||
|   <kbd><esc></kbd>: Ga terug naar het bestanden paneel | ||||
|   <kbd><tab></kbd>: Ga naar een ander paneel | ||||
|   <kbd><space></kbd>: Toggle lijnen staged / unstaged | ||||
|   <kbd>d</kbd>: Verwijdert change (git reset) | ||||
|   <kbd>E</kbd>: Edit hunk | ||||
|   <kbd>c</kbd>: Commit veranderingen | ||||
|   <kbd>w</kbd>: Commit veranderingen zonder pre-commit hook | ||||
|   <kbd>C</kbd>: Commit veranderingen met de git editor | ||||
|   <kbd>/</kbd>: Start met zoeken | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <left> `` | Selecteer de vorige hunk |  | | ||||
| | `` <right> `` | Selecteer de volgende hunk |  | | ||||
| | `` v `` | Toggle drag selecteer |  | | ||||
| | `` a `` | Toggle selecteer hunk |  | | ||||
| | `` <c-o> `` | Copy the selected text to the clipboard |  | | ||||
| | `` o `` | Open bestand |  | | ||||
| | `` e `` | Verander bestand |  | | ||||
| | `` <esc> `` | Ga terug naar het bestanden paneel |  | | ||||
| | `` <tab> `` | Ga naar een ander paneel |  | | ||||
| | `` <space> `` | Toggle lijnen staged / unstaged |  | | ||||
| | `` d `` | Verwijdert change (git reset) |  | | ||||
| | `` E `` | Edit hunk |  | | ||||
| | `` c `` | Commit veranderingen |  | | ||||
| | `` w `` | Commit veranderingen zonder pre-commit hook |  | | ||||
| | `` C `` | Commit veranderingen met de git editor |  | | ||||
| | `` / `` | Start met zoeken |  | | ||||
|  | ||||
| ## Stash | ||||
|  | ||||
| <pre> | ||||
|   <kbd><space></kbd>: Toepassen | ||||
|   <kbd>g</kbd>: Pop | ||||
|   <kbd>d</kbd>: Laten vallen | ||||
|   <kbd>n</kbd>: Nieuwe branch | ||||
|   <kbd>r</kbd>: Rename stash | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><enter></kbd>: Bekijk gecommite bestanden | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <space> `` | Toepassen |  | | ||||
| | `` g `` | Pop |  | | ||||
| | `` d `` | Laten vallen |  | | ||||
| | `` n `` | Nieuwe branch |  | | ||||
| | `` r `` | Rename stash |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <enter> `` | Bekijk gecommite bestanden |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## Status | ||||
|  | ||||
| <pre> | ||||
|   <kbd>o</kbd>: Open config bestand | ||||
|   <kbd>e</kbd>: Verander config bestand | ||||
|   <kbd>u</kbd>: Check voor updates | ||||
|   <kbd><enter></kbd>: Wissel naar een recente repo | ||||
|   <kbd>a</kbd>: Alle logs van de branch laten zien | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` o `` | Open config bestand |  | | ||||
| | `` e `` | Verander config bestand |  | | ||||
| | `` u `` | Check voor updates |  | | ||||
| | `` <enter> `` | Wissel naar een recente repo |  | | ||||
| | `` a `` | Alle logs van de branch laten zien |  | | ||||
|  | ||||
| ## Sub-commits | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: Kopieer commit SHA naar klembord | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><space></kbd>: Checkout commit | ||||
|   <kbd>y</kbd>: Copy commit attribute | ||||
|   <kbd>o</kbd>: Open commit in browser | ||||
|   <kbd>n</kbd>: Creëer nieuwe branch van commit | ||||
|   <kbd>g</kbd>: Bekijk reset opties | ||||
|   <kbd>C</kbd>: Kopieer commit (cherry-pick) | ||||
|   <kbd><c-r></kbd>: Reset cherry-picked (gekopieerde) commits selectie | ||||
|   <kbd><c-t></kbd>: Open external diff tool (git difftool) | ||||
|   <kbd><enter></kbd>: Bekijk gecommite bestanden | ||||
|   <kbd>/</kbd>: Start met zoeken | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | Kopieer commit SHA naar klembord |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <space> `` | Checkout commit |  | | ||||
| | `` y `` | Copy commit attribute |  | | ||||
| | `` o `` | Open commit in browser |  | | ||||
| | `` n `` | Creëer nieuwe branch van commit |  | | ||||
| | `` g `` | Bekijk reset opties |  | | ||||
| | `` C `` | Kopieer commit (cherry-pick) |  | | ||||
| | `` <c-r> `` | Reset cherry-picked (gekopieerde) commits selectie |  | | ||||
| | `` <c-t> `` | Open external diff tool (git difftool) |  | | ||||
| | `` <enter> `` | Bekijk gecommite bestanden |  | | ||||
| | `` / `` | Start met zoeken |  | | ||||
|  | ||||
| ## Submodules | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: Kopieer submodule naam naar klembord | ||||
|   <kbd><enter></kbd>: Enter submodule | ||||
|   <kbd><space></kbd>: Enter submodule | ||||
|   <kbd>d</kbd>: Remove submodule | ||||
|   <kbd>u</kbd>: Update submodule | ||||
|   <kbd>n</kbd>: Voeg nieuwe submodule toe | ||||
|   <kbd>e</kbd>: Update submodule URL | ||||
|   <kbd>i</kbd>: Initialiseer submodule | ||||
|   <kbd>b</kbd>: Bekijk bulk submodule opties | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | Kopieer submodule naam naar klembord |  | | ||||
| | `` <enter> `` | Enter submodule |  | | ||||
| | `` <space> `` | Enter submodule |  | | ||||
| | `` d `` | Remove submodule |  | | ||||
| | `` u `` | Update submodule |  | | ||||
| | `` n `` | Voeg nieuwe submodule toe |  | | ||||
| | `` e `` | Update submodule URL |  | | ||||
| | `` i `` | Initialiseer submodule |  | | ||||
| | `` b `` | Bekijk bulk submodule opties |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## Tags | ||||
|  | ||||
| <pre> | ||||
|   <kbd><space></kbd>: Uitchecken | ||||
|   <kbd>d</kbd>: View delete options | ||||
|   <kbd>P</kbd>: Push tag | ||||
|   <kbd>n</kbd>: Creëer tag | ||||
|   <kbd>g</kbd>: Bekijk reset opties | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><enter></kbd>: Bekijk commits | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <space> `` | Uitchecken |  | | ||||
| | `` d `` | View delete options |  | | ||||
| | `` P `` | Push tag |  | | ||||
| | `` n `` | Creëer tag |  | | ||||
| | `` g `` | Bekijk reset opties |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <enter> `` | Bekijk commits |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## Worktrees | ||||
|  | ||||
| <pre> | ||||
|   <kbd>n</kbd>: Create worktree | ||||
|   <kbd><space></kbd>: Switch to worktree | ||||
|   <kbd><enter></kbd>: Switch to worktree | ||||
|   <kbd>o</kbd>: Open in editor | ||||
|   <kbd>d</kbd>: Remove worktree | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` n `` | Create worktree |  | | ||||
| | `` <space> `` | Switch to worktree |  | | ||||
| | `` <enter> `` | Switch to worktree |  | | ||||
| | `` o `` | Open in editor |  | | ||||
| | `` d `` | Remove worktree |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|   | ||||
| @@ -6,356 +6,357 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ | ||||
|  | ||||
| ## Globalne | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-r></kbd>: Switch to a recent repo | ||||
|   <kbd><pgup></kbd>: Scroll up main panel (fn+up/shift+k) | ||||
|   <kbd><pgdown></kbd>: Scroll down main panel (fn+down/shift+j) | ||||
|   <kbd>@</kbd>: Open command log menu | ||||
|   <kbd>}</kbd>: Increase the size of the context shown around changes in the diff view | ||||
|   <kbd>{</kbd>: Decrease the size of the context shown around changes in the diff view | ||||
|   <kbd>:</kbd>: Wykonaj własną komendę | ||||
|   <kbd><c-p></kbd>: View custom patch options | ||||
|   <kbd>m</kbd>: Widok scalenia/opcje zmiany bazy | ||||
|   <kbd>R</kbd>: Odśwież | ||||
|   <kbd>+</kbd>: Next screen mode (normal/half/fullscreen) | ||||
|   <kbd>_</kbd>: Prev screen mode | ||||
|   <kbd>?</kbd>: Open menu | ||||
|   <kbd><c-s></kbd>: View filter-by-path options | ||||
|   <kbd>W</kbd>: Open diff menu | ||||
|   <kbd><c-e></kbd>: Open diff menu | ||||
|   <kbd><c-w></kbd>: Toggle whether or not whitespace changes are shown in the diff view | ||||
|   <kbd>z</kbd>: Undo | ||||
|   <kbd><c-z></kbd>: Redo | ||||
|   <kbd>P</kbd>: Push | ||||
|   <kbd>p</kbd>: Pull | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-r> `` | Switch to a recent repo |  | | ||||
| | `` <pgup> (fn+up/shift+k) `` | Scroll up main panel |  | | ||||
| | `` <pgdown> (fn+down/shift+j) `` | Scroll down main panel |  | | ||||
| | `` @ `` | Open command log menu |  | | ||||
| | `` } `` | Increase the size of the context shown around changes in the diff view |  | | ||||
| | `` { `` | Decrease the size of the context shown around changes in the diff view |  | | ||||
| | `` : `` | Wykonaj własną komendę |  | | ||||
| | `` <c-p> `` | View custom patch options |  | | ||||
| | `` m `` | Widok scalenia/opcje zmiany bazy |  | | ||||
| | `` R `` | Odśwież |  | | ||||
| | `` + `` | Next screen mode (normal/half/fullscreen) |  | | ||||
| | `` _ `` | Prev screen mode |  | | ||||
| | `` ? `` | Open menu |  | | ||||
| | `` <c-s> `` | View filter-by-path options |  | | ||||
| | `` W `` | Open diff menu |  | | ||||
| | `` <c-e> `` | Open diff menu |  | | ||||
| | `` <c-w> `` | Toggle whether or not whitespace changes are shown in the diff view |  | | ||||
| | `` z `` | Undo | The reflog will be used to determine what git command to run to undo the last git command. This does not include changes to the working tree; only commits are taken into consideration. | | ||||
| | `` <c-z> `` | Redo | The reflog will be used to determine what git command to run to redo the last git command. This does not include changes to the working tree; only commits are taken into consideration. | | ||||
| | `` P `` | Push |  | | ||||
| | `` p `` | Pull |  | | ||||
|  | ||||
| ## List panel navigation | ||||
|  | ||||
| <pre> | ||||
|   <kbd>,</kbd>: Previous page | ||||
|   <kbd>.</kbd>: Next page | ||||
|   <kbd><</kbd>: Scroll to top | ||||
|   <kbd>></kbd>: Scroll to bottom | ||||
|   <kbd>v</kbd>: Toggle range select | ||||
|   <kbd><s-down></kbd>: Range select down | ||||
|   <kbd><s-up></kbd>: Range select up | ||||
|   <kbd>/</kbd>: Search the current view by text | ||||
|   <kbd>H</kbd>: Scroll left | ||||
|   <kbd>L</kbd>: Scroll right | ||||
|   <kbd>]</kbd>: Next tab | ||||
|   <kbd>[</kbd>: Previous tab | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` , `` | Previous page |  | | ||||
| | `` . `` | Next page |  | | ||||
| | `` < `` | Scroll to top |  | | ||||
| | `` > `` | Scroll to bottom |  | | ||||
| | `` v `` | Toggle range select |  | | ||||
| | `` <s-down> `` | Range select down |  | | ||||
| | `` <s-up> `` | Range select up |  | | ||||
| | `` / `` | Search the current view by text |  | | ||||
| | `` H `` | Scroll left |  | | ||||
| | `` L `` | Scroll right |  | | ||||
| | `` ] `` | Next tab |  | | ||||
| | `` [ `` | Previous tab |  | | ||||
|  | ||||
| ## Commit summary | ||||
|  | ||||
| <pre> | ||||
|   <kbd><enter></kbd>: Potwierdź | ||||
|   <kbd><esc></kbd>: Zamknij | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <enter> `` | Potwierdź |  | | ||||
| | `` <esc> `` | Zamknij |  | | ||||
|  | ||||
| ## Commity | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: Copy commit SHA to clipboard | ||||
|   <kbd><c-r></kbd>: Reset cherry-picked (copied) commits selection | ||||
|   <kbd>b</kbd>: View bisect options | ||||
|   <kbd>s</kbd>: Ściśnij | ||||
|   <kbd>f</kbd>: Napraw commit | ||||
|   <kbd>r</kbd>: Zmień nazwę commita | ||||
|   <kbd>R</kbd>: Zmień nazwę commita w edytorze | ||||
|   <kbd>d</kbd>: Usuń commit | ||||
|   <kbd>e</kbd>: Edytuj commit | ||||
|   <kbd>i</kbd>: Start interactive rebase | ||||
|   <kbd>p</kbd>: Wybierz commit (podczas zmiany bazy) | ||||
|   <kbd>F</kbd>: Utwórz commit naprawczy dla tego commita | ||||
|   <kbd>S</kbd>: Spłaszcz wszystkie commity naprawcze powyżej zaznaczonych commitów (autosquash) | ||||
|   <kbd><c-j></kbd>: Przenieś commit 1 w dół | ||||
|   <kbd><c-k></kbd>: Przenieś commit 1 w górę | ||||
|   <kbd>V</kbd>: Wklej commity (przebieranie) | ||||
|   <kbd>B</kbd>: Mark commit as base commit for rebase | ||||
|   <kbd>A</kbd>: Popraw commit zmianami z poczekalni | ||||
|   <kbd>a</kbd>: Set/Reset commit author | ||||
|   <kbd>t</kbd>: Odwróć commit | ||||
|   <kbd>T</kbd>: Tag commit | ||||
|   <kbd><c-l></kbd>: Open log menu | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><space></kbd>: Checkout commit | ||||
|   <kbd>y</kbd>: Copy commit attribute | ||||
|   <kbd>o</kbd>: Open commit in browser | ||||
|   <kbd>n</kbd>: Create new branch off of commit | ||||
|   <kbd>g</kbd>: Wyświetl opcje resetu | ||||
|   <kbd>C</kbd>: Kopiuj commit (przebieranie) | ||||
|   <kbd><c-t></kbd>: Open external diff tool (git difftool) | ||||
|   <kbd><enter></kbd>: Przeglądaj pliki commita | ||||
|   <kbd>/</kbd>: Search the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | Copy commit SHA to clipboard |  | | ||||
| | `` <c-r> `` | Reset cherry-picked (copied) commits selection |  | | ||||
| | `` b `` | View bisect options |  | | ||||
| | `` s `` | Ściśnij |  | | ||||
| | `` f `` | Napraw commit |  | | ||||
| | `` r `` | Zmień nazwę commita |  | | ||||
| | `` R `` | Zmień nazwę commita w edytorze |  | | ||||
| | `` d `` | Usuń commit |  | | ||||
| | `` e `` | Edytuj commit |  | | ||||
| | `` i `` | Start interactive rebase | Start an interactive rebase for the commits on your branch. This will include all commits from the HEAD commit down to the first merge commit or main branch commit. | ||||
| If you would instead like to start an interactive rebase from the selected commit, press `e`. | | ||||
| | `` p `` | Wybierz commit (podczas zmiany bazy) |  | | ||||
| | `` F `` | Utwórz commit naprawczy dla tego commita |  | | ||||
| | `` S `` | Spłaszcz wszystkie commity naprawcze powyżej zaznaczonych commitów (autosquash) |  | | ||||
| | `` <c-j> `` | Przenieś commit 1 w dół |  | | ||||
| | `` <c-k> `` | Przenieś commit 1 w górę |  | | ||||
| | `` V `` | Wklej commity (przebieranie) |  | | ||||
| | `` B `` | Mark commit as base commit for rebase | Select a base commit for the next rebase; this will effectively perform a 'git rebase --onto'. | | ||||
| | `` A `` | Popraw commit zmianami z poczekalni |  | | ||||
| | `` a `` | Set/Reset commit author |  | | ||||
| | `` t `` | Odwróć commit |  | | ||||
| | `` T `` | Tag commit |  | | ||||
| | `` <c-l> `` | Open log menu |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <space> `` | Checkout commit |  | | ||||
| | `` y `` | Copy commit attribute |  | | ||||
| | `` o `` | Open commit in browser |  | | ||||
| | `` n `` | Create new branch off of commit |  | | ||||
| | `` g `` | Wyświetl opcje resetu |  | | ||||
| | `` C `` | Kopiuj commit (przebieranie) |  | | ||||
| | `` <c-t> `` | Open external diff tool (git difftool) |  | | ||||
| | `` <enter> `` | Przeglądaj pliki commita |  | | ||||
| | `` / `` | Search the current view by text |  | | ||||
|  | ||||
| ## Confirmation panel | ||||
|  | ||||
| <pre> | ||||
|   <kbd><enter></kbd>: Potwierdź | ||||
|   <kbd><esc></kbd>: Zamknij | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <enter> `` | Potwierdź |  | | ||||
| | `` <esc> `` | Zamknij |  | | ||||
|  | ||||
| ## Local branches | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: Copy branch name to clipboard | ||||
|   <kbd>i</kbd>: Show git-flow options | ||||
|   <kbd><space></kbd>: Przełącz | ||||
|   <kbd>n</kbd>: Nowa gałąź | ||||
|   <kbd>o</kbd>: Utwórz żądanie pobrania | ||||
|   <kbd>O</kbd>: Utwórz opcje żądania ściągnięcia | ||||
|   <kbd><c-y></kbd>: Skopiuj adres URL żądania pobrania do schowka | ||||
|   <kbd>c</kbd>: Przełącz używając nazwy | ||||
|   <kbd>F</kbd>: Wymuś przełączenie | ||||
|   <kbd>d</kbd>: View delete options | ||||
|   <kbd>r</kbd>: Zmiana bazy gałęzi | ||||
|   <kbd>M</kbd>: Scal do obecnej gałęzi | ||||
|   <kbd>f</kbd>: Fast-forward this branch from its upstream | ||||
|   <kbd>T</kbd>: Create tag | ||||
|   <kbd>s</kbd>: Sort order | ||||
|   <kbd>g</kbd>: Wyświetl opcje resetu | ||||
|   <kbd>R</kbd>: Rename branch | ||||
|   <kbd>u</kbd>: View upstream options | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><enter></kbd>: View commits | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | Copy branch name to clipboard |  | | ||||
| | `` i `` | Show git-flow options |  | | ||||
| | `` <space> `` | Przełącz |  | | ||||
| | `` n `` | Nowa gałąź |  | | ||||
| | `` o `` | Utwórz żądanie pobrania |  | | ||||
| | `` O `` | Utwórz opcje żądania ściągnięcia |  | | ||||
| | `` <c-y> `` | Skopiuj adres URL żądania pobrania do schowka |  | | ||||
| | `` c `` | Przełącz używając nazwy |  | | ||||
| | `` F `` | Wymuś przełączenie |  | | ||||
| | `` d `` | View delete options |  | | ||||
| | `` r `` | Zmiana bazy gałęzi |  | | ||||
| | `` M `` | Scal do obecnej gałęzi |  | | ||||
| | `` f `` | Fast-forward this branch from its upstream |  | | ||||
| | `` T `` | Create tag |  | | ||||
| | `` s `` | Sort order |  | | ||||
| | `` g `` | Wyświetl opcje resetu |  | | ||||
| | `` R `` | Rename branch |  | | ||||
| | `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <enter> `` | View commits |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## Main panel (patch building) | ||||
|  | ||||
| <pre> | ||||
|   <kbd><left></kbd>: Poprzedni kawałek | ||||
|   <kbd><right></kbd>: Następny kawałek | ||||
|   <kbd>v</kbd>: Toggle range select | ||||
|   <kbd>a</kbd>: Toggle select hunk | ||||
|   <kbd><c-o></kbd>: Copy the selected text to the clipboard | ||||
|   <kbd>o</kbd>: Otwórz plik | ||||
|   <kbd>e</kbd>: Edytuj plik | ||||
|   <kbd><space></kbd>: Add/Remove line(s) to patch | ||||
|   <kbd><esc></kbd>: Wyście z trybu "linia po linii" | ||||
|   <kbd>/</kbd>: Search the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <left> `` | Poprzedni kawałek |  | | ||||
| | `` <right> `` | Następny kawałek |  | | ||||
| | `` v `` | Toggle range select |  | | ||||
| | `` a `` | Toggle select hunk |  | | ||||
| | `` <c-o> `` | Copy the selected text to the clipboard |  | | ||||
| | `` o `` | Otwórz plik |  | | ||||
| | `` e `` | Edytuj plik |  | | ||||
| | `` <space> `` | Add/Remove line(s) to patch |  | | ||||
| | `` <esc> `` | Wyście z trybu "linia po linii" |  | | ||||
| | `` / `` | Search the current view by text |  | | ||||
|  | ||||
| ## Menu | ||||
|  | ||||
| <pre> | ||||
|   <kbd><enter></kbd>: Wykonaj | ||||
|   <kbd><esc></kbd>: Zamknij | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <enter> `` | Wykonaj |  | | ||||
| | `` <esc> `` | Zamknij |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## Pliki | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: Copy the file name to the clipboard | ||||
|   <kbd><space></kbd>: Przełącz stan poczekalni | ||||
|   <kbd><c-b></kbd>: Filter files by status | ||||
|   <kbd>y</kbd>: Copy to clipboard | ||||
|   <kbd>c</kbd>: Zatwierdź zmiany | ||||
|   <kbd>w</kbd>: Zatwierdź zmiany bez skryptu pre-commit | ||||
|   <kbd>A</kbd>: Zmień ostatni commit | ||||
|   <kbd>C</kbd>: Zatwierdź zmiany używając edytora | ||||
|   <kbd><c-f></kbd>: Find base commit for fixup | ||||
|   <kbd>e</kbd>: Edytuj plik | ||||
|   <kbd>o</kbd>: Otwórz plik | ||||
|   <kbd>i</kbd>: Ignore or exclude file | ||||
|   <kbd>r</kbd>: Odśwież pliki | ||||
|   <kbd>s</kbd>: Przechowaj zmiany | ||||
|   <kbd>S</kbd>: Wyświetl opcje schowka | ||||
|   <kbd>a</kbd>: Przełącz stan poczekalni wszystkich | ||||
|   <kbd><enter></kbd>: Zatwierdź pojedyncze linie | ||||
|   <kbd>d</kbd>: Pokaż opcje porzucania zmian | ||||
|   <kbd>g</kbd>: View upstream reset options | ||||
|   <kbd>D</kbd>: Wyświetl opcje resetu | ||||
|   <kbd>`</kbd>: Toggle file tree view | ||||
|   <kbd><c-t></kbd>: Open external diff tool (git difftool) | ||||
|   <kbd>M</kbd>: Open external merge tool (git mergetool) | ||||
|   <kbd>f</kbd>: Pobierz | ||||
|   <kbd>/</kbd>: Search the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | Copy the file name to the clipboard |  | | ||||
| | `` <space> `` | Przełącz stan poczekalni |  | | ||||
| | `` <c-b> `` | Filter files by status |  | | ||||
| | `` y `` | Copy to clipboard |  | | ||||
| | `` c `` | Zatwierdź zmiany |  | | ||||
| | `` w `` | Zatwierdź zmiany bez skryptu pre-commit |  | | ||||
| | `` A `` | Zmień ostatni commit |  | | ||||
| | `` C `` | Zatwierdź zmiany używając edytora |  | | ||||
| | `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> | | ||||
| | `` e `` | Edytuj plik |  | | ||||
| | `` o `` | Otwórz plik |  | | ||||
| | `` i `` | Ignore or exclude file |  | | ||||
| | `` r `` | Odśwież pliki |  | | ||||
| | `` s `` | Przechowaj zmiany |  | | ||||
| | `` S `` | Wyświetl opcje schowka |  | | ||||
| | `` a `` | Przełącz stan poczekalni wszystkich |  | | ||||
| | `` <enter> `` | Zatwierdź pojedyncze linie |  | | ||||
| | `` d `` | Pokaż opcje porzucania zmian |  | | ||||
| | `` g `` | View upstream reset options |  | | ||||
| | `` D `` | Wyświetl opcje resetu |  | | ||||
| | `` ` `` | Toggle file tree view |  | | ||||
| | `` <c-t> `` | Open external diff tool (git difftool) |  | | ||||
| | `` M `` | Open external merge tool (git mergetool) |  | | ||||
| | `` f `` | Pobierz |  | | ||||
| | `` / `` | Search the current view by text |  | | ||||
|  | ||||
| ## Pliki commita | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: Copy the committed file name to the clipboard | ||||
|   <kbd>c</kbd>: Plik wybierania | ||||
|   <kbd>d</kbd>: Porzuć zmiany commita dla tego pliku | ||||
|   <kbd>o</kbd>: Otwórz plik | ||||
|   <kbd>e</kbd>: Edytuj plik | ||||
|   <kbd><c-t></kbd>: Open external diff tool (git difftool) | ||||
|   <kbd><space></kbd>: Toggle file included in patch | ||||
|   <kbd>a</kbd>: Toggle all files included in patch | ||||
|   <kbd><enter></kbd>: Enter file to add selected lines to the patch (or toggle directory collapsed) | ||||
|   <kbd>`</kbd>: Toggle file tree view | ||||
|   <kbd>/</kbd>: Search the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | Copy the committed file name to the clipboard |  | | ||||
| | `` c `` | Plik wybierania |  | | ||||
| | `` d `` | Porzuć zmiany commita dla tego pliku |  | | ||||
| | `` o `` | Otwórz plik |  | | ||||
| | `` e `` | Edytuj plik |  | | ||||
| | `` <c-t> `` | Open external diff tool (git difftool) |  | | ||||
| | `` <space> `` | Toggle file included in patch |  | | ||||
| | `` a `` | Toggle all files included in patch |  | | ||||
| | `` <enter> `` | Enter file to add selected lines to the patch (or toggle directory collapsed) |  | | ||||
| | `` ` `` | Toggle file tree view |  | | ||||
| | `` / `` | Search the current view by text |  | | ||||
|  | ||||
| ## Poczekalnia | ||||
|  | ||||
| <pre> | ||||
|   <kbd><left></kbd>: Poprzedni kawałek | ||||
|   <kbd><right></kbd>: Następny kawałek | ||||
|   <kbd>v</kbd>: Toggle range select | ||||
|   <kbd>a</kbd>: Toggle select hunk | ||||
|   <kbd><c-o></kbd>: Copy the selected text to the clipboard | ||||
|   <kbd>o</kbd>: Otwórz plik | ||||
|   <kbd>e</kbd>: Edytuj plik | ||||
|   <kbd><esc></kbd>: Wróć do panelu plików | ||||
|   <kbd><tab></kbd>: Switch to other panel (staged/unstaged changes) | ||||
|   <kbd><space></kbd>: Toggle line staged / unstaged | ||||
|   <kbd>d</kbd>: Discard change (git reset) | ||||
|   <kbd>E</kbd>: Edit hunk | ||||
|   <kbd>c</kbd>: Zatwierdź zmiany | ||||
|   <kbd>w</kbd>: Zatwierdź zmiany bez skryptu pre-commit | ||||
|   <kbd>C</kbd>: Zatwierdź zmiany używając edytora | ||||
|   <kbd>/</kbd>: Search the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <left> `` | Poprzedni kawałek |  | | ||||
| | `` <right> `` | Następny kawałek |  | | ||||
| | `` v `` | Toggle range select |  | | ||||
| | `` a `` | Toggle select hunk |  | | ||||
| | `` <c-o> `` | Copy the selected text to the clipboard |  | | ||||
| | `` o `` | Otwórz plik |  | | ||||
| | `` e `` | Edytuj plik |  | | ||||
| | `` <esc> `` | Wróć do panelu plików |  | | ||||
| | `` <tab> `` | Switch to other panel (staged/unstaged changes) |  | | ||||
| | `` <space> `` | Toggle line staged / unstaged |  | | ||||
| | `` d `` | Discard change (git reset) |  | | ||||
| | `` E `` | Edit hunk |  | | ||||
| | `` c `` | Zatwierdź zmiany |  | | ||||
| | `` w `` | Zatwierdź zmiany bez skryptu pre-commit |  | | ||||
| | `` C `` | Zatwierdź zmiany używając edytora |  | | ||||
| | `` / `` | Search the current view by text |  | | ||||
|  | ||||
| ## Reflog | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: Copy commit SHA to clipboard | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><space></kbd>: Checkout commit | ||||
|   <kbd>y</kbd>: Copy commit attribute | ||||
|   <kbd>o</kbd>: Open commit in browser | ||||
|   <kbd>n</kbd>: Create new branch off of commit | ||||
|   <kbd>g</kbd>: Wyświetl opcje resetu | ||||
|   <kbd>C</kbd>: Kopiuj commit (przebieranie) | ||||
|   <kbd><c-r></kbd>: Reset cherry-picked (copied) commits selection | ||||
|   <kbd><c-t></kbd>: Open external diff tool (git difftool) | ||||
|   <kbd><enter></kbd>: View commits | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | Copy commit SHA to clipboard |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <space> `` | Checkout commit |  | | ||||
| | `` y `` | Copy commit attribute |  | | ||||
| | `` o `` | Open commit in browser |  | | ||||
| | `` n `` | Create new branch off of commit |  | | ||||
| | `` g `` | Wyświetl opcje resetu |  | | ||||
| | `` C `` | Kopiuj commit (przebieranie) |  | | ||||
| | `` <c-r> `` | Reset cherry-picked (copied) commits selection |  | | ||||
| | `` <c-t> `` | Open external diff tool (git difftool) |  | | ||||
| | `` <enter> `` | View commits |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## Remote branches | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: Copy branch name to clipboard | ||||
|   <kbd><space></kbd>: Przełącz | ||||
|   <kbd>n</kbd>: Nowa gałąź | ||||
|   <kbd>M</kbd>: Scal do obecnej gałęzi | ||||
|   <kbd>r</kbd>: Zmiana bazy gałęzi | ||||
|   <kbd>d</kbd>: Delete remote tag | ||||
|   <kbd>u</kbd>: Set as upstream of checked-out branch | ||||
|   <kbd>s</kbd>: Sort order | ||||
|   <kbd>g</kbd>: Wyświetl opcje resetu | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><enter></kbd>: View commits | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | Copy branch name to clipboard |  | | ||||
| | `` <space> `` | Przełącz |  | | ||||
| | `` n `` | Nowa gałąź |  | | ||||
| | `` M `` | Scal do obecnej gałęzi |  | | ||||
| | `` r `` | Zmiana bazy gałęzi |  | | ||||
| | `` d `` | Delete remote tag |  | | ||||
| | `` u `` | Set as upstream of checked-out branch |  | | ||||
| | `` s `` | Sort order |  | | ||||
| | `` g `` | Wyświetl opcje resetu |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <enter> `` | View commits |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## Remotes | ||||
|  | ||||
| <pre> | ||||
|   <kbd>f</kbd>: Fetch remote | ||||
|   <kbd>n</kbd>: Add new remote | ||||
|   <kbd>d</kbd>: Remove remote | ||||
|   <kbd>e</kbd>: Edit remote | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` f `` | Fetch remote |  | | ||||
| | `` n `` | Add new remote |  | | ||||
| | `` d `` | Remove remote |  | | ||||
| | `` e `` | Edit remote |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## Scalanie | ||||
|  | ||||
| <pre> | ||||
|   <kbd>e</kbd>: Edytuj plik | ||||
|   <kbd>o</kbd>: Otwórz plik | ||||
|   <kbd><left></kbd>: Poprzedni konflikt | ||||
|   <kbd><right></kbd>: Następny konflikt | ||||
|   <kbd><up></kbd>: Wybierz poprzedni kawałek | ||||
|   <kbd><down></kbd>: Wybierz następny kawałek | ||||
|   <kbd>z</kbd>: Cofnij | ||||
|   <kbd>M</kbd>: Open external merge tool (git mergetool) | ||||
|   <kbd><space></kbd>: Wybierz kawałek | ||||
|   <kbd>b</kbd>: Wybierz oba kawałki | ||||
|   <kbd><esc></kbd>: Wróć do panelu plików | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` e `` | Edytuj plik |  | | ||||
| | `` o `` | Otwórz plik |  | | ||||
| | `` <left> `` | Poprzedni konflikt |  | | ||||
| | `` <right> `` | Następny konflikt |  | | ||||
| | `` <up> `` | Wybierz poprzedni kawałek |  | | ||||
| | `` <down> `` | Wybierz następny kawałek |  | | ||||
| | `` z `` | Cofnij |  | | ||||
| | `` M `` | Open external merge tool (git mergetool) |  | | ||||
| | `` <space> `` | Wybierz kawałek |  | | ||||
| | `` b `` | Wybierz oba kawałki |  | | ||||
| | `` <esc> `` | Wróć do panelu plików |  | | ||||
|  | ||||
| ## Schowek | ||||
|  | ||||
| <pre> | ||||
|   <kbd><space></kbd>: Zastosuj | ||||
|   <kbd>g</kbd>: Wyciągnij | ||||
|   <kbd>d</kbd>: Porzuć | ||||
|   <kbd>n</kbd>: Nowa gałąź | ||||
|   <kbd>r</kbd>: Rename stash | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><enter></kbd>: Przeglądaj pliki commita | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <space> `` | Zastosuj |  | | ||||
| | `` g `` | Wyciągnij |  | | ||||
| | `` d `` | Porzuć |  | | ||||
| | `` n `` | Nowa gałąź |  | | ||||
| | `` r `` | Rename stash |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <enter> `` | Przeglądaj pliki commita |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## Status | ||||
|  | ||||
| <pre> | ||||
|   <kbd>o</kbd>: Otwórz konfigurację | ||||
|   <kbd>e</kbd>: Edytuj konfigurację | ||||
|   <kbd>u</kbd>: Sprawdź aktualizacje | ||||
|   <kbd><enter></kbd>: Switch to a recent repo | ||||
|   <kbd>a</kbd>: Pokaż wszystkie logi gałęzi | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` o `` | Otwórz konfigurację |  | | ||||
| | `` e `` | Edytuj konfigurację |  | | ||||
| | `` u `` | Sprawdź aktualizacje |  | | ||||
| | `` <enter> `` | Switch to a recent repo |  | | ||||
| | `` a `` | Pokaż wszystkie logi gałęzi |  | | ||||
|  | ||||
| ## Sub-commits | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: Copy commit SHA to clipboard | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><space></kbd>: Checkout commit | ||||
|   <kbd>y</kbd>: Copy commit attribute | ||||
|   <kbd>o</kbd>: Open commit in browser | ||||
|   <kbd>n</kbd>: Create new branch off of commit | ||||
|   <kbd>g</kbd>: Wyświetl opcje resetu | ||||
|   <kbd>C</kbd>: Kopiuj commit (przebieranie) | ||||
|   <kbd><c-r></kbd>: Reset cherry-picked (copied) commits selection | ||||
|   <kbd><c-t></kbd>: Open external diff tool (git difftool) | ||||
|   <kbd><enter></kbd>: Przeglądaj pliki commita | ||||
|   <kbd>/</kbd>: Search the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | Copy commit SHA to clipboard |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <space> `` | Checkout commit |  | | ||||
| | `` y `` | Copy commit attribute |  | | ||||
| | `` o `` | Open commit in browser |  | | ||||
| | `` n `` | Create new branch off of commit |  | | ||||
| | `` g `` | Wyświetl opcje resetu |  | | ||||
| | `` C `` | Kopiuj commit (przebieranie) |  | | ||||
| | `` <c-r> `` | Reset cherry-picked (copied) commits selection |  | | ||||
| | `` <c-t> `` | Open external diff tool (git difftool) |  | | ||||
| | `` <enter> `` | Przeglądaj pliki commita |  | | ||||
| | `` / `` | Search the current view by text |  | | ||||
|  | ||||
| ## Submodules | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: Copy submodule name to clipboard | ||||
|   <kbd><enter></kbd>: Enter submodule | ||||
|   <kbd><space></kbd>: Enter submodule | ||||
|   <kbd>d</kbd>: Remove submodule | ||||
|   <kbd>u</kbd>: Update submodule | ||||
|   <kbd>n</kbd>: Add new submodule | ||||
|   <kbd>e</kbd>: Update submodule URL | ||||
|   <kbd>i</kbd>: Initialize submodule | ||||
|   <kbd>b</kbd>: View bulk submodule options | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | Copy submodule name to clipboard |  | | ||||
| | `` <enter> `` | Enter submodule |  | | ||||
| | `` <space> `` | Enter submodule |  | | ||||
| | `` d `` | Remove submodule |  | | ||||
| | `` u `` | Update submodule |  | | ||||
| | `` n `` | Add new submodule |  | | ||||
| | `` e `` | Update submodule URL |  | | ||||
| | `` i `` | Initialize submodule |  | | ||||
| | `` b `` | View bulk submodule options |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## Tags | ||||
|  | ||||
| <pre> | ||||
|   <kbd><space></kbd>: Przełącz | ||||
|   <kbd>d</kbd>: View delete options | ||||
|   <kbd>P</kbd>: Push tag | ||||
|   <kbd>n</kbd>: Create tag | ||||
|   <kbd>g</kbd>: Wyświetl opcje resetu | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><enter></kbd>: View commits | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <space> `` | Przełącz |  | | ||||
| | `` d `` | View delete options |  | | ||||
| | `` P `` | Push tag |  | | ||||
| | `` n `` | Create tag |  | | ||||
| | `` g `` | Wyświetl opcje resetu |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <enter> `` | View commits |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## Worktrees | ||||
|  | ||||
| <pre> | ||||
|   <kbd>n</kbd>: Create worktree | ||||
|   <kbd><space></kbd>: Switch to worktree | ||||
|   <kbd><enter></kbd>: Switch to worktree | ||||
|   <kbd>o</kbd>: Open in editor | ||||
|   <kbd>d</kbd>: Remove worktree | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` n `` | Create worktree |  | | ||||
| | `` <space> `` | Switch to worktree |  | | ||||
| | `` <enter> `` | Switch to worktree |  | | ||||
| | `` o `` | Open in editor |  | | ||||
| | `` d `` | Remove worktree |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## Zwykłe | ||||
|  | ||||
| <pre> | ||||
|   <kbd>mouse wheel down</kbd>: Przewiń w dół (fn+up) | ||||
|   <kbd>mouse wheel up</kbd>: Przewiń w górę (fn+down) | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` mouse wheel down (fn+up) `` | Przewiń w dół |  | | ||||
| | `` mouse wheel up (fn+down) `` | Przewiń w górę |  | | ||||
|   | ||||
| @@ -6,356 +6,357 @@ _Связки клавиш_ | ||||
|  | ||||
| ## Глобальные сочетания клавиш | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-r></kbd>: Переключиться на последний репозиторий | ||||
|   <kbd><pgup></kbd>: Прокрутить вверх главную панель (fn+up/shift+k) | ||||
|   <kbd><pgdown></kbd>: Прокрутить вниз главную панель (fn+down/shift+j) | ||||
|   <kbd>@</kbd>: Открыть меню журнала команд | ||||
|   <kbd>}</kbd>: Увеличить размер контекста, отображаемого вокруг изменений в просмотрщике сравнении | ||||
|   <kbd>{</kbd>: Уменьшите размер контекста, отображаемого вокруг изменений в просмотрщике сравнении | ||||
|   <kbd>:</kbd>: Выполнить пользовательскую команду | ||||
|   <kbd><c-p></kbd>: Просмотреть пользовательские параметры патча | ||||
|   <kbd>m</kbd>: Просмотреть параметры слияния/перебазирования | ||||
|   <kbd>R</kbd>: Обновить | ||||
|   <kbd>+</kbd>: Следующий режим экрана (нормальный/полуэкранный/полноэкранный) | ||||
|   <kbd>_</kbd>: Предыдущий режим экрана | ||||
|   <kbd>?</kbd>: Открыть меню | ||||
|   <kbd><c-s></kbd>: Просмотреть параметры фильтрации по пути | ||||
|   <kbd>W</kbd>: Открыть меню сравнении | ||||
|   <kbd><c-e></kbd>: Открыть меню сравнении | ||||
|   <kbd><c-w></kbd>: Переключить отображение изменении пробелов в просмотрщике сравнении | ||||
|   <kbd>z</kbd>: Отменить (через reflog) (экспериментальный) | ||||
|   <kbd><c-z></kbd>: Повторить (через reflog) (экспериментальный) | ||||
|   <kbd>P</kbd>: Отправить изменения | ||||
|   <kbd>p</kbd>: Получить и слить изменения | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-r> `` | Переключиться на последний репозиторий |  | | ||||
| | `` <pgup> (fn+up/shift+k) `` | Прокрутить вверх главную панель |  | | ||||
| | `` <pgdown> (fn+down/shift+j) `` | Прокрутить вниз главную панель |  | | ||||
| | `` @ `` | Открыть меню журнала команд |  | | ||||
| | `` } `` | Увеличить размер контекста, отображаемого вокруг изменений в просмотрщике сравнении |  | | ||||
| | `` { `` | Уменьшите размер контекста, отображаемого вокруг изменений в просмотрщике сравнении |  | | ||||
| | `` : `` | Выполнить пользовательскую команду |  | | ||||
| | `` <c-p> `` | Просмотреть пользовательские параметры патча |  | | ||||
| | `` m `` | Просмотреть параметры слияния/перебазирования |  | | ||||
| | `` R `` | Обновить |  | | ||||
| | `` + `` | Следующий режим экрана (нормальный/полуэкранный/полноэкранный) |  | | ||||
| | `` _ `` | Предыдущий режим экрана |  | | ||||
| | `` ? `` | Открыть меню |  | | ||||
| | `` <c-s> `` | Просмотреть параметры фильтрации по пути |  | | ||||
| | `` W `` | Открыть меню сравнении |  | | ||||
| | `` <c-e> `` | Открыть меню сравнении |  | | ||||
| | `` <c-w> `` | Переключить отображение изменении пробелов в просмотрщике сравнении |  | | ||||
| | `` z `` | Отменить (через reflog) (экспериментальный) | Журнал ссылок (reflog) будет использоваться для определения того, какую команду git запустить, чтобы отменить последнюю команду git. Сюда не входят изменения в рабочем дереве; учитываются только коммиты. | | ||||
| | `` <c-z> `` | Повторить (через reflog) (экспериментальный) | Журнал ссылок (reflog) будет использоваться для определения того, какую команду git нужно запустить, чтобы повторить последнюю команду git. Сюда не входят изменения в рабочем дереве; учитываются только коммиты. | | ||||
| | `` P `` | Отправить изменения |  | | ||||
| | `` p `` | Получить и слить изменения |  | | ||||
|  | ||||
| ## Навигация по панели списка | ||||
|  | ||||
| <pre> | ||||
|   <kbd>,</kbd>: Предыдущая страница | ||||
|   <kbd>.</kbd>: Следующая страница | ||||
|   <kbd><</kbd>: Пролистать наверх | ||||
|   <kbd>></kbd>: Прокрутить вниз | ||||
|   <kbd>v</kbd>: Переключить выборку перетаскивания | ||||
|   <kbd><s-down></kbd>: Range select down | ||||
|   <kbd><s-up></kbd>: Range select up | ||||
|   <kbd>/</kbd>: Найти | ||||
|   <kbd>H</kbd>: Прокрутить влево | ||||
|   <kbd>L</kbd>: Прокрутить вправо | ||||
|   <kbd>]</kbd>: Следующая вкладка | ||||
|   <kbd>[</kbd>: Предыдущая вкладка | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` , `` | Предыдущая страница |  | | ||||
| | `` . `` | Следующая страница |  | | ||||
| | `` < `` | Пролистать наверх |  | | ||||
| | `` > `` | Прокрутить вниз |  | | ||||
| | `` v `` | Переключить выборку перетаскивания |  | | ||||
| | `` <s-down> `` | Range select down |  | | ||||
| | `` <s-up> `` | Range select up |  | | ||||
| | `` / `` | Найти |  | | ||||
| | `` H `` | Прокрутить влево |  | | ||||
| | `` L `` | Прокрутить вправо |  | | ||||
| | `` ] `` | Следующая вкладка |  | | ||||
| | `` [ `` | Предыдущая вкладка |  | | ||||
|  | ||||
| ## Worktrees | ||||
|  | ||||
| <pre> | ||||
|   <kbd>n</kbd>: Create worktree | ||||
|   <kbd><space></kbd>: Switch to worktree | ||||
|   <kbd><enter></kbd>: Switch to worktree | ||||
|   <kbd>o</kbd>: Open in editor | ||||
|   <kbd>d</kbd>: Remove worktree | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` n `` | Create worktree |  | | ||||
| | `` <space> `` | Switch to worktree |  | | ||||
| | `` <enter> `` | Switch to worktree |  | | ||||
| | `` o `` | Open in editor |  | | ||||
| | `` d `` | Remove worktree |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## Главная панель (Индексирование) | ||||
|  | ||||
| <pre> | ||||
|   <kbd><left></kbd>: Выбрать предыдущую часть | ||||
|   <kbd><right></kbd>: Выбрать следующую часть | ||||
|   <kbd>v</kbd>: Переключить выборку перетаскивания | ||||
|   <kbd>a</kbd>: Переключить выборку частей | ||||
|   <kbd><c-o></kbd>: Скопировать выделенный текст в буфер обмена | ||||
|   <kbd>o</kbd>: Открыть файл | ||||
|   <kbd>e</kbd>: Редактировать файл | ||||
|   <kbd><esc></kbd>: Вернуться к панели файлов | ||||
|   <kbd><tab></kbd>: Переключиться на другую панель (проиндексированные/непроиндексированные изменения) | ||||
|   <kbd><space></kbd>: Переключить строку в проиндексированные / непроиндексированные | ||||
|   <kbd>d</kbd>: Отменить изменение (git reset) | ||||
|   <kbd>E</kbd>: Изменить эту часть | ||||
|   <kbd>c</kbd>: Сохранить изменения | ||||
|   <kbd>w</kbd>: Закоммитить изменения без предварительного хука коммита | ||||
|   <kbd>C</kbd>: Сохранить изменения с помощью редактора git | ||||
|   <kbd>/</kbd>: Найти | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <left> `` | Выбрать предыдущую часть |  | | ||||
| | `` <right> `` | Выбрать следующую часть |  | | ||||
| | `` v `` | Переключить выборку перетаскивания |  | | ||||
| | `` a `` | Переключить выборку частей |  | | ||||
| | `` <c-o> `` | Скопировать выделенный текст в буфер обмена |  | | ||||
| | `` o `` | Открыть файл |  | | ||||
| | `` e `` | Редактировать файл |  | | ||||
| | `` <esc> `` | Вернуться к панели файлов |  | | ||||
| | `` <tab> `` | Переключиться на другую панель (проиндексированные/непроиндексированные изменения) |  | | ||||
| | `` <space> `` | Переключить строку в проиндексированные / непроиндексированные |  | | ||||
| | `` d `` | Отменить изменение (git reset) |  | | ||||
| | `` E `` | Изменить эту часть |  | | ||||
| | `` c `` | Сохранить изменения |  | | ||||
| | `` w `` | Закоммитить изменения без предварительного хука коммита |  | | ||||
| | `` C `` | Сохранить изменения с помощью редактора git |  | | ||||
| | `` / `` | Найти |  | | ||||
|  | ||||
| ## Главная панель (Обычный) | ||||
|  | ||||
| <pre> | ||||
|   <kbd>mouse wheel down</kbd>: Прокрутить вниз (fn+up) | ||||
|   <kbd>mouse wheel up</kbd>: Прокрутить вверх (fn+down) | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` mouse wheel down (fn+up) `` | Прокрутить вниз |  | | ||||
| | `` mouse wheel up (fn+down) `` | Прокрутить вверх |  | | ||||
|  | ||||
| ## Главная панель (Слияние) | ||||
|  | ||||
| <pre> | ||||
|   <kbd>e</kbd>: Редактировать файл | ||||
|   <kbd>o</kbd>: Открыть файл | ||||
|   <kbd><left></kbd>: Выбрать предыдущий конфликт | ||||
|   <kbd><right></kbd>: Выбрать следующий конфликт | ||||
|   <kbd><up></kbd>: Выбрать предыдущую часть | ||||
|   <kbd><down></kbd>: Выбрать следующую часть | ||||
|   <kbd>z</kbd>: Отменить | ||||
|   <kbd>M</kbd>: Открыть внешний инструмент слияния (git mergetool) | ||||
|   <kbd><space></kbd>: Выбрать эту часть | ||||
|   <kbd>b</kbd>: Выбрать все части | ||||
|   <kbd><esc></kbd>: Вернуться к панели файлов | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` e `` | Редактировать файл |  | | ||||
| | `` o `` | Открыть файл |  | | ||||
| | `` <left> `` | Выбрать предыдущий конфликт |  | | ||||
| | `` <right> `` | Выбрать следующий конфликт |  | | ||||
| | `` <up> `` | Выбрать предыдущую часть |  | | ||||
| | `` <down> `` | Выбрать следующую часть |  | | ||||
| | `` z `` | Отменить |  | | ||||
| | `` M `` | Открыть внешний инструмент слияния (git mergetool) |  | | ||||
| | `` <space> `` | Выбрать эту часть |  | | ||||
| | `` b `` | Выбрать все части |  | | ||||
| | `` <esc> `` | Вернуться к панели файлов |  | | ||||
|  | ||||
| ## Главная панель (сборка патчей) | ||||
|  | ||||
| <pre> | ||||
|   <kbd><left></kbd>: Выбрать предыдущую часть | ||||
|   <kbd><right></kbd>: Выбрать следующую часть | ||||
|   <kbd>v</kbd>: Переключить выборку перетаскивания | ||||
|   <kbd>a</kbd>: Переключить выборку частей | ||||
|   <kbd><c-o></kbd>: Скопировать выделенный текст в буфер обмена | ||||
|   <kbd>o</kbd>: Открыть файл | ||||
|   <kbd>e</kbd>: Редактировать файл | ||||
|   <kbd><space></kbd>: Добавить/удалить строку(и) для патча | ||||
|   <kbd><esc></kbd>: Выйти из сборщика пользовательских патчей | ||||
|   <kbd>/</kbd>: Найти | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <left> `` | Выбрать предыдущую часть |  | | ||||
| | `` <right> `` | Выбрать следующую часть |  | | ||||
| | `` v `` | Переключить выборку перетаскивания |  | | ||||
| | `` a `` | Переключить выборку частей |  | | ||||
| | `` <c-o> `` | Скопировать выделенный текст в буфер обмена |  | | ||||
| | `` o `` | Открыть файл |  | | ||||
| | `` e `` | Редактировать файл |  | | ||||
| | `` <space> `` | Добавить/удалить строку(и) для патча |  | | ||||
| | `` <esc> `` | Выйти из сборщика пользовательских патчей |  | | ||||
| | `` / `` | Найти |  | | ||||
|  | ||||
| ## Журнал ссылок (Reflog) | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: Скопировать SHA коммита в буфер обмена | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><space></kbd>: Переключить коммит | ||||
|   <kbd>y</kbd>: Скопировать атрибут коммита | ||||
|   <kbd>o</kbd>: Открыть коммит в браузере | ||||
|   <kbd>n</kbd>: Создать новую ветку с этого коммита | ||||
|   <kbd>g</kbd>: Просмотреть параметры сброса | ||||
|   <kbd>C</kbd>: Скопировать отобранные коммит (cherry-pick) | ||||
|   <kbd><c-r></kbd>: Сбросить отобранную (скопированную | cherry-picked) выборку коммитов | ||||
|   <kbd><c-t></kbd>: Open external diff tool (git difftool) | ||||
|   <kbd><enter></kbd>: Просмотреть коммиты | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | Скопировать SHA коммита в буфер обмена |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <space> `` | Переключить коммит |  | | ||||
| | `` y `` | Скопировать атрибут коммита |  | | ||||
| | `` o `` | Открыть коммит в браузере |  | | ||||
| | `` n `` | Создать новую ветку с этого коммита |  | | ||||
| | `` g `` | Просмотреть параметры сброса |  | | ||||
| | `` C `` | Скопировать отобранные коммит (cherry-pick) |  | | ||||
| | `` <c-r> `` | Сбросить отобранную (скопированную | cherry-picked) выборку коммитов |  | | ||||
| | `` <c-t> `` | Open external diff tool (git difftool) |  | | ||||
| | `` <enter> `` | Просмотреть коммиты |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## Коммиты | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: Скопировать SHA коммита в буфер обмена | ||||
|   <kbd><c-r></kbd>: Сбросить отобранную (скопированную | cherry-picked) выборку коммитов | ||||
|   <kbd>b</kbd>: Просмотреть параметры бинарного поиска | ||||
|   <kbd>s</kbd>: Объединить несколько коммитов в один нижний | ||||
|   <kbd>f</kbd>: Объединить несколько коммитов в один отбросив сообщение коммита | ||||
|   <kbd>r</kbd>: Перефразировать коммит | ||||
|   <kbd>R</kbd>: Переписать коммит с помощью редактора | ||||
|   <kbd>d</kbd>: Удалить коммит | ||||
|   <kbd>e</kbd>: Изменить коммит | ||||
|   <kbd>i</kbd>: Start interactive rebase | ||||
|   <kbd>p</kbd>: Выбрать коммит (в середине перебазирования) | ||||
|   <kbd>F</kbd>: Создать fixup коммит для этого коммита | ||||
|   <kbd>S</kbd>: Объединить все 'fixup!' коммиты выше в выбранный коммит (автосохранение) | ||||
|   <kbd><c-j></kbd>: Переместить коммит вниз на один | ||||
|   <kbd><c-k></kbd>: Переместить коммит вверх на один | ||||
|   <kbd>V</kbd>: Вставить отобранные коммиты (cherry-pick) | ||||
|   <kbd>B</kbd>: Mark commit as base commit for rebase | ||||
|   <kbd>A</kbd>: Править последний коммит с проиндексированными изменениями | ||||
|   <kbd>a</kbd>: Установить/убрать автора коммита | ||||
|   <kbd>t</kbd>: Отменить коммит | ||||
|   <kbd>T</kbd>: Пометить коммит тегом | ||||
|   <kbd><c-l></kbd>: Открыть меню журнала | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><space></kbd>: Переключить коммит | ||||
|   <kbd>y</kbd>: Скопировать атрибут коммита | ||||
|   <kbd>o</kbd>: Открыть коммит в браузере | ||||
|   <kbd>n</kbd>: Создать новую ветку с этого коммита | ||||
|   <kbd>g</kbd>: Просмотреть параметры сброса | ||||
|   <kbd>C</kbd>: Скопировать отобранные коммит (cherry-pick) | ||||
|   <kbd><c-t></kbd>: Open external diff tool (git difftool) | ||||
|   <kbd><enter></kbd>: Просмотреть файлы выбранного элемента | ||||
|   <kbd>/</kbd>: Найти | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | Скопировать SHA коммита в буфер обмена |  | | ||||
| | `` <c-r> `` | Сбросить отобранную (скопированную | cherry-picked) выборку коммитов |  | | ||||
| | `` b `` | Просмотреть параметры бинарного поиска |  | | ||||
| | `` s `` | Объединить несколько коммитов в один нижний |  | | ||||
| | `` f `` | Объединить несколько коммитов в один отбросив сообщение коммита |  | | ||||
| | `` r `` | Перефразировать коммит |  | | ||||
| | `` R `` | Переписать коммит с помощью редактора |  | | ||||
| | `` d `` | Удалить коммит |  | | ||||
| | `` e `` | Изменить коммит |  | | ||||
| | `` i `` | Start interactive rebase | Start an interactive rebase for the commits on your branch. This will include all commits from the HEAD commit down to the first merge commit or main branch commit. | ||||
| If you would instead like to start an interactive rebase from the selected commit, press `e`. | | ||||
| | `` p `` | Выбрать коммит (в середине перебазирования) |  | | ||||
| | `` F `` | Создать fixup коммит для этого коммита |  | | ||||
| | `` S `` | Объединить все 'fixup!' коммиты выше в выбранный коммит (автосохранение) |  | | ||||
| | `` <c-j> `` | Переместить коммит вниз на один |  | | ||||
| | `` <c-k> `` | Переместить коммит вверх на один |  | | ||||
| | `` V `` | Вставить отобранные коммиты (cherry-pick) |  | | ||||
| | `` B `` | Mark commit as base commit for rebase | Select a base commit for the next rebase; this will effectively perform a 'git rebase --onto'. | | ||||
| | `` A `` | Править последний коммит с проиндексированными изменениями |  | | ||||
| | `` a `` | Установить/убрать автора коммита |  | | ||||
| | `` t `` | Отменить коммит |  | | ||||
| | `` T `` | Пометить коммит тегом |  | | ||||
| | `` <c-l> `` | Открыть меню журнала |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <space> `` | Переключить коммит |  | | ||||
| | `` y `` | Скопировать атрибут коммита |  | | ||||
| | `` o `` | Открыть коммит в браузере |  | | ||||
| | `` n `` | Создать новую ветку с этого коммита |  | | ||||
| | `` g `` | Просмотреть параметры сброса |  | | ||||
| | `` C `` | Скопировать отобранные коммит (cherry-pick) |  | | ||||
| | `` <c-t> `` | Open external diff tool (git difftool) |  | | ||||
| | `` <enter> `` | Просмотреть файлы выбранного элемента |  | | ||||
| | `` / `` | Найти |  | | ||||
|  | ||||
| ## Локальные Ветки | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: Скопировать название ветки в буфер обмена | ||||
|   <kbd>i</kbd>: Показать параметры git-flow | ||||
|   <kbd><space></kbd>: Переключить | ||||
|   <kbd>n</kbd>: Новая ветка | ||||
|   <kbd>o</kbd>: Создать запрос на принятие изменений | ||||
|   <kbd>O</kbd>: Создать параметры запроса принятие изменений | ||||
|   <kbd><c-y></kbd>: Скопировать URL запроса на принятие изменений в буфер обмена | ||||
|   <kbd>c</kbd>: Переключить по названию | ||||
|   <kbd>F</kbd>: Принудительное переключение | ||||
|   <kbd>d</kbd>: View delete options | ||||
|   <kbd>r</kbd>: Перебазировать переключённую ветку на эту ветку | ||||
|   <kbd>M</kbd>: Слияние с текущей переключённой веткой | ||||
|   <kbd>f</kbd>: Перемотать эту ветку вперёд из её upstream-ветки | ||||
|   <kbd>T</kbd>: Создать тег | ||||
|   <kbd>s</kbd>: Порядок сортировки | ||||
|   <kbd>g</kbd>: Просмотреть параметры сброса | ||||
|   <kbd>R</kbd>: Переименовать ветку | ||||
|   <kbd>u</kbd>: View upstream options | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><enter></kbd>: Просмотреть коммиты | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | Скопировать название ветки в буфер обмена |  | | ||||
| | `` i `` | Показать параметры git-flow |  | | ||||
| | `` <space> `` | Переключить |  | | ||||
| | `` n `` | Новая ветка |  | | ||||
| | `` o `` | Создать запрос на принятие изменений |  | | ||||
| | `` O `` | Создать параметры запроса принятие изменений |  | | ||||
| | `` <c-y> `` | Скопировать URL запроса на принятие изменений в буфер обмена |  | | ||||
| | `` c `` | Переключить по названию |  | | ||||
| | `` F `` | Принудительное переключение |  | | ||||
| | `` d `` | View delete options |  | | ||||
| | `` r `` | Перебазировать переключённую ветку на эту ветку |  | | ||||
| | `` M `` | Слияние с текущей переключённой веткой |  | | ||||
| | `` f `` | Перемотать эту ветку вперёд из её upstream-ветки |  | | ||||
| | `` T `` | Создать тег |  | | ||||
| | `` s `` | Порядок сортировки |  | | ||||
| | `` g `` | Просмотреть параметры сброса |  | | ||||
| | `` R `` | Переименовать ветку |  | | ||||
| | `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <enter> `` | Просмотреть коммиты |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## Меню | ||||
|  | ||||
| <pre> | ||||
|   <kbd><enter></kbd>: Выполнить | ||||
|   <kbd><esc></kbd>: Закрыть | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <enter> `` | Выполнить |  | | ||||
| | `` <esc> `` | Закрыть |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## Панель Подтверждения | ||||
|  | ||||
| <pre> | ||||
|   <kbd><enter></kbd>: Подтвердить | ||||
|   <kbd><esc></kbd>: Закрыть/отменить | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <enter> `` | Подтвердить |  | | ||||
| | `` <esc> `` | Закрыть/отменить |  | | ||||
|  | ||||
| ## Подкоммиты | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: Скопировать SHA коммита в буфер обмена | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><space></kbd>: Переключить коммит | ||||
|   <kbd>y</kbd>: Скопировать атрибут коммита | ||||
|   <kbd>o</kbd>: Открыть коммит в браузере | ||||
|   <kbd>n</kbd>: Создать новую ветку с этого коммита | ||||
|   <kbd>g</kbd>: Просмотреть параметры сброса | ||||
|   <kbd>C</kbd>: Скопировать отобранные коммит (cherry-pick) | ||||
|   <kbd><c-r></kbd>: Сбросить отобранную (скопированную | cherry-picked) выборку коммитов | ||||
|   <kbd><c-t></kbd>: Open external diff tool (git difftool) | ||||
|   <kbd><enter></kbd>: Просмотреть файлы выбранного элемента | ||||
|   <kbd>/</kbd>: Найти | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | Скопировать SHA коммита в буфер обмена |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <space> `` | Переключить коммит |  | | ||||
| | `` y `` | Скопировать атрибут коммита |  | | ||||
| | `` o `` | Открыть коммит в браузере |  | | ||||
| | `` n `` | Создать новую ветку с этого коммита |  | | ||||
| | `` g `` | Просмотреть параметры сброса |  | | ||||
| | `` C `` | Скопировать отобранные коммит (cherry-pick) |  | | ||||
| | `` <c-r> `` | Сбросить отобранную (скопированную | cherry-picked) выборку коммитов |  | | ||||
| | `` <c-t> `` | Open external diff tool (git difftool) |  | | ||||
| | `` <enter> `` | Просмотреть файлы выбранного элемента |  | | ||||
| | `` / `` | Найти |  | | ||||
|  | ||||
| ## Подмодули | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: Скопировать название подмодуля в буфер обмена | ||||
|   <kbd><enter></kbd>: Ввести подмодуль | ||||
|   <kbd><space></kbd>: Ввести подмодуль | ||||
|   <kbd>d</kbd>: Удалить подмодуль | ||||
|   <kbd>u</kbd>: Обновить подмодуль | ||||
|   <kbd>n</kbd>: Добавить новый подмодуль | ||||
|   <kbd>e</kbd>: Обновить URL подмодуля | ||||
|   <kbd>i</kbd>: Инициализировать подмодуль | ||||
|   <kbd>b</kbd>: Просмотреть параметры массового подмодуля | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | Скопировать название подмодуля в буфер обмена |  | | ||||
| | `` <enter> `` | Ввести подмодуль |  | | ||||
| | `` <space> `` | Ввести подмодуль |  | | ||||
| | `` d `` | Удалить подмодуль |  | | ||||
| | `` u `` | Обновить подмодуль |  | | ||||
| | `` n `` | Добавить новый подмодуль |  | | ||||
| | `` e `` | Обновить URL подмодуля |  | | ||||
| | `` i `` | Инициализировать подмодуль |  | | ||||
| | `` b `` | Просмотреть параметры массового подмодуля |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## Сводка коммита | ||||
|  | ||||
| <pre> | ||||
|   <kbd><enter></kbd>: Подтвердить | ||||
|   <kbd><esc></kbd>: Закрыть | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <enter> `` | Подтвердить |  | | ||||
| | `` <esc> `` | Закрыть |  | | ||||
|  | ||||
| ## Сохранить Изменения Файлов | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: Скопировать закомиченное имя файла в буфер обмена | ||||
|   <kbd>c</kbd>: Переключить файл | ||||
|   <kbd>d</kbd>: Отменить изменения коммита в этом файле | ||||
|   <kbd>o</kbd>: Открыть файл | ||||
|   <kbd>e</kbd>: Редактировать файл | ||||
|   <kbd><c-t></kbd>: Open external diff tool (git difftool) | ||||
|   <kbd><space></kbd>: Переключить файлы включённые в патч | ||||
|   <kbd>a</kbd>: Переключить все файлы, включённые в патч | ||||
|   <kbd><enter></kbd>: Введите файл, чтобы добавить выбранные строки в патч (или свернуть каталог переключения) | ||||
|   <kbd>`</kbd>: Переключить вид дерева файлов | ||||
|   <kbd>/</kbd>: Найти | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | Скопировать закомиченное имя файла в буфер обмена |  | | ||||
| | `` c `` | Переключить файл |  | | ||||
| | `` d `` | Отменить изменения коммита в этом файле |  | | ||||
| | `` o `` | Открыть файл |  | | ||||
| | `` e `` | Редактировать файл |  | | ||||
| | `` <c-t> `` | Open external diff tool (git difftool) |  | | ||||
| | `` <space> `` | Переключить файлы включённые в патч |  | | ||||
| | `` a `` | Переключить все файлы, включённые в патч |  | | ||||
| | `` <enter> `` | Введите файл, чтобы добавить выбранные строки в патч (или свернуть каталог переключения) |  | | ||||
| | `` ` `` | Переключить вид дерева файлов |  | | ||||
| | `` / `` | Найти |  | | ||||
|  | ||||
| ## Статус | ||||
|  | ||||
| <pre> | ||||
|   <kbd>o</kbd>: Открыть файл конфигурации | ||||
|   <kbd>e</kbd>: Редактировать файл конфигурации | ||||
|   <kbd>u</kbd>: Проверить обновления | ||||
|   <kbd><enter></kbd>: Переключиться на последний репозиторий | ||||
|   <kbd>a</kbd>: Показать все логи ветки | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` o `` | Открыть файл конфигурации |  | | ||||
| | `` e `` | Редактировать файл конфигурации |  | | ||||
| | `` u `` | Проверить обновления |  | | ||||
| | `` <enter> `` | Переключиться на последний репозиторий |  | | ||||
| | `` a `` | Показать все логи ветки |  | | ||||
|  | ||||
| ## Теги | ||||
|  | ||||
| <pre> | ||||
|   <kbd><space></kbd>: Переключить | ||||
|   <kbd>d</kbd>: View delete options | ||||
|   <kbd>P</kbd>: Отправить тег | ||||
|   <kbd>n</kbd>: Создать тег | ||||
|   <kbd>g</kbd>: Просмотреть параметры сброса | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><enter></kbd>: Просмотреть коммиты | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <space> `` | Переключить |  | | ||||
| | `` d `` | View delete options |  | | ||||
| | `` P `` | Отправить тег |  | | ||||
| | `` n `` | Создать тег |  | | ||||
| | `` g `` | Просмотреть параметры сброса |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <enter> `` | Просмотреть коммиты |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## Удалённые ветки | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: Скопировать название ветки в буфер обмена | ||||
|   <kbd><space></kbd>: Переключить | ||||
|   <kbd>n</kbd>: Новая ветка | ||||
|   <kbd>M</kbd>: Слияние с текущей переключённой веткой | ||||
|   <kbd>r</kbd>: Перебазировать переключённую ветку на эту ветку | ||||
|   <kbd>d</kbd>: Delete remote tag | ||||
|   <kbd>u</kbd>: Установить как upstream-ветку переключённую ветку | ||||
|   <kbd>s</kbd>: Порядок сортировки | ||||
|   <kbd>g</kbd>: Просмотреть параметры сброса | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><enter></kbd>: Просмотреть коммиты | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | Скопировать название ветки в буфер обмена |  | | ||||
| | `` <space> `` | Переключить |  | | ||||
| | `` n `` | Новая ветка |  | | ||||
| | `` M `` | Слияние с текущей переключённой веткой |  | | ||||
| | `` r `` | Перебазировать переключённую ветку на эту ветку |  | | ||||
| | `` d `` | Delete remote tag |  | | ||||
| | `` u `` | Установить как upstream-ветку переключённую ветку |  | | ||||
| | `` s `` | Порядок сортировки |  | | ||||
| | `` g `` | Просмотреть параметры сброса |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <enter> `` | Просмотреть коммиты |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## Удалённые репозитории | ||||
|  | ||||
| <pre> | ||||
|   <kbd>f</kbd>: Получение изменения из удалённого репозитория | ||||
|   <kbd>n</kbd>: Добавить новую удалённую ветку | ||||
|   <kbd>d</kbd>: Удалить удалённую ветку | ||||
|   <kbd>e</kbd>: Редактировать удалённый репозитории | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` f `` | Получение изменения из удалённого репозитория |  | | ||||
| | `` n `` | Добавить новую удалённую ветку |  | | ||||
| | `` d `` | Удалить удалённую ветку |  | | ||||
| | `` e `` | Редактировать удалённый репозитории |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## Файлы | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: Скопировать название файла в буфер обмена | ||||
|   <kbd><space></kbd>: Переключить индекс | ||||
|   <kbd><c-b></kbd>: Фильтровать файлы (проиндексированные/непроиндексированные) | ||||
|   <kbd>y</kbd>: Copy to clipboard | ||||
|   <kbd>c</kbd>: Сохранить изменения | ||||
|   <kbd>w</kbd>: Закоммитить изменения без предварительного хука коммита | ||||
|   <kbd>A</kbd>: Правка последнего коммита | ||||
|   <kbd>C</kbd>: Сохранить изменения с помощью редактора git | ||||
|   <kbd><c-f></kbd>: Find base commit for fixup | ||||
|   <kbd>e</kbd>: Редактировать файл | ||||
|   <kbd>o</kbd>: Открыть файл | ||||
|   <kbd>i</kbd>: Игнорировать или исключить файл | ||||
|   <kbd>r</kbd>: Обновить файлы | ||||
|   <kbd>s</kbd>: Припрятать все изменения | ||||
|   <kbd>S</kbd>: Просмотреть параметры хранилища | ||||
|   <kbd>a</kbd>: Все проиндексированные/непроиндексированные | ||||
|   <kbd><enter></kbd>: Проиндексировать отдельные части/строки для файла или свернуть/развернуть для каталога | ||||
|   <kbd>d</kbd>: Просмотреть параметры «отмены изменении» | ||||
|   <kbd>g</kbd>: Просмотреть параметры сброса upstream-ветки | ||||
|   <kbd>D</kbd>: Просмотреть параметры сброса | ||||
|   <kbd>`</kbd>: Переключить вид дерева файлов | ||||
|   <kbd><c-t></kbd>: Open external diff tool (git difftool) | ||||
|   <kbd>M</kbd>: Открыть внешний инструмент слияния (git mergetool) | ||||
|   <kbd>f</kbd>: Получить изменения | ||||
|   <kbd>/</kbd>: Найти | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | Скопировать название файла в буфер обмена |  | | ||||
| | `` <space> `` | Переключить индекс |  | | ||||
| | `` <c-b> `` | Фильтровать файлы (проиндексированные/непроиндексированные) |  | | ||||
| | `` y `` | Copy to clipboard |  | | ||||
| | `` c `` | Сохранить изменения |  | | ||||
| | `` w `` | Закоммитить изменения без предварительного хука коммита |  | | ||||
| | `` A `` | Правка последнего коммита |  | | ||||
| | `` C `` | Сохранить изменения с помощью редактора git |  | | ||||
| | `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> | | ||||
| | `` e `` | Редактировать файл |  | | ||||
| | `` o `` | Открыть файл |  | | ||||
| | `` i `` | Игнорировать или исключить файл |  | | ||||
| | `` r `` | Обновить файлы |  | | ||||
| | `` s `` | Припрятать все изменения |  | | ||||
| | `` S `` | Просмотреть параметры хранилища |  | | ||||
| | `` a `` | Все проиндексированные/непроиндексированные |  | | ||||
| | `` <enter> `` | Проиндексировать отдельные части/строки для файла или свернуть/развернуть для каталога |  | | ||||
| | `` d `` | Просмотреть параметры «отмены изменении» |  | | ||||
| | `` g `` | Просмотреть параметры сброса upstream-ветки |  | | ||||
| | `` D `` | Просмотреть параметры сброса |  | | ||||
| | `` ` `` | Переключить вид дерева файлов |  | | ||||
| | `` <c-t> `` | Open external diff tool (git difftool) |  | | ||||
| | `` M `` | Открыть внешний инструмент слияния (git mergetool) |  | | ||||
| | `` f `` | Получить изменения |  | | ||||
| | `` / `` | Найти |  | | ||||
|  | ||||
| ## Хранилище | ||||
|  | ||||
| <pre> | ||||
|   <kbd><space></kbd>: Применить припрятанные изменения | ||||
|   <kbd>g</kbd>: Применить припрятанные изменения и тут же удалить их из хранилища | ||||
|   <kbd>d</kbd>: Удалить припрятанные изменения из хранилища | ||||
|   <kbd>n</kbd>: Новая ветка | ||||
|   <kbd>r</kbd>: Переименовать хранилище | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><enter></kbd>: Просмотреть файлы выбранного элемента | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <space> `` | Применить припрятанные изменения |  | | ||||
| | `` g `` | Применить припрятанные изменения и тут же удалить их из хранилища |  | | ||||
| | `` d `` | Удалить припрятанные изменения из хранилища |  | | ||||
| | `` n `` | Новая ветка |  | | ||||
| | `` r `` | Переименовать хранилище |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <enter> `` | Просмотреть файлы выбранного элемента |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|   | ||||
| @@ -6,356 +6,357 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ | ||||
|  | ||||
| ## 全局键绑定 | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-r></kbd>: 切换到最近的仓库 | ||||
|   <kbd><pgup></kbd>: 向上滚动主面板 (fn+up/shift+k) | ||||
|   <kbd><pgdown></kbd>: 向下滚动主面板 (fn+down/shift+j) | ||||
|   <kbd>@</kbd>: 打开命令日志菜单 | ||||
|   <kbd>}</kbd>: 扩大差异视图中显示的上下文范围 | ||||
|   <kbd>{</kbd>: 缩小差异视图中显示的上下文范围 | ||||
|   <kbd>:</kbd>: 执行自定义命令 | ||||
|   <kbd><c-p></kbd>: 查看自定义补丁选项 | ||||
|   <kbd>m</kbd>: 查看 合并/变基 选项 | ||||
|   <kbd>R</kbd>: 刷新 | ||||
|   <kbd>+</kbd>: 下一屏模式(正常/半屏/全屏) | ||||
|   <kbd>_</kbd>: 上一屏模式 | ||||
|   <kbd>?</kbd>: 打开菜单 | ||||
|   <kbd><c-s></kbd>: 查看按路径过滤选项 | ||||
|   <kbd>W</kbd>: 打开 diff 菜单 | ||||
|   <kbd><c-e></kbd>: 打开 diff 菜单 | ||||
|   <kbd><c-w></kbd>: 切换是否在差异视图中显示空白字符差异 | ||||
|   <kbd>z</kbd>: (通过 reflog)撤销「实验功能」 | ||||
|   <kbd><c-z></kbd>: (通过 reflog)重做「实验功能」 | ||||
|   <kbd>P</kbd>: 推送 | ||||
|   <kbd>p</kbd>: 拉取 | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-r> `` | 切换到最近的仓库 |  | | ||||
| | `` <pgup> (fn+up/shift+k) `` | 向上滚动主面板 |  | | ||||
| | `` <pgdown> (fn+down/shift+j) `` | 向下滚动主面板 |  | | ||||
| | `` @ `` | 打开命令日志菜单 |  | | ||||
| | `` } `` | 扩大差异视图中显示的上下文范围 |  | | ||||
| | `` { `` | 缩小差异视图中显示的上下文范围 |  | | ||||
| | `` : `` | 执行自定义命令 |  | | ||||
| | `` <c-p> `` | 查看自定义补丁选项 |  | | ||||
| | `` m `` | 查看 合并/变基 选项 |  | | ||||
| | `` R `` | 刷新 |  | | ||||
| | `` + `` | 下一屏模式(正常/半屏/全屏) |  | | ||||
| | `` _ `` | 上一屏模式 |  | | ||||
| | `` ? `` | 打开菜单 |  | | ||||
| | `` <c-s> `` | 查看按路径过滤选项 |  | | ||||
| | `` W `` | 打开 diff 菜单 |  | | ||||
| | `` <c-e> `` | 打开 diff 菜单 |  | | ||||
| | `` <c-w> `` | 切换是否在差异视图中显示空白字符差异 |  | | ||||
| | `` 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. | | ||||
| | `` <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. | | ||||
| | `` P `` | 推送 |  | | ||||
| | `` p `` | 拉取 |  | | ||||
|  | ||||
| ## 列表面板导航 | ||||
|  | ||||
| <pre> | ||||
|   <kbd>,</kbd>: 上一页 | ||||
|   <kbd>.</kbd>: 下一页 | ||||
|   <kbd><</kbd>: 滚动到顶部 | ||||
|   <kbd>></kbd>: 滚动到底部 | ||||
|   <kbd>v</kbd>: 切换拖动选择 | ||||
|   <kbd><s-down></kbd>: Range select down | ||||
|   <kbd><s-up></kbd>: Range select up | ||||
|   <kbd>/</kbd>: 开始搜索 | ||||
|   <kbd>H</kbd>: 向左滚动 | ||||
|   <kbd>L</kbd>: 向右滚动 | ||||
|   <kbd>]</kbd>: 下一个标签 | ||||
|   <kbd>[</kbd>: 上一个标签 | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` , `` | 上一页 |  | | ||||
| | `` . `` | 下一页 |  | | ||||
| | `` < `` | 滚动到顶部 |  | | ||||
| | `` > `` | 滚动到底部 |  | | ||||
| | `` v `` | 切换拖动选择 |  | | ||||
| | `` <s-down> `` | Range select down |  | | ||||
| | `` <s-up> `` | Range select up |  | | ||||
| | `` / `` | 开始搜索 |  | | ||||
| | `` H `` | 向左滚动 |  | | ||||
| | `` L `` | 向右滚动 |  | | ||||
| | `` ] `` | 下一个标签 |  | | ||||
| | `` [ `` | 上一个标签 |  | | ||||
|  | ||||
| ## Reflog 页面 | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: 将提交的 SHA 复制到剪贴板 | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><space></kbd>: 检出提交 | ||||
|   <kbd>y</kbd>: Copy commit attribute | ||||
|   <kbd>o</kbd>: 在浏览器中打开提交 | ||||
|   <kbd>n</kbd>: 从提交创建新分支 | ||||
|   <kbd>g</kbd>: 查看重置选项 | ||||
|   <kbd>C</kbd>: 复制提交(拣选) | ||||
|   <kbd><c-r></kbd>: 重置已拣选(复制)的提交 | ||||
|   <kbd><c-t></kbd>: Open external diff tool (git difftool) | ||||
|   <kbd><enter></kbd>: 查看提交 | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | 将提交的 SHA 复制到剪贴板 |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <space> `` | 检出提交 |  | | ||||
| | `` y `` | Copy commit attribute |  | | ||||
| | `` o `` | 在浏览器中打开提交 |  | | ||||
| | `` n `` | 从提交创建新分支 |  | | ||||
| | `` g `` | 查看重置选项 |  | | ||||
| | `` C `` | 复制提交(拣选) |  | | ||||
| | `` <c-r> `` | 重置已拣选(复制)的提交 |  | | ||||
| | `` <c-t> `` | Open external diff tool (git difftool) |  | | ||||
| | `` <enter> `` | 查看提交 |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## Worktrees | ||||
|  | ||||
| <pre> | ||||
|   <kbd>n</kbd>: Create worktree | ||||
|   <kbd><space></kbd>: Switch to worktree | ||||
|   <kbd><enter></kbd>: Switch to worktree | ||||
|   <kbd>o</kbd>: Open in editor | ||||
|   <kbd>d</kbd>: Remove worktree | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` n `` | Create worktree |  | | ||||
| | `` <space> `` | Switch to worktree |  | | ||||
| | `` <enter> `` | Switch to worktree |  | | ||||
| | `` o `` | Open in editor |  | | ||||
| | `` d `` | Remove worktree |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## 分支页面 | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: 将分支名称复制到剪贴板 | ||||
|   <kbd>i</kbd>: 显示 git-flow 选项 | ||||
|   <kbd><space></kbd>: 检出 | ||||
|   <kbd>n</kbd>: 新分支 | ||||
|   <kbd>o</kbd>: 创建抓取请求 | ||||
|   <kbd>O</kbd>: 创建抓取请求选项 | ||||
|   <kbd><c-y></kbd>: 将抓取请求 URL 复制到剪贴板 | ||||
|   <kbd>c</kbd>: 按名称检出 | ||||
|   <kbd>F</kbd>: 强制检出 | ||||
|   <kbd>d</kbd>: View delete options | ||||
|   <kbd>r</kbd>: 将已检出的分支变基到该分支 | ||||
|   <kbd>M</kbd>: 合并到当前检出的分支 | ||||
|   <kbd>f</kbd>: 从上游快进此分支 | ||||
|   <kbd>T</kbd>: 创建标签 | ||||
|   <kbd>s</kbd>: Sort order | ||||
|   <kbd>g</kbd>: 查看重置选项 | ||||
|   <kbd>R</kbd>: 重命名分支 | ||||
|   <kbd>u</kbd>: View upstream options | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><enter></kbd>: 查看提交 | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | 将分支名称复制到剪贴板 |  | | ||||
| | `` i `` | 显示 git-flow 选项 |  | | ||||
| | `` <space> `` | 检出 |  | | ||||
| | `` n `` | 新分支 |  | | ||||
| | `` o `` | 创建抓取请求 |  | | ||||
| | `` O `` | 创建抓取请求选项 |  | | ||||
| | `` <c-y> `` | 将抓取请求 URL 复制到剪贴板 |  | | ||||
| | `` c `` | 按名称检出 |  | | ||||
| | `` F `` | 强制检出 |  | | ||||
| | `` d `` | View delete options |  | | ||||
| | `` r `` | 将已检出的分支变基到该分支 |  | | ||||
| | `` M `` | 合并到当前检出的分支 |  | | ||||
| | `` f `` | 从上游快进此分支 |  | | ||||
| | `` T `` | 创建标签 |  | | ||||
| | `` s `` | Sort order |  | | ||||
| | `` g `` | 查看重置选项 |  | | ||||
| | `` R `` | 重命名分支 |  | | ||||
| | `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <enter> `` | 查看提交 |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## 子提交 | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: 将提交的 SHA 复制到剪贴板 | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><space></kbd>: 检出提交 | ||||
|   <kbd>y</kbd>: Copy commit attribute | ||||
|   <kbd>o</kbd>: 在浏览器中打开提交 | ||||
|   <kbd>n</kbd>: 从提交创建新分支 | ||||
|   <kbd>g</kbd>: 查看重置选项 | ||||
|   <kbd>C</kbd>: 复制提交(拣选) | ||||
|   <kbd><c-r></kbd>: 重置已拣选(复制)的提交 | ||||
|   <kbd><c-t></kbd>: Open external diff tool (git difftool) | ||||
|   <kbd><enter></kbd>: 查看提交的文件 | ||||
|   <kbd>/</kbd>: 开始搜索 | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | 将提交的 SHA 复制到剪贴板 |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <space> `` | 检出提交 |  | | ||||
| | `` y `` | Copy commit attribute |  | | ||||
| | `` o `` | 在浏览器中打开提交 |  | | ||||
| | `` n `` | 从提交创建新分支 |  | | ||||
| | `` g `` | 查看重置选项 |  | | ||||
| | `` C `` | 复制提交(拣选) |  | | ||||
| | `` <c-r> `` | 重置已拣选(复制)的提交 |  | | ||||
| | `` <c-t> `` | Open external diff tool (git difftool) |  | | ||||
| | `` <enter> `` | 查看提交的文件 |  | | ||||
| | `` / `` | 开始搜索 |  | | ||||
|  | ||||
| ## 子模块 | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: 将子模块名称复制到剪贴板 | ||||
|   <kbd><enter></kbd>: 输入子模块 | ||||
|   <kbd><space></kbd>: 输入子模块 | ||||
|   <kbd>d</kbd>: 删除子模块 | ||||
|   <kbd>u</kbd>: 更新子模块 | ||||
|   <kbd>n</kbd>: 添加新的子模块 | ||||
|   <kbd>e</kbd>: 更新子模块 URL | ||||
|   <kbd>i</kbd>: 初始化子模块 | ||||
|   <kbd>b</kbd>: 查看批量子模块选项 | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | 将子模块名称复制到剪贴板 |  | | ||||
| | `` <enter> `` | 输入子模块 |  | | ||||
| | `` <space> `` | 输入子模块 |  | | ||||
| | `` d `` | 删除子模块 |  | | ||||
| | `` u `` | 更新子模块 |  | | ||||
| | `` n `` | 添加新的子模块 |  | | ||||
| | `` e `` | 更新子模块 URL |  | | ||||
| | `` i `` | 初始化子模块 |  | | ||||
| | `` b `` | 查看批量子模块选项 |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## 提交 | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: 将提交的 SHA 复制到剪贴板 | ||||
|   <kbd><c-r></kbd>: 重置已拣选(复制)的提交 | ||||
|   <kbd>b</kbd>: 查看二分查找选项 | ||||
|   <kbd>s</kbd>: 向下压缩 | ||||
|   <kbd>f</kbd>: 修正提交(fixup) | ||||
|   <kbd>r</kbd>: 改写提交 | ||||
|   <kbd>R</kbd>: 使用编辑器重命名提交 | ||||
|   <kbd>d</kbd>: 删除提交 | ||||
|   <kbd>e</kbd>: 编辑提交 | ||||
|   <kbd>i</kbd>: Start interactive rebase | ||||
|   <kbd>p</kbd>: 选择提交(变基过程中) | ||||
|   <kbd>F</kbd>: 创建修正提交 | ||||
|   <kbd>S</kbd>: 压缩在所选提交之上的所有“fixup!”提交(自动压缩) | ||||
|   <kbd><c-j></kbd>: 下移提交 | ||||
|   <kbd><c-k></kbd>: 上移提交 | ||||
|   <kbd>V</kbd>: 粘贴提交(拣选) | ||||
|   <kbd>B</kbd>: Mark commit as base commit for rebase | ||||
|   <kbd>A</kbd>: 用已暂存的更改来修补提交 | ||||
|   <kbd>a</kbd>: Set/Reset commit author | ||||
|   <kbd>t</kbd>: 还原提交 | ||||
|   <kbd>T</kbd>: 标签提交 | ||||
|   <kbd><c-l></kbd>: 打开日志菜单 | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><space></kbd>: 检出提交 | ||||
|   <kbd>y</kbd>: Copy commit attribute | ||||
|   <kbd>o</kbd>: 在浏览器中打开提交 | ||||
|   <kbd>n</kbd>: 从提交创建新分支 | ||||
|   <kbd>g</kbd>: 查看重置选项 | ||||
|   <kbd>C</kbd>: 复制提交(拣选) | ||||
|   <kbd><c-t></kbd>: Open external diff tool (git difftool) | ||||
|   <kbd><enter></kbd>: 查看提交的文件 | ||||
|   <kbd>/</kbd>: 开始搜索 | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | 将提交的 SHA 复制到剪贴板 |  | | ||||
| | `` <c-r> `` | 重置已拣选(复制)的提交 |  | | ||||
| | `` b `` | 查看二分查找选项 |  | | ||||
| | `` s `` | 向下压缩 |  | | ||||
| | `` f `` | 修正提交(fixup) |  | | ||||
| | `` r `` | 改写提交 |  | | ||||
| | `` R `` | 使用编辑器重命名提交 |  | | ||||
| | `` d `` | 删除提交 |  | | ||||
| | `` e `` | 编辑提交 |  | | ||||
| | `` i `` | Start interactive rebase | Start an interactive rebase for the commits on your branch. This will include all commits from the HEAD commit down to the first merge commit or main branch commit. | ||||
| If you would instead like to start an interactive rebase from the selected commit, press `e`. | | ||||
| | `` p `` | 选择提交(变基过程中) |  | | ||||
| | `` F `` | 创建修正提交 |  | | ||||
| | `` S `` | 压缩在所选提交之上的所有“fixup!”提交(自动压缩) |  | | ||||
| | `` <c-j> `` | 下移提交 |  | | ||||
| | `` <c-k> `` | 上移提交 |  | | ||||
| | `` V `` | 粘贴提交(拣选) |  | | ||||
| | `` B `` | Mark commit as base commit for rebase | Select a base commit for the next rebase; this will effectively perform a 'git rebase --onto'. | | ||||
| | `` A `` | 用已暂存的更改来修补提交 |  | | ||||
| | `` a `` | Set/Reset commit author |  | | ||||
| | `` t `` | 还原提交 |  | | ||||
| | `` T `` | 标签提交 |  | | ||||
| | `` <c-l> `` | 打开日志菜单 |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <space> `` | 检出提交 |  | | ||||
| | `` y `` | Copy commit attribute |  | | ||||
| | `` o `` | 在浏览器中打开提交 |  | | ||||
| | `` n `` | 从提交创建新分支 |  | | ||||
| | `` g `` | 查看重置选项 |  | | ||||
| | `` C `` | 复制提交(拣选) |  | | ||||
| | `` <c-t> `` | Open external diff tool (git difftool) |  | | ||||
| | `` <enter> `` | 查看提交的文件 |  | | ||||
| | `` / `` | 开始搜索 |  | | ||||
|  | ||||
| ## 提交文件 | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: 将提交的文件名复制到剪贴板 | ||||
|   <kbd>c</kbd>: 检出文件 | ||||
|   <kbd>d</kbd>: 放弃对此文件的提交更改 | ||||
|   <kbd>o</kbd>: 打开文件 | ||||
|   <kbd>e</kbd>: 编辑文件 | ||||
|   <kbd><c-t></kbd>: Open external diff tool (git difftool) | ||||
|   <kbd><space></kbd>: 补丁中包含的切换文件 | ||||
|   <kbd>a</kbd>: Toggle all files included in patch | ||||
|   <kbd><enter></kbd>: 输入文件以将所选行添加到补丁中(或切换目录折叠) | ||||
|   <kbd>`</kbd>: 切换文件树视图 | ||||
|   <kbd>/</kbd>: 开始搜索 | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | 将提交的文件名复制到剪贴板 |  | | ||||
| | `` c `` | 检出文件 |  | | ||||
| | `` d `` | 放弃对此文件的提交更改 |  | | ||||
| | `` o `` | 打开文件 |  | | ||||
| | `` e `` | 编辑文件 |  | | ||||
| | `` <c-t> `` | Open external diff tool (git difftool) |  | | ||||
| | `` <space> `` | 补丁中包含的切换文件 |  | | ||||
| | `` a `` | Toggle all files included in patch |  | | ||||
| | `` <enter> `` | 输入文件以将所选行添加到补丁中(或切换目录折叠) |  | | ||||
| | `` ` `` | 切换文件树视图 |  | | ||||
| | `` / `` | 开始搜索 |  | | ||||
|  | ||||
| ## 提交讯息 | ||||
|  | ||||
| <pre> | ||||
|   <kbd><enter></kbd>: 确认 | ||||
|   <kbd><esc></kbd>: 关闭 | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <enter> `` | 确认 |  | | ||||
| | `` <esc> `` | 关闭 |  | | ||||
|  | ||||
| ## 文件 | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: 将文件名复制到剪贴板 | ||||
|   <kbd><space></kbd>: 切换暂存状态 | ||||
|   <kbd><c-b></kbd>: Filter files by status | ||||
|   <kbd>y</kbd>: Copy to clipboard | ||||
|   <kbd>c</kbd>: 提交更改 | ||||
|   <kbd>w</kbd>: 提交更改而无需预先提交钩子 | ||||
|   <kbd>A</kbd>: 修补最后一次提交 | ||||
|   <kbd>C</kbd>: 提交更改(使用编辑器编辑提交信息) | ||||
|   <kbd><c-f></kbd>: Find base commit for fixup | ||||
|   <kbd>e</kbd>: 编辑文件 | ||||
|   <kbd>o</kbd>: 打开文件 | ||||
|   <kbd>i</kbd>: 忽略文件 | ||||
|   <kbd>r</kbd>: 刷新文件 | ||||
|   <kbd>s</kbd>: 将所有更改加入贮藏 | ||||
|   <kbd>S</kbd>: 查看贮藏选项 | ||||
|   <kbd>a</kbd>: 切换所有文件的暂存状态 | ||||
|   <kbd><enter></kbd>: 暂存单个 块/行 用于文件, 或 折叠/展开 目录 | ||||
|   <kbd>d</kbd>: 查看'放弃更改'选项 | ||||
|   <kbd>g</kbd>: 查看上游重置选项 | ||||
|   <kbd>D</kbd>: 查看重置选项 | ||||
|   <kbd>`</kbd>: 切换文件树视图 | ||||
|   <kbd><c-t></kbd>: Open external diff tool (git difftool) | ||||
|   <kbd>M</kbd>: 打开外部合并工具 (git mergetool) | ||||
|   <kbd>f</kbd>: 抓取 | ||||
|   <kbd>/</kbd>: 开始搜索 | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | 将文件名复制到剪贴板 |  | | ||||
| | `` <space> `` | 切换暂存状态 |  | | ||||
| | `` <c-b> `` | Filter files by status |  | | ||||
| | `` y `` | Copy to clipboard |  | | ||||
| | `` c `` | 提交更改 |  | | ||||
| | `` w `` | 提交更改而无需预先提交钩子 |  | | ||||
| | `` A `` | 修补最后一次提交 |  | | ||||
| | `` C `` | 提交更改(使用编辑器编辑提交信息) |  | | ||||
| | `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> | | ||||
| | `` e `` | 编辑文件 |  | | ||||
| | `` o `` | 打开文件 |  | | ||||
| | `` i `` | 忽略文件 |  | | ||||
| | `` r `` | 刷新文件 |  | | ||||
| | `` s `` | 将所有更改加入贮藏 |  | | ||||
| | `` S `` | 查看贮藏选项 |  | | ||||
| | `` a `` | 切换所有文件的暂存状态 |  | | ||||
| | `` <enter> `` | 暂存单个 块/行 用于文件, 或 折叠/展开 目录 |  | | ||||
| | `` d `` | 查看'放弃更改'选项 |  | | ||||
| | `` g `` | 查看上游重置选项 |  | | ||||
| | `` D `` | 查看重置选项 |  | | ||||
| | `` ` `` | 切换文件树视图 |  | | ||||
| | `` <c-t> `` | Open external diff tool (git difftool) |  | | ||||
| | `` M `` | 打开外部合并工具 (git mergetool) |  | | ||||
| | `` f `` | 抓取 |  | | ||||
| | `` / `` | 开始搜索 |  | | ||||
|  | ||||
| ## 构建补丁中 | ||||
|  | ||||
| <pre> | ||||
|   <kbd><left></kbd>: 选择上一个区块 | ||||
|   <kbd><right></kbd>: 选择下一个区块 | ||||
|   <kbd>v</kbd>: 切换拖动选择 | ||||
|   <kbd>a</kbd>: 切换选择区块 | ||||
|   <kbd><c-o></kbd>: 将选中文本复制到剪贴板 | ||||
|   <kbd>o</kbd>: 打开文件 | ||||
|   <kbd>e</kbd>: 编辑文件 | ||||
|   <kbd><space></kbd>: 添加/移除 行到补丁 | ||||
|   <kbd><esc></kbd>: 退出逐行模式 | ||||
|   <kbd>/</kbd>: 开始搜索 | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <left> `` | 选择上一个区块 |  | | ||||
| | `` <right> `` | 选择下一个区块 |  | | ||||
| | `` v `` | 切换拖动选择 |  | | ||||
| | `` a `` | 切换选择区块 |  | | ||||
| | `` <c-o> `` | 将选中文本复制到剪贴板 |  | | ||||
| | `` o `` | 打开文件 |  | | ||||
| | `` e `` | 编辑文件 |  | | ||||
| | `` <space> `` | 添加/移除 行到补丁 |  | | ||||
| | `` <esc> `` | 退出逐行模式 |  | | ||||
| | `` / `` | 开始搜索 |  | | ||||
|  | ||||
| ## 标签页面 | ||||
|  | ||||
| <pre> | ||||
|   <kbd><space></kbd>: 检出 | ||||
|   <kbd>d</kbd>: View delete options | ||||
|   <kbd>P</kbd>: 推送标签 | ||||
|   <kbd>n</kbd>: 创建标签 | ||||
|   <kbd>g</kbd>: 查看重置选项 | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><enter></kbd>: 查看提交 | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <space> `` | 检出 |  | | ||||
| | `` d `` | View delete options |  | | ||||
| | `` P `` | 推送标签 |  | | ||||
| | `` n `` | 创建标签 |  | | ||||
| | `` g `` | 查看重置选项 |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <enter> `` | 查看提交 |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## 正在合并 | ||||
|  | ||||
| <pre> | ||||
|   <kbd>e</kbd>: 编辑文件 | ||||
|   <kbd>o</kbd>: 打开文件 | ||||
|   <kbd><left></kbd>: 选择上一个冲突 | ||||
|   <kbd><right></kbd>: 选择下一个冲突 | ||||
|   <kbd><up></kbd>: 选择顶部块 | ||||
|   <kbd><down></kbd>: 选择底部块 | ||||
|   <kbd>z</kbd>: 撤销 | ||||
|   <kbd>M</kbd>: 打开外部合并工具 (git mergetool) | ||||
|   <kbd><space></kbd>: 选中区块 | ||||
|   <kbd>b</kbd>: 选中所有区块 | ||||
|   <kbd><esc></kbd>: 返回文件面板 | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` e `` | 编辑文件 |  | | ||||
| | `` o `` | 打开文件 |  | | ||||
| | `` <left> `` | 选择上一个冲突 |  | | ||||
| | `` <right> `` | 选择下一个冲突 |  | | ||||
| | `` <up> `` | 选择顶部块 |  | | ||||
| | `` <down> `` | 选择底部块 |  | | ||||
| | `` z `` | 撤销 |  | | ||||
| | `` M `` | 打开外部合并工具 (git mergetool) |  | | ||||
| | `` <space> `` | 选中区块 |  | | ||||
| | `` b `` | 选中所有区块 |  | | ||||
| | `` <esc> `` | 返回文件面板 |  | | ||||
|  | ||||
| ## 正在暂存 | ||||
|  | ||||
| <pre> | ||||
|   <kbd><left></kbd>: 选择上一个区块 | ||||
|   <kbd><right></kbd>: 选择下一个区块 | ||||
|   <kbd>v</kbd>: 切换拖动选择 | ||||
|   <kbd>a</kbd>: 切换选择区块 | ||||
|   <kbd><c-o></kbd>: 将选中文本复制到剪贴板 | ||||
|   <kbd>o</kbd>: 打开文件 | ||||
|   <kbd>e</kbd>: 编辑文件 | ||||
|   <kbd><esc></kbd>: 返回文件面板 | ||||
|   <kbd><tab></kbd>: 切换到其他面板 | ||||
|   <kbd><space></kbd>: 切换行暂存状态 | ||||
|   <kbd>d</kbd>: 取消变更 (git reset) | ||||
|   <kbd>E</kbd>: Edit hunk | ||||
|   <kbd>c</kbd>: 提交更改 | ||||
|   <kbd>w</kbd>: 提交更改而无需预先提交钩子 | ||||
|   <kbd>C</kbd>: 提交更改(使用编辑器编辑提交信息) | ||||
|   <kbd>/</kbd>: 开始搜索 | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <left> `` | 选择上一个区块 |  | | ||||
| | `` <right> `` | 选择下一个区块 |  | | ||||
| | `` v `` | 切换拖动选择 |  | | ||||
| | `` a `` | 切换选择区块 |  | | ||||
| | `` <c-o> `` | 将选中文本复制到剪贴板 |  | | ||||
| | `` o `` | 打开文件 |  | | ||||
| | `` e `` | 编辑文件 |  | | ||||
| | `` <esc> `` | 返回文件面板 |  | | ||||
| | `` <tab> `` | 切换到其他面板 |  | | ||||
| | `` <space> `` | 切换行暂存状态 |  | | ||||
| | `` d `` | 取消变更 (git reset) |  | | ||||
| | `` E `` | Edit hunk |  | | ||||
| | `` c `` | 提交更改 |  | | ||||
| | `` w `` | 提交更改而无需预先提交钩子 |  | | ||||
| | `` C `` | 提交更改(使用编辑器编辑提交信息) |  | | ||||
| | `` / `` | 开始搜索 |  | | ||||
|  | ||||
| ## 正常 | ||||
|  | ||||
| <pre> | ||||
|   <kbd>mouse wheel down</kbd>: 向下滚动 (fn+up) | ||||
|   <kbd>mouse wheel up</kbd>: 向上滚动 (fn+down) | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` mouse wheel down (fn+up) `` | 向下滚动 |  | | ||||
| | `` mouse wheel up (fn+down) `` | 向上滚动 |  | | ||||
|  | ||||
| ## 状态 | ||||
|  | ||||
| <pre> | ||||
|   <kbd>o</kbd>: 打开配置文件 | ||||
|   <kbd>e</kbd>: 编辑配置文件 | ||||
|   <kbd>u</kbd>: 检查更新 | ||||
|   <kbd><enter></kbd>: 切换到最近的仓库 | ||||
|   <kbd>a</kbd>: 显示所有分支的日志 | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` o `` | 打开配置文件 |  | | ||||
| | `` e `` | 编辑配置文件 |  | | ||||
| | `` u `` | 检查更新 |  | | ||||
| | `` <enter> `` | 切换到最近的仓库 |  | | ||||
| | `` a `` | 显示所有分支的日志 |  | | ||||
|  | ||||
| ## 确认面板 | ||||
|  | ||||
| <pre> | ||||
|   <kbd><enter></kbd>: 确认 | ||||
|   <kbd><esc></kbd>: 关闭 | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <enter> `` | 确认 |  | | ||||
| | `` <esc> `` | 关闭 |  | | ||||
|  | ||||
| ## 菜单 | ||||
|  | ||||
| <pre> | ||||
|   <kbd><enter></kbd>: 执行 | ||||
|   <kbd><esc></kbd>: 关闭 | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <enter> `` | 执行 |  | | ||||
| | `` <esc> `` | 关闭 |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## 贮藏 | ||||
|  | ||||
| <pre> | ||||
|   <kbd><space></kbd>: 应用 | ||||
|   <kbd>g</kbd>: 应用并删除 | ||||
|   <kbd>d</kbd>: 删除 | ||||
|   <kbd>n</kbd>: 新分支 | ||||
|   <kbd>r</kbd>: Rename stash | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><enter></kbd>: 查看提交的文件 | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <space> `` | 应用 |  | | ||||
| | `` g `` | 应用并删除 |  | | ||||
| | `` d `` | 删除 |  | | ||||
| | `` n `` | 新分支 |  | | ||||
| | `` r `` | Rename stash |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <enter> `` | 查看提交的文件 |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## 远程分支 | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: 将分支名称复制到剪贴板 | ||||
|   <kbd><space></kbd>: 检出 | ||||
|   <kbd>n</kbd>: 新分支 | ||||
|   <kbd>M</kbd>: 合并到当前检出的分支 | ||||
|   <kbd>r</kbd>: 将已检出的分支变基到该分支 | ||||
|   <kbd>d</kbd>: Delete remote tag | ||||
|   <kbd>u</kbd>: 设置为检出分支的上游 | ||||
|   <kbd>s</kbd>: Sort order | ||||
|   <kbd>g</kbd>: 查看重置选项 | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><enter></kbd>: 查看提交 | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | 将分支名称复制到剪贴板 |  | | ||||
| | `` <space> `` | 检出 |  | | ||||
| | `` n `` | 新分支 |  | | ||||
| | `` M `` | 合并到当前检出的分支 |  | | ||||
| | `` r `` | 将已检出的分支变基到该分支 |  | | ||||
| | `` d `` | Delete remote tag |  | | ||||
| | `` u `` | 设置为检出分支的上游 |  | | ||||
| | `` s `` | Sort order |  | | ||||
| | `` g `` | 查看重置选项 |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <enter> `` | 查看提交 |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## 远程页面 | ||||
|  | ||||
| <pre> | ||||
|   <kbd>f</kbd>: 抓取远程仓库 | ||||
|   <kbd>n</kbd>: 添加新的远程仓库 | ||||
|   <kbd>d</kbd>: 删除远程 | ||||
|   <kbd>e</kbd>: 编辑远程仓库 | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` f `` | 抓取远程仓库 |  | | ||||
| | `` n `` | 添加新的远程仓库 |  | | ||||
| | `` d `` | 删除远程 |  | | ||||
| | `` e `` | 编辑远程仓库 |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|   | ||||
| @@ -6,356 +6,357 @@ _說明:`<c-b>` 表示 Ctrl+B、`<a-b>` 表示 Alt+B,`B`表示 Shift+B_ | ||||
|  | ||||
| ## 全局快捷鍵 | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-r></kbd>: 切換到最近使用的版本庫 | ||||
|   <kbd><pgup></kbd>: 向上捲動主面板 (fn+up/shift+k) | ||||
|   <kbd><pgdown></kbd>: 向下捲動主面板 (fn+down/shift+j) | ||||
|   <kbd>@</kbd>: 開啟命令記錄選單 | ||||
|   <kbd>}</kbd>: 增加差異檢視中顯示變更周圍上下文的大小 | ||||
|   <kbd>{</kbd>: 減小差異檢視中顯示變更周圍上下文的大小 | ||||
|   <kbd>:</kbd>: 執行自訂命令 | ||||
|   <kbd><c-p></kbd>: 檢視自訂補丁選項 | ||||
|   <kbd>m</kbd>: 查看合併/變基選項 | ||||
|   <kbd>R</kbd>: 重新整理 | ||||
|   <kbd>+</kbd>: 下一個螢幕模式(常規/半螢幕/全螢幕) | ||||
|   <kbd>_</kbd>: 上一個螢幕模式 | ||||
|   <kbd>?</kbd>: 開啟選單 | ||||
|   <kbd><c-s></kbd>: 檢視篩選路徑選項 | ||||
|   <kbd>W</kbd>: 開啟差異比較選單 | ||||
|   <kbd><c-e></kbd>: 開啟差異比較選單 | ||||
|   <kbd><c-w></kbd>: 切換是否在差異檢視中顯示空格變更 | ||||
|   <kbd>z</kbd>: 復原 | ||||
|   <kbd><c-z></kbd>: 取消復原 | ||||
|   <kbd>P</kbd>: 推送 | ||||
|   <kbd>p</kbd>: 拉取 | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-r> `` | 切換到最近使用的版本庫 |  | | ||||
| | `` <pgup> (fn+up/shift+k) `` | 向上捲動主面板 |  | | ||||
| | `` <pgdown> (fn+down/shift+j) `` | 向下捲動主面板 |  | | ||||
| | `` @ `` | 開啟命令記錄選單 |  | | ||||
| | `` } `` | 增加差異檢視中顯示變更周圍上下文的大小 |  | | ||||
| | `` { `` | 減小差異檢視中顯示變更周圍上下文的大小 |  | | ||||
| | `` : `` | 執行自訂命令 |  | | ||||
| | `` <c-p> `` | 檢視自訂補丁選項 |  | | ||||
| | `` m `` | 查看合併/變基選項 |  | | ||||
| | `` R `` | 重新整理 |  | | ||||
| | `` + `` | 下一個螢幕模式(常規/半螢幕/全螢幕) |  | | ||||
| | `` _ `` | 上一個螢幕模式 |  | | ||||
| | `` ? `` | 開啟選單 |  | | ||||
| | `` <c-s> `` | 檢視篩選路徑選項 |  | | ||||
| | `` W `` | 開啟差異比較選單 |  | | ||||
| | `` <c-e> `` | 開啟差異比較選單 |  | | ||||
| | `` <c-w> `` | 切換是否在差異檢視中顯示空格變更 |  | | ||||
| | `` z `` | 復原 | 將使用 reflog 確定要運行哪個 git 命令以復原上一個 git 命令。這不包括工作區的更改;只考慮提交。 | | ||||
| | `` <c-z> `` | 取消復原 | 將使用 reflog 確定要運行哪個 git 命令以重作上一個 git 命令。這不包括工作區的更改;只考慮提交。 | | ||||
| | `` P `` | 推送 |  | | ||||
| | `` p `` | 拉取 |  | | ||||
|  | ||||
| ## 列表面板導航 | ||||
|  | ||||
| <pre> | ||||
|   <kbd>,</kbd>: 上一頁 | ||||
|   <kbd>.</kbd>: 下一頁 | ||||
|   <kbd><</kbd>: 捲動到頂部 | ||||
|   <kbd>></kbd>: 捲動到底部 | ||||
|   <kbd>v</kbd>: 切換拖曳選擇 | ||||
|   <kbd><s-down></kbd>: Range select down | ||||
|   <kbd><s-up></kbd>: Range select up | ||||
|   <kbd>/</kbd>: 開始搜尋 | ||||
|   <kbd>H</kbd>: 向左捲動 | ||||
|   <kbd>L</kbd>: 向右捲動 | ||||
|   <kbd>]</kbd>: 下一個索引標籤 | ||||
|   <kbd>[</kbd>: 上一個索引標籤 | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` , `` | 上一頁 |  | | ||||
| | `` . `` | 下一頁 |  | | ||||
| | `` < `` | 捲動到頂部 |  | | ||||
| | `` > `` | 捲動到底部 |  | | ||||
| | `` v `` | 切換拖曳選擇 |  | | ||||
| | `` <s-down> `` | Range select down |  | | ||||
| | `` <s-up> `` | Range select up |  | | ||||
| | `` / `` | 開始搜尋 |  | | ||||
| | `` H `` | 向左捲動 |  | | ||||
| | `` L `` | 向右捲動 |  | | ||||
| | `` ] `` | 下一個索引標籤 |  | | ||||
| | `` [ `` | 上一個索引標籤 |  | | ||||
|  | ||||
| ## Reflog | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: 複製提交 SHA 到剪貼簿 | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><space></kbd>: 檢出提交 | ||||
|   <kbd>y</kbd>: 複製提交屬性 | ||||
|   <kbd>o</kbd>: 在瀏覽器中開啟提交 | ||||
|   <kbd>n</kbd>: 從提交建立新分支 | ||||
|   <kbd>g</kbd>: 檢視重設選項 | ||||
|   <kbd>C</kbd>: 複製提交 (揀選) | ||||
|   <kbd><c-r></kbd>: 重設選定的揀選 (複製) 提交 | ||||
|   <kbd><c-t></kbd>: Open external diff tool (git difftool) | ||||
|   <kbd><enter></kbd>: 檢視提交 | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | 複製提交 SHA 到剪貼簿 |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <space> `` | 檢出提交 |  | | ||||
| | `` y `` | 複製提交屬性 |  | | ||||
| | `` o `` | 在瀏覽器中開啟提交 |  | | ||||
| | `` n `` | 從提交建立新分支 |  | | ||||
| | `` g `` | 檢視重設選項 |  | | ||||
| | `` C `` | 複製提交 (揀選) |  | | ||||
| | `` <c-r> `` | 重設選定的揀選 (複製) 提交 |  | | ||||
| | `` <c-t> `` | Open external diff tool (git difftool) |  | | ||||
| | `` <enter> `` | 檢視提交 |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## Worktrees | ||||
|  | ||||
| <pre> | ||||
|   <kbd>n</kbd>: Create worktree | ||||
|   <kbd><space></kbd>: Switch to worktree | ||||
|   <kbd><enter></kbd>: Switch to worktree | ||||
|   <kbd>o</kbd>: Open in editor | ||||
|   <kbd>d</kbd>: Remove worktree | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` n `` | Create worktree |  | | ||||
| | `` <space> `` | Switch to worktree |  | | ||||
| | `` <enter> `` | Switch to worktree |  | | ||||
| | `` o `` | Open in editor |  | | ||||
| | `` d `` | Remove worktree |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## 主視窗 (一般) | ||||
|  | ||||
| <pre> | ||||
|   <kbd>mouse wheel down</kbd>: 向下捲動 (fn+up) | ||||
|   <kbd>mouse wheel up</kbd>: 向上捲動 (fn+down) | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` mouse wheel down (fn+up) `` | 向下捲動 |  | | ||||
| | `` mouse wheel up (fn+down) `` | 向上捲動 |  | | ||||
|  | ||||
| ## 主視窗 (合併中) | ||||
|  | ||||
| <pre> | ||||
|   <kbd>e</kbd>: 編輯檔案 | ||||
|   <kbd>o</kbd>: 開啟檔案 | ||||
|   <kbd><left></kbd>: 選擇上一個衝突 | ||||
|   <kbd><right></kbd>: 選擇下一個衝突 | ||||
|   <kbd><up></kbd>: 選擇上一段 | ||||
|   <kbd><down></kbd>: 選擇下一段 | ||||
|   <kbd>z</kbd>: 復原 | ||||
|   <kbd>M</kbd>: 開啟外部合併工具 (git mergetool) | ||||
|   <kbd><space></kbd>: 挑選程式碼片段 | ||||
|   <kbd>b</kbd>: 挑選所有程式碼片段 | ||||
|   <kbd><esc></kbd>: 返回檔案面板 | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` e `` | 編輯檔案 |  | | ||||
| | `` o `` | 開啟檔案 |  | | ||||
| | `` <left> `` | 選擇上一個衝突 |  | | ||||
| | `` <right> `` | 選擇下一個衝突 |  | | ||||
| | `` <up> `` | 選擇上一段 |  | | ||||
| | `` <down> `` | 選擇下一段 |  | | ||||
| | `` z `` | 復原 |  | | ||||
| | `` M `` | 開啟外部合併工具 (git mergetool) |  | | ||||
| | `` <space> `` | 挑選程式碼片段 |  | | ||||
| | `` b `` | 挑選所有程式碼片段 |  | | ||||
| | `` <esc> `` | 返回檔案面板 |  | | ||||
|  | ||||
| ## 主視窗 (預存中) | ||||
|  | ||||
| <pre> | ||||
|   <kbd><left></kbd>: 選擇上一段 | ||||
|   <kbd><right></kbd>: 選擇下一段 | ||||
|   <kbd>v</kbd>: 切換拖曳選擇 | ||||
|   <kbd>a</kbd>: 切換選擇程式碼塊 | ||||
|   <kbd><c-o></kbd>: 複製所選文本至剪貼簿 | ||||
|   <kbd>o</kbd>: 開啟檔案 | ||||
|   <kbd>e</kbd>: 編輯檔案 | ||||
|   <kbd><esc></kbd>: 返回檔案面板 | ||||
|   <kbd><tab></kbd>: 切換至另一個面板 (已預存/未預存更改) | ||||
|   <kbd><space></kbd>: 切換現有行的狀態 (已預存/未預存) | ||||
|   <kbd>d</kbd>: 刪除變更 (git reset) | ||||
|   <kbd>E</kbd>: 編輯程式碼塊 | ||||
|   <kbd>c</kbd>: 提交變更 | ||||
|   <kbd>w</kbd>: 沒有預提交 hook 就提交更改 | ||||
|   <kbd>C</kbd>: 使用 git 編輯器提交變更 | ||||
|   <kbd>/</kbd>: 開始搜尋 | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <left> `` | 選擇上一段 |  | | ||||
| | `` <right> `` | 選擇下一段 |  | | ||||
| | `` v `` | 切換拖曳選擇 |  | | ||||
| | `` a `` | 切換選擇程式碼塊 |  | | ||||
| | `` <c-o> `` | 複製所選文本至剪貼簿 |  | | ||||
| | `` o `` | 開啟檔案 |  | | ||||
| | `` e `` | 編輯檔案 |  | | ||||
| | `` <esc> `` | 返回檔案面板 |  | | ||||
| | `` <tab> `` | 切換至另一個面板 (已預存/未預存更改) |  | | ||||
| | `` <space> `` | 切換現有行的狀態 (已預存/未預存) |  | | ||||
| | `` d `` | 刪除變更 (git reset) |  | | ||||
| | `` E `` | 編輯程式碼塊 |  | | ||||
| | `` c `` | 提交變更 |  | | ||||
| | `` w `` | 沒有預提交 hook 就提交更改 |  | | ||||
| | `` C `` | 使用 git 編輯器提交變更 |  | | ||||
| | `` / `` | 開始搜尋 |  | | ||||
|  | ||||
| ## 主面板 (補丁生成) | ||||
|  | ||||
| <pre> | ||||
|   <kbd><left></kbd>: 選擇上一段 | ||||
|   <kbd><right></kbd>: 選擇下一段 | ||||
|   <kbd>v</kbd>: 切換拖曳選擇 | ||||
|   <kbd>a</kbd>: 切換選擇程式碼塊 | ||||
|   <kbd><c-o></kbd>: 複製所選文本至剪貼簿 | ||||
|   <kbd>o</kbd>: 開啟檔案 | ||||
|   <kbd>e</kbd>: 編輯檔案 | ||||
|   <kbd><space></kbd>: 向 (或從) 補丁中添加/刪除行 | ||||
|   <kbd><esc></kbd>: 退出自訂補丁建立器 | ||||
|   <kbd>/</kbd>: 開始搜尋 | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <left> `` | 選擇上一段 |  | | ||||
| | `` <right> `` | 選擇下一段 |  | | ||||
| | `` v `` | 切換拖曳選擇 |  | | ||||
| | `` a `` | 切換選擇程式碼塊 |  | | ||||
| | `` <c-o> `` | 複製所選文本至剪貼簿 |  | | ||||
| | `` o `` | 開啟檔案 |  | | ||||
| | `` e `` | 編輯檔案 |  | | ||||
| | `` <space> `` | 向 (或從) 補丁中添加/刪除行 |  | | ||||
| | `` <esc> `` | 退出自訂補丁建立器 |  | | ||||
| | `` / `` | 開始搜尋 |  | | ||||
|  | ||||
| ## 功能表 | ||||
|  | ||||
| <pre> | ||||
|   <kbd><enter></kbd>: 執行 | ||||
|   <kbd><esc></kbd>: 關閉 | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <enter> `` | 執行 |  | | ||||
| | `` <esc> `` | 關閉 |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## 子提交 | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: 複製提交 SHA 到剪貼簿 | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><space></kbd>: 檢出提交 | ||||
|   <kbd>y</kbd>: 複製提交屬性 | ||||
|   <kbd>o</kbd>: 在瀏覽器中開啟提交 | ||||
|   <kbd>n</kbd>: 從提交建立新分支 | ||||
|   <kbd>g</kbd>: 檢視重設選項 | ||||
|   <kbd>C</kbd>: 複製提交 (揀選) | ||||
|   <kbd><c-r></kbd>: 重設選定的揀選 (複製) 提交 | ||||
|   <kbd><c-t></kbd>: Open external diff tool (git difftool) | ||||
|   <kbd><enter></kbd>: 檢視所選項目的檔案 | ||||
|   <kbd>/</kbd>: 開始搜尋 | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | 複製提交 SHA 到剪貼簿 |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <space> `` | 檢出提交 |  | | ||||
| | `` y `` | 複製提交屬性 |  | | ||||
| | `` o `` | 在瀏覽器中開啟提交 |  | | ||||
| | `` n `` | 從提交建立新分支 |  | | ||||
| | `` g `` | 檢視重設選項 |  | | ||||
| | `` C `` | 複製提交 (揀選) |  | | ||||
| | `` <c-r> `` | 重設選定的揀選 (複製) 提交 |  | | ||||
| | `` <c-t> `` | Open external diff tool (git difftool) |  | | ||||
| | `` <enter> `` | 檢視所選項目的檔案 |  | | ||||
| | `` / `` | 開始搜尋 |  | | ||||
|  | ||||
| ## 子模組 | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: 複製子模組名稱到剪貼簿 | ||||
|   <kbd><enter></kbd>: 進入子模組 | ||||
|   <kbd><space></kbd>: 進入子模組 | ||||
|   <kbd>d</kbd>: 移除子模組 | ||||
|   <kbd>u</kbd>: 更新子模組 | ||||
|   <kbd>n</kbd>: 新增子模組 | ||||
|   <kbd>e</kbd>: 更新子模組 URL | ||||
|   <kbd>i</kbd>: 初始化子模組 | ||||
|   <kbd>b</kbd>: 查看批量子模組選項 | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | 複製子模組名稱到剪貼簿 |  | | ||||
| | `` <enter> `` | 進入子模組 |  | | ||||
| | `` <space> `` | 進入子模組 |  | | ||||
| | `` d `` | 移除子模組 |  | | ||||
| | `` u `` | 更新子模組 |  | | ||||
| | `` n `` | 新增子模組 |  | | ||||
| | `` e `` | 更新子模組 URL |  | | ||||
| | `` i `` | 初始化子模組 |  | | ||||
| | `` b `` | 查看批量子模組選項 |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## 提交 | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: 複製提交 SHA 到剪貼簿 | ||||
|   <kbd><c-r></kbd>: 重設選定的揀選 (複製) 提交 | ||||
|   <kbd>b</kbd>: 查看二分選項 | ||||
|   <kbd>s</kbd>: 向下壓縮 | ||||
|   <kbd>f</kbd>: 修復提交 (Fixup) | ||||
|   <kbd>r</kbd>: 改寫提交 | ||||
|   <kbd>R</kbd>: 使用編輯器改寫提交 | ||||
|   <kbd>d</kbd>: 刪除提交 | ||||
|   <kbd>e</kbd>: 編輯提交 | ||||
|   <kbd>i</kbd>: Start interactive rebase | ||||
|   <kbd>p</kbd>: 挑選提交 (於變基過程中) | ||||
|   <kbd>F</kbd>: 為此提交建立修復提交 | ||||
|   <kbd>S</kbd>: 壓縮上方所有的“fixup!”提交 (自動壓縮) | ||||
|   <kbd><c-j></kbd>: 向下移動提交 | ||||
|   <kbd><c-k></kbd>: 向上移動提交 | ||||
|   <kbd>V</kbd>: 貼上提交 (揀選) | ||||
|   <kbd>B</kbd>: Mark commit as base commit for rebase | ||||
|   <kbd>A</kbd>: 使用已預存的更改修正提交 | ||||
|   <kbd>a</kbd>: 設置/重設提交作者 | ||||
|   <kbd>t</kbd>: 還原提交 | ||||
|   <kbd>T</kbd>: 打標籤到提交 | ||||
|   <kbd><c-l></kbd>: 開啟記錄選單 | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><space></kbd>: 檢出提交 | ||||
|   <kbd>y</kbd>: 複製提交屬性 | ||||
|   <kbd>o</kbd>: 在瀏覽器中開啟提交 | ||||
|   <kbd>n</kbd>: 從提交建立新分支 | ||||
|   <kbd>g</kbd>: 檢視重設選項 | ||||
|   <kbd>C</kbd>: 複製提交 (揀選) | ||||
|   <kbd><c-t></kbd>: Open external diff tool (git difftool) | ||||
|   <kbd><enter></kbd>: 檢視所選項目的檔案 | ||||
|   <kbd>/</kbd>: 開始搜尋 | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | 複製提交 SHA 到剪貼簿 |  | | ||||
| | `` <c-r> `` | 重設選定的揀選 (複製) 提交 |  | | ||||
| | `` b `` | 查看二分選項 |  | | ||||
| | `` s `` | 向下壓縮 |  | | ||||
| | `` f `` | 修復提交 (Fixup) |  | | ||||
| | `` r `` | 改寫提交 |  | | ||||
| | `` R `` | 使用編輯器改寫提交 |  | | ||||
| | `` d `` | 刪除提交 |  | | ||||
| | `` e `` | 編輯提交 |  | | ||||
| | `` i `` | Start interactive rebase | Start an interactive rebase for the commits on your branch. This will include all commits from the HEAD commit down to the first merge commit or main branch commit. | ||||
| If you would instead like to start an interactive rebase from the selected commit, press `e`. | | ||||
| | `` p `` | 挑選提交 (於變基過程中) |  | | ||||
| | `` F `` | 為此提交建立修復提交 |  | | ||||
| | `` S `` | 壓縮上方所有的“fixup!”提交 (自動壓縮) |  | | ||||
| | `` <c-j> `` | 向下移動提交 |  | | ||||
| | `` <c-k> `` | 向上移動提交 |  | | ||||
| | `` V `` | 貼上提交 (揀選) |  | | ||||
| | `` B `` | Mark commit as base commit for rebase | Select a base commit for the next rebase; this will effectively perform a 'git rebase --onto'. | | ||||
| | `` A `` | 使用已預存的更改修正提交 |  | | ||||
| | `` a `` | 設置/重設提交作者 |  | | ||||
| | `` t `` | 還原提交 |  | | ||||
| | `` T `` | 打標籤到提交 |  | | ||||
| | `` <c-l> `` | 開啟記錄選單 |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <space> `` | 檢出提交 |  | | ||||
| | `` y `` | 複製提交屬性 |  | | ||||
| | `` o `` | 在瀏覽器中開啟提交 |  | | ||||
| | `` n `` | 從提交建立新分支 |  | | ||||
| | `` g `` | 檢視重設選項 |  | | ||||
| | `` C `` | 複製提交 (揀選) |  | | ||||
| | `` <c-t> `` | Open external diff tool (git difftool) |  | | ||||
| | `` <enter> `` | 檢視所選項目的檔案 |  | | ||||
| | `` / `` | 開始搜尋 |  | | ||||
|  | ||||
| ## 提交摘要 | ||||
|  | ||||
| <pre> | ||||
|   <kbd><enter></kbd>: 確認 | ||||
|   <kbd><esc></kbd>: 關閉 | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <enter> `` | 確認 |  | | ||||
| | `` <esc> `` | 關閉 |  | | ||||
|  | ||||
| ## 提交檔案 | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: 複製提交的檔案名稱到剪貼簿 | ||||
|   <kbd>c</kbd>: 檢出檔案 | ||||
|   <kbd>d</kbd>: 捨棄此提交對此檔案的更改 | ||||
|   <kbd>o</kbd>: 開啟檔案 | ||||
|   <kbd>e</kbd>: 編輯檔案 | ||||
|   <kbd><c-t></kbd>: Open external diff tool (git difftool) | ||||
|   <kbd><space></kbd>: 切換檔案是否包含在補丁中 | ||||
|   <kbd>a</kbd>: 切換所有檔案是否包含在補丁中 | ||||
|   <kbd><enter></kbd>: 輸入檔案以將選定的行添加至補丁(或切換目錄折疊) | ||||
|   <kbd>`</kbd>: 切換檔案樹狀視圖 | ||||
|   <kbd>/</kbd>: 開始搜尋 | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | 複製提交的檔案名稱到剪貼簿 |  | | ||||
| | `` c `` | 檢出檔案 |  | | ||||
| | `` d `` | 捨棄此提交對此檔案的更改 |  | | ||||
| | `` o `` | 開啟檔案 |  | | ||||
| | `` e `` | 編輯檔案 |  | | ||||
| | `` <c-t> `` | Open external diff tool (git difftool) |  | | ||||
| | `` <space> `` | 切換檔案是否包含在補丁中 |  | | ||||
| | `` a `` | 切換所有檔案是否包含在補丁中 |  | | ||||
| | `` <enter> `` | 輸入檔案以將選定的行添加至補丁(或切換目錄折疊) |  | | ||||
| | `` ` `` | 切換檔案樹狀視圖 |  | | ||||
| | `` / `` | 開始搜尋 |  | | ||||
|  | ||||
| ## 收藏 (Stash) | ||||
|  | ||||
| <pre> | ||||
|   <kbd><space></kbd>: 套用 | ||||
|   <kbd>g</kbd>: 還原 | ||||
|   <kbd>d</kbd>: 捨棄 | ||||
|   <kbd>n</kbd>: 新分支 | ||||
|   <kbd>r</kbd>: 重新命名收藏 | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><enter></kbd>: 檢視所選項目的檔案 | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <space> `` | 套用 |  | | ||||
| | `` g `` | 還原 |  | | ||||
| | `` d `` | 捨棄 |  | | ||||
| | `` n `` | 新分支 |  | | ||||
| | `` r `` | 重新命名收藏 |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <enter> `` | 檢視所選項目的檔案 |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## 本地分支 | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: 複製分支名稱到剪貼簿 | ||||
|   <kbd>i</kbd>: 顯示 git-flow 選項 | ||||
|   <kbd><space></kbd>: 檢出 | ||||
|   <kbd>n</kbd>: 新分支 | ||||
|   <kbd>o</kbd>: 建立拉取請求 | ||||
|   <kbd>O</kbd>: 建立拉取請求選項 | ||||
|   <kbd><c-y></kbd>: 複製拉取請求的 URL 到剪貼板 | ||||
|   <kbd>c</kbd>: 根據名稱檢出 | ||||
|   <kbd>F</kbd>: 強制檢出 | ||||
|   <kbd>d</kbd>: View delete options | ||||
|   <kbd>r</kbd>: 將已檢出的分支變基至此分支 | ||||
|   <kbd>M</kbd>: 合併到當前檢出的分支 | ||||
|   <kbd>f</kbd>: 從上游快進此分支 | ||||
|   <kbd>T</kbd>: 建立標籤 | ||||
|   <kbd>s</kbd>: Sort order | ||||
|   <kbd>g</kbd>: 檢視重設選項 | ||||
|   <kbd>R</kbd>: 重新命名分支 | ||||
|   <kbd>u</kbd>: View upstream options | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><enter></kbd>: 檢視提交 | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | 複製分支名稱到剪貼簿 |  | | ||||
| | `` i `` | 顯示 git-flow 選項 |  | | ||||
| | `` <space> `` | 檢出 |  | | ||||
| | `` n `` | 新分支 |  | | ||||
| | `` o `` | 建立拉取請求 |  | | ||||
| | `` O `` | 建立拉取請求選項 |  | | ||||
| | `` <c-y> `` | 複製拉取請求的 URL 到剪貼板 |  | | ||||
| | `` c `` | 根據名稱檢出 |  | | ||||
| | `` F `` | 強制檢出 |  | | ||||
| | `` d `` | View delete options |  | | ||||
| | `` r `` | 將已檢出的分支變基至此分支 |  | | ||||
| | `` M `` | 合併到當前檢出的分支 |  | | ||||
| | `` f `` | 從上游快進此分支 |  | | ||||
| | `` T `` | 建立標籤 |  | | ||||
| | `` s `` | Sort order |  | | ||||
| | `` g `` | 檢視重設選項 |  | | ||||
| | `` R `` | 重新命名分支 |  | | ||||
| | `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <enter> `` | 檢視提交 |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## 標籤 | ||||
|  | ||||
| <pre> | ||||
|   <kbd><space></kbd>: 檢出 | ||||
|   <kbd>d</kbd>: View delete options | ||||
|   <kbd>P</kbd>: 推送標籤 | ||||
|   <kbd>n</kbd>: 建立標籤 | ||||
|   <kbd>g</kbd>: 檢視重設選項 | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><enter></kbd>: 檢視提交 | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <space> `` | 檢出 |  | | ||||
| | `` d `` | View delete options |  | | ||||
| | `` P `` | 推送標籤 |  | | ||||
| | `` n `` | 建立標籤 |  | | ||||
| | `` g `` | 檢視重設選項 |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <enter> `` | 檢視提交 |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## 檔案 | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: 複製檔案名稱到剪貼簿 | ||||
|   <kbd><space></kbd>: 切換預存 | ||||
|   <kbd><c-b></kbd>: 篩選檔案 (預存/未預存) | ||||
|   <kbd>y</kbd>: Copy to clipboard | ||||
|   <kbd>c</kbd>: 提交變更 | ||||
|   <kbd>w</kbd>: 沒有預提交 hook 就提交更改 | ||||
|   <kbd>A</kbd>: 修正上次提交 | ||||
|   <kbd>C</kbd>: 使用 git 編輯器提交變更 | ||||
|   <kbd><c-f></kbd>: Find base commit for fixup | ||||
|   <kbd>e</kbd>: 編輯檔案 | ||||
|   <kbd>o</kbd>: 開啟檔案 | ||||
|   <kbd>i</kbd>: 忽略或排除檔案 | ||||
|   <kbd>r</kbd>: 重新整理檔案 | ||||
|   <kbd>s</kbd>: 收藏所有變更 | ||||
|   <kbd>S</kbd>: 檢視收藏選項 | ||||
|   <kbd>a</kbd>: 全部預存/取消預存 | ||||
|   <kbd><enter></kbd>: 選擇檔案中的單個程式碼塊/行,或展開/折疊目錄 | ||||
|   <kbd>d</kbd>: 檢視“捨棄更改”的選項 | ||||
|   <kbd>g</kbd>: 檢視上游重設選項 | ||||
|   <kbd>D</kbd>: 檢視重設選項 | ||||
|   <kbd>`</kbd>: 切換檔案樹狀視圖 | ||||
|   <kbd><c-t></kbd>: Open external diff tool (git difftool) | ||||
|   <kbd>M</kbd>: 開啟外部合併工具 (git mergetool) | ||||
|   <kbd>f</kbd>: 擷取 | ||||
|   <kbd>/</kbd>: 開始搜尋 | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | 複製檔案名稱到剪貼簿 |  | | ||||
| | `` <space> `` | 切換預存 |  | | ||||
| | `` <c-b> `` | 篩選檔案 (預存/未預存) |  | | ||||
| | `` y `` | Copy to clipboard |  | | ||||
| | `` c `` | 提交變更 |  | | ||||
| | `` w `` | 沒有預提交 hook 就提交更改 |  | | ||||
| | `` A `` | 修正上次提交 |  | | ||||
| | `` C `` | 使用 git 編輯器提交變更 |  | | ||||
| | `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> | | ||||
| | `` e `` | 編輯檔案 |  | | ||||
| | `` o `` | 開啟檔案 |  | | ||||
| | `` i `` | 忽略或排除檔案 |  | | ||||
| | `` r `` | 重新整理檔案 |  | | ||||
| | `` s `` | 收藏所有變更 |  | | ||||
| | `` S `` | 檢視收藏選項 |  | | ||||
| | `` a `` | 全部預存/取消預存 |  | | ||||
| | `` <enter> `` | 選擇檔案中的單個程式碼塊/行,或展開/折疊目錄 |  | | ||||
| | `` d `` | 檢視“捨棄更改”的選項 |  | | ||||
| | `` g `` | 檢視上游重設選項 |  | | ||||
| | `` D `` | 檢視重設選項 |  | | ||||
| | `` ` `` | 切換檔案樹狀視圖 |  | | ||||
| | `` <c-t> `` | Open external diff tool (git difftool) |  | | ||||
| | `` M `` | 開啟外部合併工具 (git mergetool) |  | | ||||
| | `` f `` | 擷取 |  | | ||||
| | `` / `` | 開始搜尋 |  | | ||||
|  | ||||
| ## 狀態 | ||||
|  | ||||
| <pre> | ||||
|   <kbd>o</kbd>: 開啟設定檔案 | ||||
|   <kbd>e</kbd>: 編輯設定檔案 | ||||
|   <kbd>u</kbd>: 檢查更新 | ||||
|   <kbd><enter></kbd>: 切換到最近使用的版本庫 | ||||
|   <kbd>a</kbd>: 顯示所有分支日誌 | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` o `` | 開啟設定檔案 |  | | ||||
| | `` e `` | 編輯設定檔案 |  | | ||||
| | `` u `` | 檢查更新 |  | | ||||
| | `` <enter> `` | 切換到最近使用的版本庫 |  | | ||||
| | `` a `` | 顯示所有分支日誌 |  | | ||||
|  | ||||
| ## 確認面板 | ||||
|  | ||||
| <pre> | ||||
|   <kbd><enter></kbd>: 確認 | ||||
|   <kbd><esc></kbd>: 關閉/取消 | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <enter> `` | 確認 |  | | ||||
| | `` <esc> `` | 關閉/取消 |  | | ||||
|  | ||||
| ## 遠端 | ||||
|  | ||||
| <pre> | ||||
|   <kbd>f</kbd>: 擷取遠端 | ||||
|   <kbd>n</kbd>: 新增遠端 | ||||
|   <kbd>d</kbd>: 移除遠端 | ||||
|   <kbd>e</kbd>: 編輯遠端 | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` f `` | 擷取遠端 |  | | ||||
| | `` n `` | 新增遠端 |  | | ||||
| | `` d `` | 移除遠端 |  | | ||||
| | `` e `` | 編輯遠端 |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|  | ||||
| ## 遠端分支 | ||||
|  | ||||
| <pre> | ||||
|   <kbd><c-o></kbd>: 複製分支名稱到剪貼簿 | ||||
|   <kbd><space></kbd>: 檢出 | ||||
|   <kbd>n</kbd>: 新分支 | ||||
|   <kbd>M</kbd>: 合併到當前檢出的分支 | ||||
|   <kbd>r</kbd>: 將已檢出的分支變基至此分支 | ||||
|   <kbd>d</kbd>: Delete remote tag | ||||
|   <kbd>u</kbd>: 將此分支設為當前分支之上游 | ||||
|   <kbd>s</kbd>: Sort order | ||||
|   <kbd>g</kbd>: 檢視重設選項 | ||||
|   <kbd>w</kbd>: View worktree options | ||||
|   <kbd><enter></kbd>: 檢視提交 | ||||
|   <kbd>/</kbd>: Filter the current view by text | ||||
| </pre> | ||||
| | Key | Action | Info | | ||||
| |-----|--------|-------------| | ||||
| | `` <c-o> `` | 複製分支名稱到剪貼簿 |  | | ||||
| | `` <space> `` | 檢出 |  | | ||||
| | `` n `` | 新分支 |  | | ||||
| | `` M `` | 合併到當前檢出的分支 |  | | ||||
| | `` r `` | 將已檢出的分支變基至此分支 |  | | ||||
| | `` d `` | Delete remote tag |  | | ||||
| | `` u `` | 將此分支設為當前分支之上游 |  | | ||||
| | `` s `` | Sort order |  | | ||||
| | `` g `` | 檢視重設選項 |  | | ||||
| | `` w `` | View worktree options |  | | ||||
| | `` <enter> `` | 檢視提交 |  | | ||||
| | `` / `` | Filter the current view by text |  | | ||||
|   | ||||
| @@ -14,7 +14,6 @@ import ( | ||||
| 	"fmt" | ||||
| 	"log" | ||||
| 	"os" | ||||
| 	"strings" | ||||
|  | ||||
| 	"github.com/jesseduffield/generics/maps" | ||||
| 	"github.com/jesseduffield/lazycore/pkg/utils" | ||||
| @@ -191,11 +190,11 @@ func formatSections(tr *i18n.TranslationSet, bindingSections []*bindingSection) | ||||
|  | ||||
| 	for _, section := range bindingSections { | ||||
| 		content += formatTitle(section.title) | ||||
| 		content += "<pre>\n" | ||||
| 		content += "| Key | Action | Info |\n" | ||||
| 		content += "|-----|--------|-------------|\n" | ||||
| 		for _, binding := range section.bindings { | ||||
| 			content += formatBinding(binding) | ||||
| 		} | ||||
| 		content += "</pre>\n" | ||||
| 	} | ||||
|  | ||||
| 	return content | ||||
| @@ -206,19 +205,15 @@ func formatTitle(title string) 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 != "" { | ||||
| 		result += fmt.Sprintf(" (%s)", binding.Alternative) | ||||
| 		action += fmt.Sprintf(" (%s)", binding.Alternative) | ||||
| 	} | ||||
| 	result += "\n" | ||||
|  | ||||
| 	return result | ||||
| } | ||||
|  | ||||
| func escapeAngleBrackets(str string) string { | ||||
| 	result := strings.ReplaceAll(str, ">", ">") | ||||
| 	result = strings.ReplaceAll(result, "<", "<") | ||||
| 	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 italicize(str string) string { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user