From 0aa6109d4d767cf77d4fb3eeefd0ac477d718ccf Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Thu, 4 Jan 2024 13:17:45 +1100 Subject: [PATCH] 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 --- docs/keybindings/Keybindings_en.md | 581 +++++++++++++------------- docs/keybindings/Keybindings_ja.md | 581 +++++++++++++------------- docs/keybindings/Keybindings_ko.md | 581 +++++++++++++------------- docs/keybindings/Keybindings_nl.md | 581 +++++++++++++------------- docs/keybindings/Keybindings_pl.md | 581 +++++++++++++------------- docs/keybindings/Keybindings_ru.md | 581 +++++++++++++------------- docs/keybindings/Keybindings_zh-CN.md | 581 +++++++++++++------------- docs/keybindings/Keybindings_zh-TW.md | 581 +++++++++++++------------- pkg/cheatsheet/generate.go | 21 +- 9 files changed, 2336 insertions(+), 2333 deletions(-) diff --git a/docs/keybindings/Keybindings_en.md b/docs/keybindings/Keybindings_en.md index be109f5ca..3417b9f19 100644 --- a/docs/keybindings/Keybindings_en.md +++ b/docs/keybindings/Keybindings_en.md @@ -6,356 +6,357 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ ## Global keybindings -
-  <c-r>: Switch to a recent repo
-  <pgup>: Scroll up main panel (fn+up/shift+k)
-  <pgdown>: Scroll down main panel (fn+down/shift+j)
-  @: 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
-  <c-z>: Redo
-  P: Push
-  p: Pull
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Switch to a recent repo | | +| `` (fn+up/shift+k) `` | Scroll up main panel | | +| `` (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 | | +| `` `` | View custom patch options | | +| `` m `` | View merge/rebase options | | +| `` R `` | Refresh | | +| `` + `` | Next screen mode (normal/half/fullscreen) | | +| `` _ `` | Prev screen mode | | +| `` ? `` | Open menu | | +| `` `` | View filter-by-path options | | +| `` W `` | Open diff menu | | +| `` `` | Open diff menu | | +| `` `` | 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. | +| `` `` | 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 -
-  ,: 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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` , `` | Previous page | | +| `` . `` | Next page | | +| `` < `` | Scroll to top | | +| `` > `` | Scroll to bottom | | +| `` v `` | Toggle range select | | +| `` `` | Range select down | | +| `` `` | Range select up | | +| `` / `` | Search the current view by text | | +| `` H `` | Scroll left | | +| `` L `` | Scroll right | | +| `` ] `` | Next tab | | +| `` [ `` | Previous tab | | ## Commit files -
-  <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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 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 | | +| `` `` | Open external diff tool (git difftool) | | +| `` `` | Toggle file included in patch | | +| `` a `` | Toggle all files included in patch | | +| `` `` | 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 -
-  <enter>: Confirm
-  <esc>: Close
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Confirm | | +| `` `` | Close | | ## Commits -
-  <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
-  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
-  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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Copy commit SHA to clipboard | | +| `` `` | 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) | | +| `` `` | Move commit down one | | +| `` `` | 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 | | +| `` `` | Open log menu | | +| `` w `` | View worktree options | | +| `` `` | 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) | | +| `` `` | Open external diff tool (git difftool) | | +| `` `` | View selected item's files | | +| `` / `` | Search the current view by text | | ## Confirmation panel -
-  <enter>: Confirm
-  <esc>: Close/Cancel
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Confirm | | +| `` `` | Close/Cancel | | ## Files -
-  <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
-  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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Copy the file name to the clipboard | | +| `` `` | Toggle staged | | +| `` `` | 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 | | +| `` `` | 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: | +| `` 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 | | +| `` `` | 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 | | +| `` `` | Open external diff tool (git difftool) | | +| `` M `` | Open external merge tool (git mergetool) | | +| `` f `` | Fetch | | +| `` / `` | Search the current view by text | | ## Local branches -
-  <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
-  w: View worktree options
-  <enter>: View commits
-  /: Filter the current view by text
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Copy branch name to clipboard | | +| `` i `` | Show git-flow options | | +| `` `` | Checkout | | +| `` n `` | New branch | | +| `` o `` | Create pull request | | +| `` O `` | Create pull request options | | +| `` `` | 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 | | +| `` `` | View commits | | +| `` / `` | Filter the current view by text | | ## Main panel (merging) -
-  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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` e `` | Edit file | | +| `` o `` | Open file | | +| `` `` | Select previous conflict | | +| `` `` | Select next conflict | | +| `` `` | Select previous hunk | | +| `` `` | Select next hunk | | +| `` z `` | Undo | | +| `` M `` | Open external merge tool (git mergetool) | | +| `` `` | Pick hunk | | +| `` b `` | Pick all hunks | | +| `` `` | Return to files panel | | ## Main panel (normal) -
-  mouse wheel down: Scroll down (fn+up)
-  mouse wheel up: Scroll up (fn+down)
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` mouse wheel down (fn+up) `` | Scroll down | | +| `` mouse wheel up (fn+down) `` | Scroll up | | ## Main panel (patch building) -
-  <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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Select previous hunk | | +| `` `` | Select next hunk | | +| `` v `` | Toggle range select | | +| `` a `` | Toggle select hunk | | +| `` `` | Copy the selected text to the clipboard | | +| `` o `` | Open file | | +| `` e `` | Edit file | | +| `` `` | Add/Remove line(s) to patch | | +| `` `` | Exit custom patch builder | | +| `` / `` | Search the current view by text | | ## Main panel (staging) -
-  <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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Select previous hunk | | +| `` `` | Select next hunk | | +| `` v `` | Toggle range select | | +| `` a `` | Toggle select hunk | | +| `` `` | Copy the selected text to the clipboard | | +| `` o `` | Open file | | +| `` e `` | Edit file | | +| `` `` | Return to files panel | | +| `` `` | Switch to other panel (staged/unstaged changes) | | +| `` `` | 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 -
-  <enter>: Execute
-  <esc>: Close
-  /: Filter the current view by text
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Execute | | +| `` `` | Close | | +| `` / `` | Filter the current view by text | | ## Reflog -
-  <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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Copy commit SHA to clipboard | | +| `` w `` | View worktree options | | +| `` `` | 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) | | +| `` `` | Reset cherry-picked (copied) commits selection | | +| `` `` | Open external diff tool (git difftool) | | +| `` `` | View commits | | +| `` / `` | Filter the current view by text | | ## Remote branches -
-  <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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Copy branch name to clipboard | | +| `` `` | 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 | | +| `` `` | View commits | | +| `` / `` | Filter the current view by text | | ## Remotes -
-  f: Fetch remote
-  n: Add new remote
-  d: Remove remote
-  e: Edit remote
-  /: Filter the current view by text
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` f `` | Fetch remote | | +| `` n `` | Add new remote | | +| `` d `` | Remove remote | | +| `` e `` | Edit remote | | +| `` / `` | Filter the current view by text | | ## Stash -
-  <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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Apply | | +| `` g `` | Pop | | +| `` d `` | Drop | | +| `` n `` | New branch | | +| `` r `` | Rename stash | | +| `` w `` | View worktree options | | +| `` `` | View selected item's files | | +| `` / `` | Filter the current view by text | | ## Status -
-  o: Open config file
-  e: Edit config file
-  u: Check for update
-  <enter>: Switch to a recent repo
-  a: Show all branch logs
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` o `` | Open config file | | +| `` e `` | Edit config file | | +| `` u `` | Check for update | | +| `` `` | Switch to a recent repo | | +| `` a `` | Show all branch logs | | ## Sub-commits -
-  <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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Copy commit SHA to clipboard | | +| `` w `` | View worktree options | | +| `` `` | 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) | | +| `` `` | Reset cherry-picked (copied) commits selection | | +| `` `` | Open external diff tool (git difftool) | | +| `` `` | View selected item's files | | +| `` / `` | Search the current view by text | | ## Submodules -
-  <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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Copy submodule name to clipboard | | +| `` `` | Enter submodule | | +| `` `` | 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 -
-  <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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Checkout | | +| `` d `` | View delete options | | +| `` P `` | Push tag | | +| `` n `` | Create tag | | +| `` g `` | View reset options | | +| `` w `` | View worktree options | | +| `` `` | View commits | | +| `` / `` | Filter the current view by text | | ## Worktrees -
-  n: Create worktree
-  <space>: Switch to worktree
-  <enter>: Switch to worktree
-  o: Open in editor
-  d: Remove worktree
-  /: Filter the current view by text
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` n `` | Create worktree | | +| `` `` | Switch to worktree | | +| `` `` | Switch to worktree | | +| `` o `` | Open in editor | | +| `` d `` | Remove worktree | | +| `` / `` | Filter the current view by text | | diff --git a/docs/keybindings/Keybindings_ja.md b/docs/keybindings/Keybindings_ja.md index 60193614f..1ea3d9cfd 100644 --- a/docs/keybindings/Keybindings_ja.md +++ b/docs/keybindings/Keybindings_ja.md @@ -6,356 +6,357 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ ## グローバルキーバインド -
-  <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)
-  <c-z>: リドゥ (via reflog) (experimental)
-  P: Push
-  p: Pull
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 最近使用したリポジトリに切り替え | | +| `` (fn+up/shift+k) `` | メインパネルを上にスクロール | | +| `` (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 | | +| `` : `` | カスタムコマンドを実行 | | +| `` `` | View custom patch options | | +| `` m `` | View merge/rebase options | | +| `` R `` | リフレッシュ | | +| `` + `` | 次のスクリーンモード (normal/half/fullscreen) | | +| `` _ `` | 前のスクリーンモード | | +| `` ? `` | メニューを開く | | +| `` `` | View filter-by-path options | | +| `` 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. | +| `` `` | リドゥ (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 | | ## 一覧パネルの操作 -
-  ,: 前のページ
-  .: 次のページ
-  <: 最上部までスクロール
-  >: 最下部までスクロール
-  v: 範囲選択を切り替え
-  <s-down>: Range select down
-  <s-up>: Range select up
-  /: 検索を開始
-  H: 左スクロール
-  L: 右スクロール
-  ]: 次のタブ
-  [: 前のタブ
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` , `` | 前のページ | | +| `` . `` | 次のページ | | +| `` < `` | 最上部までスクロール | | +| `` > `` | 最下部までスクロール | | +| `` v `` | 範囲選択を切り替え | | +| `` `` | Range select down | | +| `` `` | Range select up | | +| `` / `` | 検索を開始 | | +| `` H `` | 左スクロール | | +| `` L `` | 右スクロール | | +| `` ] `` | 次のタブ | | +| `` [ `` | 前のタブ | | ## Stash -
-  <space>: 適用
-  g: Pop
-  d: Drop
-  n: 新しいブランチを作成
-  r: Stashを変更
-  w: View worktree options
-  <enter>: View selected item's files
-  /: Filter the current view by text
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 適用 | | +| `` g `` | Pop | | +| `` d `` | Drop | | +| `` n `` | 新しいブランチを作成 | | +| `` r `` | Stashを変更 | | +| `` w `` | View worktree options | | +| `` `` | View selected item's files | | +| `` / `` | Filter the current view by text | | ## Sub-commits -
-  <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
-  /: 検索を開始
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | コミットのSHAをクリップボードにコピー | | +| `` w `` | View worktree options | | +| `` `` | コミットをチェックアウト | | +| `` y `` | コミットの情報をコピー | | +| `` o `` | ブラウザでコミットを開く | | +| `` n `` | コミットにブランチを作成 | | +| `` g `` | View reset options | | +| `` C `` | コミットをコピー (cherry-pick) | | +| `` `` | Reset cherry-picked (copied) commits selection | | +| `` `` | Open external diff tool (git difftool) | | +| `` `` | View selected item's files | | +| `` / `` | 検索を開始 | | ## Worktrees -
-  n: Create worktree
-  <space>: Switch to worktree
-  <enter>: Switch to worktree
-  o: Open in editor
-  d: Remove worktree
-  /: Filter the current view by text
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` n `` | Create worktree | | +| `` `` | Switch to worktree | | +| `` `` | Switch to worktree | | +| `` o `` | Open in editor | | +| `` d `` | Remove worktree | | +| `` / `` | Filter the current view by text | | ## コミット -
-  <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
-  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
-  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
-  /: 検索を開始
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | コミットのSHAをクリップボードにコピー | | +| `` `` | 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) | | +| `` `` | コミットを1つ下に移動 | | +| `` `` | コミットを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 `` | タグを作成 | | +| `` `` | ログメニューを開く | | +| `` w `` | View worktree options | | +| `` `` | コミットをチェックアウト | | +| `` y `` | コミットの情報をコピー | | +| `` o `` | ブラウザでコミットを開く | | +| `` n `` | コミットにブランチを作成 | | +| `` g `` | View reset options | | +| `` C `` | コミットをコピー (cherry-pick) | | +| `` `` | Open external diff tool (git difftool) | | +| `` `` | View selected item's files | | +| `` / `` | 検索を開始 | | ## コミットファイル -
-  <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)
-  `: ファイルツリーの表示を切り替え
-  /: 検索を開始
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | コミットされたファイル名をクリップボードにコピー | | +| `` c `` | Checkout file | | +| `` d `` | Discard this commit's changes to this file | | +| `` o `` | ファイルを開く | | +| `` e `` | ファイルを編集 | | +| `` `` | Open external diff tool (git difftool) | | +| `` `` | Toggle file included in patch | | +| `` a `` | Toggle all files included in patch | | +| `` `` | Enter file to add selected lines to the patch (or toggle directory collapsed) | | +| `` ` `` | ファイルツリーの表示を切り替え | | +| `` / `` | 検索を開始 | | ## コミットメッセージ -
-  <enter>: 確認
-  <esc>: 閉じる
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 確認 | | +| `` `` | 閉じる | | ## サブモジュール -
-  <c-o>: サブモジュール名をクリップボードにコピー
-  <enter>: サブモジュールを開く
-  <space>: サブモジュールを開く
-  d: サブモジュールを削除
-  u: サブモジュールを更新
-  n: サブモジュールを新規追加
-  e: サブモジュールのURLを更新
-  i: サブモジュールを初期化
-  b: View bulk submodule options
-  /: Filter the current view by text
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | サブモジュール名をクリップボードにコピー | | +| `` `` | サブモジュールを開く | | +| `` `` | サブモジュールを開く | | +| `` d `` | サブモジュールを削除 | | +| `` u `` | サブモジュールを更新 | | +| `` n `` | サブモジュールを新規追加 | | +| `` e `` | サブモジュールのURLを更新 | | +| `` i `` | サブモジュールを初期化 | | +| `` b `` | View bulk submodule options | | +| `` / `` | Filter the current view by text | | ## ステータス -
-  o: 設定ファイルを開く
-  e: 設定ファイルを編集
-  u: 更新を確認
-  <enter>: 最近使用したリポジトリに切り替え
-  a: すべてのブランチログを表示
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` o `` | 設定ファイルを開く | | +| `` e `` | 設定ファイルを編集 | | +| `` u `` | 更新を確認 | | +| `` `` | 最近使用したリポジトリに切り替え | | +| `` a `` | すべてのブランチログを表示 | | ## タグ -
-  <space>: チェックアウト
-  d: View delete options
-  P: タグをpush
-  n: タグを作成
-  g: View reset options
-  w: View worktree options
-  <enter>: コミットを閲覧
-  /: Filter the current view by text
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | チェックアウト | | +| `` d `` | View delete options | | +| `` P `` | タグをpush | | +| `` n `` | タグを作成 | | +| `` g `` | View reset options | | +| `` w `` | View worktree options | | +| `` `` | コミットを閲覧 | | +| `` / `` | Filter the current view by text | | ## ファイル -
-  <c-o>: ファイル名をクリップボードにコピー
-  <space>: ステージ/アンステージ
-  <c-b>: ファイルをフィルタ (ステージ/アンステージ)
-  y: Copy to clipboard
-  c: 変更をコミット
-  w: pre-commitフックを実行せずに変更をコミット
-  A: 最新のコミットにamend
-  C: gitエディタを使用して変更をコミット
-  <c-f>: Find base commit for fixup
-  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
-  /: 検索を開始
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | ファイル名をクリップボードにコピー | | +| `` `` | ステージ/アンステージ | | +| `` `` | ファイルをフィルタ (ステージ/アンステージ) | | +| `` y `` | Copy to clipboard | | +| `` c `` | 変更をコミット | | +| `` w `` | pre-commitフックを実行せずに変更をコミット | | +| `` A `` | 最新のコミットにamend | | +| `` C `` | gitエディタを使用して変更をコミット | | +| `` `` | 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: | +| `` e `` | ファイルを編集 | | +| `` o `` | ファイルを開く | | +| `` i `` | ファイルをignore | | +| `` r `` | ファイルをリフレッシュ | | +| `` s `` | 変更をstash | | +| `` S `` | View stash options | | +| `` a `` | すべての変更をステージ/アンステージ | | +| `` `` | 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 | | +| `` ` `` | ファイルツリーの表示を切り替え | | +| `` `` | Open external diff tool (git difftool) | | +| `` M `` | Git mergetoolを開く | | +| `` f `` | Fetch | | +| `` / `` | 検索を開始 | | ## ブランチ -
-  <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
-  w: View worktree options
-  <enter>: コミットを閲覧
-  /: Filter the current view by text
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | ブランチ名をクリップボードにコピー | | +| `` i `` | Show git-flow options | | +| `` `` | チェックアウト | | +| `` n `` | 新しいブランチを作成 | | +| `` o `` | Pull Requestを作成 | | +| `` O `` | Create pull request options | | +| `` `` | 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 | | +| `` `` | コミットを閲覧 | | +| `` / `` | Filter the current view by text | | ## メインパネル (Merging) -
-  e: ファイルを編集
-  o: ファイルを開く
-  <left>: 前のコンフリクトを選択
-  <right>: 次のコンフリクトを選択
-  <up>: 前のhunkを選択
-  <down>: 次のhunkを選択
-  z: アンドゥ
-  M: Git mergetoolを開く
-  <space>: Pick hunk
-  b: Pick all hunks
-  <esc>: ファイル一覧に戻る
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` e `` | ファイルを編集 | | +| `` o `` | ファイルを開く | | +| `` `` | 前のコンフリクトを選択 | | +| `` `` | 次のコンフリクトを選択 | | +| `` `` | 前のhunkを選択 | | +| `` `` | 次のhunkを選択 | | +| `` z `` | アンドゥ | | +| `` M `` | Git mergetoolを開く | | +| `` `` | Pick hunk | | +| `` b `` | Pick all hunks | | +| `` `` | ファイル一覧に戻る | | ## メインパネル (Normal) -
-  mouse wheel down: 下にスクロール (fn+up)
-  mouse wheel up: 上にスクロール (fn+down)
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` mouse wheel down (fn+up) `` | 下にスクロール | | +| `` mouse wheel up (fn+down) `` | 上にスクロール | | ## メインパネル (Patch Building) -
-  <left>: 前のhunkを選択
-  <right>: 次のhunkを選択
-  v: 範囲選択を切り替え
-  a: Hunk選択を切り替え
-  <c-o>: 選択されたテキストをクリップボードにコピー
-  o: ファイルを開く
-  e: ファイルを編集
-  <space>: 行をパッチに追加/削除
-  <esc>: Exit custom patch builder
-  /: 検索を開始
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 前のhunkを選択 | | +| `` `` | 次のhunkを選択 | | +| `` v `` | 範囲選択を切り替え | | +| `` a `` | Hunk選択を切り替え | | +| `` `` | 選択されたテキストをクリップボードにコピー | | +| `` o `` | ファイルを開く | | +| `` e `` | ファイルを編集 | | +| `` `` | 行をパッチに追加/削除 | | +| `` `` | Exit custom patch builder | | +| `` / `` | 検索を開始 | | ## メインパネル (Staging) -
-  <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エディタを使用して変更をコミット
-  /: 検索を開始
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 前のhunkを選択 | | +| `` `` | 次のhunkを選択 | | +| `` v `` | 範囲選択を切り替え | | +| `` a `` | Hunk選択を切り替え | | +| `` `` | 選択されたテキストをクリップボードにコピー | | +| `` o `` | ファイルを開く | | +| `` e `` | ファイルを編集 | | +| `` `` | ファイル一覧に戻る | | +| `` `` | パネルを切り替え | | +| `` `` | 選択行をステージ/アンステージ | | +| `` d `` | 変更を削除 (git reset) | | +| `` E `` | Edit hunk | | +| `` c `` | 変更をコミット | | +| `` w `` | pre-commitフックを実行せずに変更をコミット | | +| `` C `` | gitエディタを使用して変更をコミット | | +| `` / `` | 検索を開始 | | ## メニュー -
-  <enter>: 実行
-  <esc>: 閉じる
-  /: Filter the current view by text
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 実行 | | +| `` `` | 閉じる | | +| `` / `` | Filter the current view by text | | ## リモート -
-  f: リモートをfetch
-  n: リモートを新規追加
-  d: リモートを削除
-  e: リモートを編集
-  /: Filter the current view by text
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` f `` | リモートをfetch | | +| `` n `` | リモートを新規追加 | | +| `` d `` | リモートを削除 | | +| `` e `` | リモートを編集 | | +| `` / `` | Filter the current view by text | | ## リモートブランチ -
-  <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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | ブランチ名をクリップボードにコピー | | +| `` `` | チェックアウト | | +| `` 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 | | +| `` `` | コミットを閲覧 | | +| `` / `` | Filter the current view by text | | ## 参照ログ -
-  <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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | コミットのSHAをクリップボードにコピー | | +| `` w `` | View worktree options | | +| `` `` | コミットをチェックアウト | | +| `` y `` | コミットの情報をコピー | | +| `` o `` | ブラウザでコミットを開く | | +| `` n `` | コミットにブランチを作成 | | +| `` g `` | View reset options | | +| `` C `` | コミットをコピー (cherry-pick) | | +| `` `` | Reset cherry-picked (copied) commits selection | | +| `` `` | Open external diff tool (git difftool) | | +| `` `` | コミットを閲覧 | | +| `` / `` | Filter the current view by text | | ## 確認パネル -
-  <enter>: 確認
-  <esc>: 閉じる/キャンセル
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 確認 | | +| `` `` | 閉じる/キャンセル | | diff --git a/docs/keybindings/Keybindings_ko.md b/docs/keybindings/Keybindings_ko.md index c8aded8ce..b51bc16ac 100644 --- a/docs/keybindings/Keybindings_ko.md +++ b/docs/keybindings/Keybindings_ko.md @@ -6,356 +6,357 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ ## 글로벌 키 바인딩 -
-  <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) (실험적)
-  <c-z>: 다시 실행 (reflog) (실험적)
-  P: 푸시
-  p: 업데이트
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 최근에 사용한 저장소로 전환 | | +| `` (fn+up/shift+k) `` | 메인 패널을 위로 스크롤 | | +| `` (fn+down/shift+j) `` | 메인 패널을 아래로로 스크롤 | | +| `` @ `` | 명령어 로그 메뉴 열기 | | +| `` } `` | Diff 보기의 변경 사항 주위에 표시되는 컨텍스트의 크기를 늘리기 | | +| `` { `` | Diff 보기의 변경 사항 주위에 표시되는 컨텍스트 크기 줄이기 | | +| `` : `` | Execute custom command | | +| `` `` | 커스텀 Patch 옵션 보기 | | +| `` m `` | View merge/rebase options | | +| `` R `` | 새로고침 | | +| `` + `` | 다음 스크린 모드 (normal/half/fullscreen) | | +| `` _ `` | 이전 스크린 모드 | | +| `` ? `` | 매뉴 열기 | | +| `` `` | View filter-by-path options | | +| `` W `` | Diff 메뉴 열기 | | +| `` `` | Diff 메뉴 열기 | | +| `` `` | 공백문자를 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. | +| `` `` | 다시 실행 (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 -
-  ,: 이전 페이지
-  .: 다음 페이지
-  <: 맨 위로 스크롤 
-  >: 맨 아래로 스크롤 
-  v: 드래그 선택 전환
-  <s-down>: Range select down
-  <s-up>: Range select up
-  /: 검색 시작
-  H: 우 스크롤
-  L: 좌 스크롤
-  ]: 이전 탭
-  [: 다음 탭
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` , `` | 이전 페이지 | | +| `` . `` | 다음 페이지 | | +| `` < `` | 맨 위로 스크롤 | | +| `` > `` | 맨 아래로 스크롤 | | +| `` v `` | 드래그 선택 전환 | | +| `` `` | Range select down | | +| `` `` | Range select up | | +| `` / `` | 검색 시작 | | +| `` H `` | 우 스크롤 | | +| `` L `` | 좌 스크롤 | | +| `` ] `` | 이전 탭 | | +| `` [ `` | 다음 탭 | | ## Reflog -
-  <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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 커밋 SHA를 클립보드에 복사 | | +| `` w `` | View worktree options | | +| `` `` | 커밋을 체크아웃 | | +| `` y `` | 커밋 attribute 복사 | | +| `` o `` | 브라우저에서 커밋 열기 | | +| `` n `` | 커밋에서 새 브랜치를 만듭니다. | | +| `` g `` | View reset options | | +| `` C `` | 커밋을 복사 (cherry-pick) | | +| `` `` | Reset cherry-picked (copied) commits selection | | +| `` `` | Open external diff tool (git difftool) | | +| `` `` | 커밋 보기 | | +| `` / `` | Filter the current view by text | | ## Stash -
-  <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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 적용 | | +| `` g `` | Pop | | +| `` d `` | Drop | | +| `` n `` | 새 브랜치 생성 | | +| `` r `` | Rename stash | | +| `` w `` | View worktree options | | +| `` `` | View selected item's files | | +| `` / `` | Filter the current view by text | | ## Sub-commits -
-  <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
-  /: 검색 시작
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 커밋 SHA를 클립보드에 복사 | | +| `` w `` | View worktree options | | +| `` `` | 커밋을 체크아웃 | | +| `` y `` | 커밋 attribute 복사 | | +| `` o `` | 브라우저에서 커밋 열기 | | +| `` n `` | 커밋에서 새 브랜치를 만듭니다. | | +| `` g `` | View reset options | | +| `` C `` | 커밋을 복사 (cherry-pick) | | +| `` `` | Reset cherry-picked (copied) commits selection | | +| `` `` | Open external diff tool (git difftool) | | +| `` `` | View selected item's files | | +| `` / `` | 검색 시작 | | ## Worktrees -
-  n: Create worktree
-  <space>: Switch to worktree
-  <enter>: Switch to worktree
-  o: Open in editor
-  d: Remove worktree
-  /: Filter the current view by text
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` n `` | Create worktree | | +| `` `` | Switch to worktree | | +| `` `` | Switch to worktree | | +| `` o `` | Open in editor | | +| `` d `` | Remove worktree | | +| `` / `` | Filter the current view by text | | ## 메뉴 -
-  <enter>: 실행
-  <esc>: 닫기
-  /: Filter the current view by text
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 실행 | | +| `` `` | 닫기 | | +| `` / `` | Filter the current view by text | | ## 메인 패널 (Merging) -
-  e: 파일 편집
-  o: 파일 닫기
-  <left>: 이전 충돌을 선택
-  <right>: 다음 충돌을 선택
-  <up>: 이전 hunk를 선택
-  <down>: 다음 hunk를 선택
-  z: 되돌리기
-  M: Git mergetool를 열기
-  <space>: Pick hunk
-  b: Pick all hunks
-  <esc>: 파일 목록으로 돌아가기
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` e `` | 파일 편집 | | +| `` o `` | 파일 닫기 | | +| `` `` | 이전 충돌을 선택 | | +| `` `` | 다음 충돌을 선택 | | +| `` `` | 이전 hunk를 선택 | | +| `` `` | 다음 hunk를 선택 | | +| `` z `` | 되돌리기 | | +| `` M `` | Git mergetool를 열기 | | +| `` `` | Pick hunk | | +| `` b `` | Pick all hunks | | +| `` `` | 파일 목록으로 돌아가기 | | ## 메인 패널 (Normal) -
-  mouse wheel down: 아래로 스크롤 (fn+up)
-  mouse wheel up: 위로 스크롤 (fn+down)
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` mouse wheel down (fn+up) `` | 아래로 스크롤 | | +| `` mouse wheel up (fn+down) `` | 위로 스크롤 | | ## 메인 패널 (Patch Building) -
-  <left>: 이전 hunk를 선택
-  <right>: 다음 hunk를 선택
-  v: 드래그 선택 전환
-  a: Toggle select hunk
-  <c-o>: 선택한 텍스트를 클립보드에 복사
-  o: 파일 닫기
-  e: 파일 편집
-  <space>: Line(s)을 패치에 추가/삭제
-  <esc>: Exit custom patch builder
-  /: 검색 시작
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 이전 hunk를 선택 | | +| `` `` | 다음 hunk를 선택 | | +| `` v `` | 드래그 선택 전환 | | +| `` a `` | Toggle select hunk | | +| `` `` | 선택한 텍스트를 클립보드에 복사 | | +| `` o `` | 파일 닫기 | | +| `` e `` | 파일 편집 | | +| `` `` | Line(s)을 패치에 추가/삭제 | | +| `` `` | Exit custom patch builder | | +| `` / `` | 검색 시작 | | ## 메인 패널 (Staging) -
-  <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 편집기를 사용하여 변경 내용을 커밋합니다.
-  /: 검색 시작
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 이전 hunk를 선택 | | +| `` `` | 다음 hunk를 선택 | | +| `` v `` | 드래그 선택 전환 | | +| `` a `` | Toggle select hunk | | +| `` `` | 선택한 텍스트를 클립보드에 복사 | | +| `` o `` | 파일 닫기 | | +| `` e `` | 파일 편집 | | +| `` `` | 파일 목록으로 돌아가기 | | +| `` `` | 패널 전환 | | +| `` `` | 선택한 행을 staged / unstaged | | +| `` d `` | 변경을 삭제 (git reset) | | +| `` E `` | Edit hunk | | +| `` c `` | 커밋 변경내용 | | +| `` w `` | Commit changes without pre-commit hook | | +| `` C `` | Git 편집기를 사용하여 변경 내용을 커밋합니다. | | +| `` / `` | 검색 시작 | | ## 브랜치 -
-  <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
-  w: View worktree options
-  <enter>: 커밋 보기
-  /: Filter the current view by text
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 브랜치명을 클립보드에 복사 | | +| `` i `` | Git-flow 옵션 보기 | | +| `` `` | 체크아웃 | | +| `` n `` | 새 브랜치 생성 | | +| `` o `` | 풀 리퀘스트 생성 | | +| `` O `` | 풀 리퀘스트 생성 옵션 | | +| `` `` | 풀 리퀘스트 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 | | +| `` `` | 커밋 보기 | | +| `` / `` | Filter the current view by text | | ## 상태 -
-  o: 설정 파일 열기
-  e: 설정 파일 수정
-  u: 업데이트 확인
-  <enter>: 최근에 사용한 저장소로 전환
-  a: 모든 브랜치 로그 표시
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` o `` | 설정 파일 열기 | | +| `` e `` | 설정 파일 수정 | | +| `` u `` | 업데이트 확인 | | +| `` `` | 최근에 사용한 저장소로 전환 | | +| `` a `` | 모든 브랜치 로그 표시 | | ## 서브모듈 -
-  <c-o>: 서브모듈 이름을 클립보드에 복사
-  <enter>: 서브모듈 열기
-  <space>: 서브모듈 열기
-  d: 서브모듈 삭제
-  u: 서브모듈 업데이트
-  n: 새로운 서브모듈 추가
-  e: 서브모듈의 URL을 수정
-  i: 서브모듈 초기화
-  b: View bulk submodule options
-  /: Filter the current view by text
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 서브모듈 이름을 클립보드에 복사 | | +| `` `` | 서브모듈 열기 | | +| `` `` | 서브모듈 열기 | | +| `` d `` | 서브모듈 삭제 | | +| `` u `` | 서브모듈 업데이트 | | +| `` n `` | 새로운 서브모듈 추가 | | +| `` e `` | 서브모듈의 URL을 수정 | | +| `` i `` | 서브모듈 초기화 | | +| `` b `` | View bulk submodule options | | +| `` / `` | Filter the current view by text | | ## 원격 -
-  f: 원격을 업데이트
-  n: 새로운 Remote 추가
-  d: Remote를 삭제
-  e: Remote를 수정
-  /: Filter the current view by text
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` f `` | 원격을 업데이트 | | +| `` n `` | 새로운 Remote 추가 | | +| `` d `` | Remote를 삭제 | | +| `` e `` | Remote를 수정 | | +| `` / `` | Filter the current view by text | | ## 원격 브랜치 -
-  <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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 브랜치명을 클립보드에 복사 | | +| `` `` | 체크아웃 | | +| `` 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 | | +| `` `` | 커밋 보기 | | +| `` / `` | Filter the current view by text | | ## 커밋 -
-  <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
-  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
-  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
-  /: 검색 시작
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 커밋 SHA를 클립보드에 복사 | | +| `` `` | 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) | | +| `` `` | 커밋을 1개 아래로 이동 | | +| `` `` | 커밋을 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 | | +| `` `` | 로그 메뉴 열기 | | +| `` w `` | View worktree options | | +| `` `` | 커밋을 체크아웃 | | +| `` y `` | 커밋 attribute 복사 | | +| `` o `` | 브라우저에서 커밋 열기 | | +| `` n `` | 커밋에서 새 브랜치를 만듭니다. | | +| `` g `` | View reset options | | +| `` C `` | 커밋을 복사 (cherry-pick) | | +| `` `` | Open external diff tool (git difftool) | | +| `` `` | View selected item's files | | +| `` / `` | 검색 시작 | | ## 커밋 파일 -
-  <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)
-  `: 파일 트리뷰로 전환
-  /: 검색 시작
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 커밋한 파일명을 클립보드에 복사 | | +| `` c `` | Checkout file | | +| `` d `` | Discard this commit's changes to this file | | +| `` o `` | 파일 닫기 | | +| `` e `` | 파일 편집 | | +| `` `` | Open external diff tool (git difftool) | | +| `` `` | Toggle file included in patch | | +| `` a `` | Toggle all files included in patch | | +| `` `` | Enter file to add selected lines to the patch (or toggle directory collapsed) | | +| `` ` `` | 파일 트리뷰로 전환 | | +| `` / `` | 검색 시작 | | ## 커밋메시지 -
-  <enter>: 확인
-  <esc>: 닫기
-
+| 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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 체크아웃 | | +| `` d `` | View delete options | | +| `` P `` | 태그를 push | | +| `` n `` | 태그를 생성 | | +| `` g `` | View reset options | | +| `` w `` | View worktree options | | +| `` `` | 커밋 보기 | | +| `` / `` | Filter the current view by text | | ## 파일 -
-  <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
-  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
-  /: 검색 시작
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 파일명을 클립보드에 복사 | | +| `` `` | Staged 전환 | | +| `` `` | 파일을 필터하기 (Staged/unstaged) | | +| `` y `` | Copy to clipboard | | +| `` c `` | 커밋 변경내용 | | +| `` w `` | Commit changes without pre-commit hook | | +| `` A `` | 마지맛 커밋 수정 | | +| `` C `` | Git 편집기를 사용하여 변경 내용을 커밋합니다. | | +| `` `` | 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: | +| `` e `` | 파일 편집 | | +| `` o `` | 파일 닫기 | | +| `` i `` | Ignore file | | +| `` r `` | 파일 새로고침 | | +| `` s `` | 변경사항을 Stash | | +| `` S `` | Stash 옵션 보기 | | +| `` a `` | 모든 변경을 Staged/unstaged으로 전환 | | +| `` `` | 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 | | +| `` ` `` | 파일 트리뷰로 전환 | | +| `` `` | Open external diff tool (git difftool) | | +| `` M `` | Git mergetool를 열기 | | +| `` f `` | Fetch | | +| `` / `` | 검색 시작 | | ## 확인 패널 -
-  <enter>: 확인
-  <esc>: 닫기/취소
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 확인 | | +| `` `` | 닫기/취소 | | diff --git a/docs/keybindings/Keybindings_nl.md b/docs/keybindings/Keybindings_nl.md index 3339da2d2..188366558 100644 --- a/docs/keybindings/Keybindings_nl.md +++ b/docs/keybindings/Keybindings_nl.md @@ -6,356 +6,357 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ ## Globale sneltoetsen -
-  <c-r>: Wissel naar een recente repo
-  <pgup>: Scroll naar beneden vanaf hoofdpaneel (fn+up/shift+k)
-  <pgdown>: Scroll naar beneden vanaf hoofdpaneel (fn+down/shift+j)
-  @: 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)
-  <c-z>: Redo (via reflog) (experimenteel)
-  P: Push
-  p: Pull
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Wissel naar een recente repo | | +| `` (fn+up/shift+k) `` | Scroll naar beneden vanaf hoofdpaneel | | +| `` (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 | | +| `` `` | Bekijk aangepaste patch opties | | +| `` m `` | Bekijk merge/rebase opties | | +| `` R `` | Verversen | | +| `` + `` | Volgende scherm modus (normaal/half/groot) | | +| `` _ `` | Vorige scherm modus | | +| `` ? `` | Open menu | | +| `` `` | Bekijk scoping opties | | +| `` W `` | Open diff menu | | +| `` `` | Open diff menu | | +| `` `` | 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. | +| `` `` | 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 -
-  ,: 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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` , `` | Vorige pagina | | +| `` . `` | Volgende pagina | | +| `` < `` | Scroll naar boven | | +| `` > `` | Scroll naar beneden | | +| `` v `` | Toggle drag selecteer | | +| `` `` | Range select down | | +| `` `` | Range select up | | +| `` / `` | Start met zoeken | | +| `` H `` | Scroll left | | +| `` L `` | Scroll right | | +| `` ] `` | Volgende tabblad | | +| `` [ `` | Vorige tabblad | | ## Bestanden -
-  <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
-  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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Kopieer de bestandsnaam naar het klembord | | +| `` `` | Toggle staged | | +| `` `` | 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 | | +| `` `` | 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: | +| `` 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 | | +| `` `` | Stage individuele hunks/lijnen | | +| `` d `` | Bekijk 'veranderingen ongedaan maken' opties | | +| `` g `` | Bekijk upstream reset opties | | +| `` D `` | Bekijk reset opties | | +| `` ` `` | Toggle bestandsboom weergave | | +| `` `` | Open external diff tool (git difftool) | | +| `` M `` | Open external merge tool (git mergetool) | | +| `` f `` | Fetch | | +| `` / `` | Start met zoeken | | ## Bevestigingspaneel -
-  <enter>: Bevestig
-  <esc>: Sluiten
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Bevestig | | +| `` `` | Sluiten | | ## Branches -
-  <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
-  w: View worktree options
-  <enter>: Bekijk commits
-  /: Filter the current view by text
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Kopieer branch name naar klembord | | +| `` i `` | Laat git-flow opties zien | | +| `` `` | Uitchecken | | +| `` n `` | Nieuwe branch | | +| `` o `` | Maak een pull-request | | +| `` O `` | Bekijk opties voor pull-aanvraag | | +| `` `` | 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 | | +| `` `` | Bekijk commits | | +| `` / `` | Filter the current view by text | | ## Commit bericht -
-  <enter>: Bevestig
-  <esc>: Sluiten
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Bevestig | | +| `` `` | Sluiten | | ## Commit bestanden -
-  <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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 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 | | +| `` `` | Open external diff tool (git difftool) | | +| `` `` | Toggle bestand inbegrepen in patch | | +| `` a `` | Toggle all files included in patch | | +| `` `` | Enter bestand om geselecteerde regels toe te voegen aan de patch | | +| `` ` `` | Toggle bestandsboom weergave | | +| `` / `` | Start met zoeken | | ## Commits -
-  <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
-  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
-  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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Kopieer commit SHA naar klembord | | +| `` `` | 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 | | +| `` `` | Verplaats commit 1 naar beneden | | +| `` `` | 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 | | +| `` `` | Open log menu | | +| `` w `` | View worktree options | | +| `` `` | 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) | | +| `` `` | Open external diff tool (git difftool) | | +| `` `` | Bekijk gecommite bestanden | | +| `` / `` | Start met zoeken | | ## Menu -
-  <enter>: Uitvoeren
-  <esc>: Sluiten
-  /: Filter the current view by text
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Uitvoeren | | +| `` `` | Sluiten | | +| `` / `` | Filter the current view by text | | ## Mergen -
-  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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` e `` | Verander bestand | | +| `` o `` | Open bestand | | +| `` `` | Selecteer voorgaand conflict | | +| `` `` | Selecteer volgende conflict | | +| `` `` | Selecteer bovenste hunk | | +| `` `` | Selecteer onderste hunk | | +| `` z `` | Ongedaan maken | | +| `` M `` | Open external merge tool (git mergetool) | | +| `` `` | Kies stuk | | +| `` b `` | Kies beide stukken | | +| `` `` | Ga terug naar het bestanden paneel | | ## Normaal -
-  mouse wheel down: Scroll omlaag (fn+up)
-  mouse wheel up: Scroll omhoog (fn+down)
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` mouse wheel down (fn+up) `` | Scroll omlaag | | +| `` mouse wheel up (fn+down) `` | Scroll omhoog | | ## Patch bouwen -
-  <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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Selecteer de vorige hunk | | +| `` `` | Selecteer de volgende hunk | | +| `` v `` | Toggle drag selecteer | | +| `` a `` | Toggle selecteer hunk | | +| `` `` | Copy the selected text to the clipboard | | +| `` o `` | Open bestand | | +| `` e `` | Verander bestand | | +| `` `` | Voeg toe/verwijder lijn(en) in patch | | +| `` `` | Sluit lijn-bij-lijn modus | | +| `` / `` | Start met zoeken | | ## Reflog -
-  <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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Kopieer commit SHA naar klembord | | +| `` w `` | View worktree options | | +| `` `` | 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) | | +| `` `` | Reset cherry-picked (gekopieerde) commits selectie | | +| `` `` | Open external diff tool (git difftool) | | +| `` `` | Bekijk commits | | +| `` / `` | Filter the current view by text | | ## Remote branches -
-  <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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Kopieer branch name naar klembord | | +| `` `` | 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 | | +| `` `` | Bekijk commits | | +| `` / `` | Filter the current view by text | | ## Remotes -
-  f: Fetch remote
-  n: Voeg een nieuwe remote toe
-  d: Verwijder remote
-  e: Wijzig remote
-  /: Filter the current view by text
-
+| 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 -
-  <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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Selecteer de vorige hunk | | +| `` `` | Selecteer de volgende hunk | | +| `` v `` | Toggle drag selecteer | | +| `` a `` | Toggle selecteer hunk | | +| `` `` | Copy the selected text to the clipboard | | +| `` o `` | Open bestand | | +| `` e `` | Verander bestand | | +| `` `` | Ga terug naar het bestanden paneel | | +| `` `` | Ga naar een ander paneel | | +| `` `` | 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 -
-  <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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Toepassen | | +| `` g `` | Pop | | +| `` d `` | Laten vallen | | +| `` n `` | Nieuwe branch | | +| `` r `` | Rename stash | | +| `` w `` | View worktree options | | +| `` `` | Bekijk gecommite bestanden | | +| `` / `` | Filter the current view by text | | ## Status -
-  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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` o `` | Open config bestand | | +| `` e `` | Verander config bestand | | +| `` u `` | Check voor updates | | +| `` `` | Wissel naar een recente repo | | +| `` a `` | Alle logs van de branch laten zien | | ## Sub-commits -
-  <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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Kopieer commit SHA naar klembord | | +| `` w `` | View worktree options | | +| `` `` | 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) | | +| `` `` | Reset cherry-picked (gekopieerde) commits selectie | | +| `` `` | Open external diff tool (git difftool) | | +| `` `` | Bekijk gecommite bestanden | | +| `` / `` | Start met zoeken | | ## Submodules -
-  <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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Kopieer submodule naam naar klembord | | +| `` `` | Enter submodule | | +| `` `` | 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 -
-  <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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Uitchecken | | +| `` d `` | View delete options | | +| `` P `` | Push tag | | +| `` n `` | Creëer tag | | +| `` g `` | Bekijk reset opties | | +| `` w `` | View worktree options | | +| `` `` | Bekijk commits | | +| `` / `` | Filter the current view by text | | ## Worktrees -
-  n: Create worktree
-  <space>: Switch to worktree
-  <enter>: Switch to worktree
-  o: Open in editor
-  d: Remove worktree
-  /: Filter the current view by text
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` n `` | Create worktree | | +| `` `` | Switch to worktree | | +| `` `` | Switch to worktree | | +| `` o `` | Open in editor | | +| `` d `` | Remove worktree | | +| `` / `` | Filter the current view by text | | diff --git a/docs/keybindings/Keybindings_pl.md b/docs/keybindings/Keybindings_pl.md index b7f416e89..12fffb34e 100644 --- a/docs/keybindings/Keybindings_pl.md +++ b/docs/keybindings/Keybindings_pl.md @@ -6,356 +6,357 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ ## Globalne -
-  <c-r>: Switch to a recent repo
-  <pgup>: Scroll up main panel (fn+up/shift+k)
-  <pgdown>: Scroll down main panel (fn+down/shift+j)
-  @: 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
-  <c-z>: Redo
-  P: Push
-  p: Pull
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Switch to a recent repo | | +| `` (fn+up/shift+k) `` | Scroll up main panel | | +| `` (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ę | | +| `` `` | View custom patch options | | +| `` m `` | Widok scalenia/opcje zmiany bazy | | +| `` R `` | Odśwież | | +| `` + `` | Next screen mode (normal/half/fullscreen) | | +| `` _ `` | Prev screen mode | | +| `` ? `` | Open menu | | +| `` `` | View filter-by-path options | | +| `` W `` | Open diff menu | | +| `` `` | Open diff menu | | +| `` `` | 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. | +| `` `` | 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 -
-  ,: 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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` , `` | Previous page | | +| `` . `` | Next page | | +| `` < `` | Scroll to top | | +| `` > `` | Scroll to bottom | | +| `` v `` | Toggle range select | | +| `` `` | Range select down | | +| `` `` | Range select up | | +| `` / `` | Search the current view by text | | +| `` H `` | Scroll left | | +| `` L `` | Scroll right | | +| `` ] `` | Next tab | | +| `` [ `` | Previous tab | | ## Commit summary -
-  <enter>: Potwierdź
-  <esc>: Zamknij
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Potwierdź | | +| `` `` | Zamknij | | ## Commity -
-  <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
-  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
-  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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Copy commit SHA to clipboard | | +| `` `` | 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) | | +| `` `` | Przenieś commit 1 w dół | | +| `` `` | 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 | | +| `` `` | Open log menu | | +| `` w `` | View worktree options | | +| `` `` | 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) | | +| `` `` | Open external diff tool (git difftool) | | +| `` `` | Przeglądaj pliki commita | | +| `` / `` | Search the current view by text | | ## Confirmation panel -
-  <enter>: Potwierdź
-  <esc>: Zamknij
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Potwierdź | | +| `` `` | Zamknij | | ## Local branches -
-  <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
-  w: View worktree options
-  <enter>: View commits
-  /: Filter the current view by text
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Copy branch name to clipboard | | +| `` i `` | Show git-flow options | | +| `` `` | Przełącz | | +| `` n `` | Nowa gałąź | | +| `` o `` | Utwórz żądanie pobrania | | +| `` O `` | Utwórz opcje żądania ściągnięcia | | +| `` `` | 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 | | +| `` `` | View commits | | +| `` / `` | Filter the current view by text | | ## Main panel (patch building) -
-  <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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Poprzedni kawałek | | +| `` `` | Następny kawałek | | +| `` v `` | Toggle range select | | +| `` a `` | Toggle select hunk | | +| `` `` | Copy the selected text to the clipboard | | +| `` o `` | Otwórz plik | | +| `` e `` | Edytuj plik | | +| `` `` | Add/Remove line(s) to patch | | +| `` `` | Wyście z trybu "linia po linii" | | +| `` / `` | Search the current view by text | | ## Menu -
-  <enter>: Wykonaj
-  <esc>: Zamknij
-  /: Filter the current view by text
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Wykonaj | | +| `` `` | Zamknij | | +| `` / `` | Filter the current view by text | | ## Pliki -
-  <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
-  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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Copy the file name to the clipboard | | +| `` `` | Przełącz stan poczekalni | | +| `` `` | 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 | | +| `` `` | 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: | +| `` 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 | | +| `` `` | Zatwierdź pojedyncze linie | | +| `` d `` | Pokaż opcje porzucania zmian | | +| `` g `` | View upstream reset options | | +| `` D `` | Wyświetl opcje resetu | | +| `` ` `` | Toggle file tree view | | +| `` `` | Open external diff tool (git difftool) | | +| `` M `` | Open external merge tool (git mergetool) | | +| `` f `` | Pobierz | | +| `` / `` | Search the current view by text | | ## Pliki commita -
-  <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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 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 | | +| `` `` | Open external diff tool (git difftool) | | +| `` `` | Toggle file included in patch | | +| `` a `` | Toggle all files included in patch | | +| `` `` | Enter file to add selected lines to the patch (or toggle directory collapsed) | | +| `` ` `` | Toggle file tree view | | +| `` / `` | Search the current view by text | | ## Poczekalnia -
-  <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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Poprzedni kawałek | | +| `` `` | Następny kawałek | | +| `` v `` | Toggle range select | | +| `` a `` | Toggle select hunk | | +| `` `` | Copy the selected text to the clipboard | | +| `` o `` | Otwórz plik | | +| `` e `` | Edytuj plik | | +| `` `` | Wróć do panelu plików | | +| `` `` | Switch to other panel (staged/unstaged changes) | | +| `` `` | 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 -
-  <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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Copy commit SHA to clipboard | | +| `` w `` | View worktree options | | +| `` `` | 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) | | +| `` `` | Reset cherry-picked (copied) commits selection | | +| `` `` | Open external diff tool (git difftool) | | +| `` `` | View commits | | +| `` / `` | Filter the current view by text | | ## Remote branches -
-  <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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Copy branch name to clipboard | | +| `` `` | 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 | | +| `` `` | View commits | | +| `` / `` | Filter the current view by text | | ## Remotes -
-  f: Fetch remote
-  n: Add new remote
-  d: Remove remote
-  e: Edit remote
-  /: Filter the current view by text
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` f `` | Fetch remote | | +| `` n `` | Add new remote | | +| `` d `` | Remove remote | | +| `` e `` | Edit remote | | +| `` / `` | Filter the current view by text | | ## Scalanie -
-  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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` e `` | Edytuj plik | | +| `` o `` | Otwórz plik | | +| `` `` | Poprzedni konflikt | | +| `` `` | Następny konflikt | | +| `` `` | Wybierz poprzedni kawałek | | +| `` `` | Wybierz następny kawałek | | +| `` z `` | Cofnij | | +| `` M `` | Open external merge tool (git mergetool) | | +| `` `` | Wybierz kawałek | | +| `` b `` | Wybierz oba kawałki | | +| `` `` | Wróć do panelu plików | | ## Schowek -
-  <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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Zastosuj | | +| `` g `` | Wyciągnij | | +| `` d `` | Porzuć | | +| `` n `` | Nowa gałąź | | +| `` r `` | Rename stash | | +| `` w `` | View worktree options | | +| `` `` | Przeglądaj pliki commita | | +| `` / `` | Filter the current view by text | | ## Status -
-  o: Otwórz konfigurację
-  e: Edytuj konfigurację
-  u: Sprawdź aktualizacje
-  <enter>: Switch to a recent repo
-  a: Pokaż wszystkie logi gałęzi
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` o `` | Otwórz konfigurację | | +| `` e `` | Edytuj konfigurację | | +| `` u `` | Sprawdź aktualizacje | | +| `` `` | Switch to a recent repo | | +| `` a `` | Pokaż wszystkie logi gałęzi | | ## Sub-commits -
-  <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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Copy commit SHA to clipboard | | +| `` w `` | View worktree options | | +| `` `` | 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) | | +| `` `` | Reset cherry-picked (copied) commits selection | | +| `` `` | Open external diff tool (git difftool) | | +| `` `` | Przeglądaj pliki commita | | +| `` / `` | Search the current view by text | | ## Submodules -
-  <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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Copy submodule name to clipboard | | +| `` `` | Enter submodule | | +| `` `` | 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 -
-  <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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Przełącz | | +| `` d `` | View delete options | | +| `` P `` | Push tag | | +| `` n `` | Create tag | | +| `` g `` | Wyświetl opcje resetu | | +| `` w `` | View worktree options | | +| `` `` | View commits | | +| `` / `` | Filter the current view by text | | ## Worktrees -
-  n: Create worktree
-  <space>: Switch to worktree
-  <enter>: Switch to worktree
-  o: Open in editor
-  d: Remove worktree
-  /: Filter the current view by text
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` n `` | Create worktree | | +| `` `` | Switch to worktree | | +| `` `` | Switch to worktree | | +| `` o `` | Open in editor | | +| `` d `` | Remove worktree | | +| `` / `` | Filter the current view by text | | ## Zwykłe -
-  mouse wheel down: Przewiń w dół (fn+up)
-  mouse wheel up: Przewiń w górę (fn+down)
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` mouse wheel down (fn+up) `` | Przewiń w dół | | +| `` mouse wheel up (fn+down) `` | Przewiń w górę | | diff --git a/docs/keybindings/Keybindings_ru.md b/docs/keybindings/Keybindings_ru.md index 99e82c9ad..d5be80650 100644 --- a/docs/keybindings/Keybindings_ru.md +++ b/docs/keybindings/Keybindings_ru.md @@ -6,356 +6,357 @@ _Связки клавиш_ ## Глобальные сочетания клавиш -
-  <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) (экспериментальный)
-  <c-z>: Повторить (через reflog) (экспериментальный)
-  P: Отправить изменения
-  p: Получить и слить изменения
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Переключиться на последний репозиторий | | +| `` (fn+up/shift+k) `` | Прокрутить вверх главную панель | | +| `` (fn+down/shift+j) `` | Прокрутить вниз главную панель | | +| `` @ `` | Открыть меню журнала команд | | +| `` } `` | Увеличить размер контекста, отображаемого вокруг изменений в просмотрщике сравнении | | +| `` { `` | Уменьшите размер контекста, отображаемого вокруг изменений в просмотрщике сравнении | | +| `` : `` | Выполнить пользовательскую команду | | +| `` `` | Просмотреть пользовательские параметры патча | | +| `` m `` | Просмотреть параметры слияния/перебазирования | | +| `` R `` | Обновить | | +| `` + `` | Следующий режим экрана (нормальный/полуэкранный/полноэкранный) | | +| `` _ `` | Предыдущий режим экрана | | +| `` ? `` | Открыть меню | | +| `` `` | Просмотреть параметры фильтрации по пути | | +| `` W `` | Открыть меню сравнении | | +| `` `` | Открыть меню сравнении | | +| `` `` | Переключить отображение изменении пробелов в просмотрщике сравнении | | +| `` z `` | Отменить (через reflog) (экспериментальный) | Журнал ссылок (reflog) будет использоваться для определения того, какую команду git запустить, чтобы отменить последнюю команду git. Сюда не входят изменения в рабочем дереве; учитываются только коммиты. | +| `` `` | Повторить (через reflog) (экспериментальный) | Журнал ссылок (reflog) будет использоваться для определения того, какую команду git нужно запустить, чтобы повторить последнюю команду git. Сюда не входят изменения в рабочем дереве; учитываются только коммиты. | +| `` P `` | Отправить изменения | | +| `` p `` | Получить и слить изменения | | ## Навигация по панели списка -
-  ,: Предыдущая страница
-  .: Следующая страница
-  <: Пролистать наверх
-  >: Прокрутить вниз
-  v: Переключить выборку перетаскивания
-  <s-down>: Range select down
-  <s-up>: Range select up
-  /: Найти
-  H: Прокрутить влево
-  L: Прокрутить вправо
-  ]: Следующая вкладка
-  [: Предыдущая вкладка
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` , `` | Предыдущая страница | | +| `` . `` | Следующая страница | | +| `` < `` | Пролистать наверх | | +| `` > `` | Прокрутить вниз | | +| `` v `` | Переключить выборку перетаскивания | | +| `` `` | Range select down | | +| `` `` | Range select up | | +| `` / `` | Найти | | +| `` H `` | Прокрутить влево | | +| `` L `` | Прокрутить вправо | | +| `` ] `` | Следующая вкладка | | +| `` [ `` | Предыдущая вкладка | | ## Worktrees -
-  n: Create worktree
-  <space>: Switch to worktree
-  <enter>: Switch to worktree
-  o: Open in editor
-  d: Remove worktree
-  /: Filter the current view by text
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` n `` | Create worktree | | +| `` `` | Switch to worktree | | +| `` `` | Switch to worktree | | +| `` o `` | Open in editor | | +| `` d `` | Remove worktree | | +| `` / `` | Filter the current view by text | | ## Главная панель (Индексирование) -
-  <left>: Выбрать предыдущую часть
-  <right>: Выбрать следующую часть
-  v: Переключить выборку перетаскивания
-  a: Переключить выборку частей
-  <c-o>: Скопировать выделенный текст в буфер обмена
-  o: Открыть файл
-  e: Редактировать файл
-  <esc>: Вернуться к панели файлов
-  <tab>: Переключиться на другую панель (проиндексированные/непроиндексированные изменения)
-  <space>: Переключить строку в проиндексированные / непроиндексированные
-  d: Отменить изменение (git reset)
-  E: Изменить эту часть
-  c: Сохранить изменения
-  w: Закоммитить изменения без предварительного хука коммита
-  C: Сохранить изменения с помощью редактора git
-  /: Найти
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Выбрать предыдущую часть | | +| `` `` | Выбрать следующую часть | | +| `` v `` | Переключить выборку перетаскивания | | +| `` a `` | Переключить выборку частей | | +| `` `` | Скопировать выделенный текст в буфер обмена | | +| `` o `` | Открыть файл | | +| `` e `` | Редактировать файл | | +| `` `` | Вернуться к панели файлов | | +| `` `` | Переключиться на другую панель (проиндексированные/непроиндексированные изменения) | | +| `` `` | Переключить строку в проиндексированные / непроиндексированные | | +| `` d `` | Отменить изменение (git reset) | | +| `` E `` | Изменить эту часть | | +| `` c `` | Сохранить изменения | | +| `` w `` | Закоммитить изменения без предварительного хука коммита | | +| `` C `` | Сохранить изменения с помощью редактора git | | +| `` / `` | Найти | | ## Главная панель (Обычный) -
-  mouse wheel down: Прокрутить вниз (fn+up)
-  mouse wheel up: Прокрутить вверх (fn+down)
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` mouse wheel down (fn+up) `` | Прокрутить вниз | | +| `` mouse wheel up (fn+down) `` | Прокрутить вверх | | ## Главная панель (Слияние) -
-  e: Редактировать файл
-  o: Открыть файл
-  <left>: Выбрать предыдущий конфликт
-  <right>: Выбрать следующий конфликт
-  <up>: Выбрать предыдущую часть
-  <down>: Выбрать следующую часть
-  z: Отменить
-  M: Открыть внешний инструмент слияния (git mergetool)
-  <space>: Выбрать эту часть
-  b: Выбрать все части
-  <esc>: Вернуться к панели файлов
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` e `` | Редактировать файл | | +| `` o `` | Открыть файл | | +| `` `` | Выбрать предыдущий конфликт | | +| `` `` | Выбрать следующий конфликт | | +| `` `` | Выбрать предыдущую часть | | +| `` `` | Выбрать следующую часть | | +| `` z `` | Отменить | | +| `` M `` | Открыть внешний инструмент слияния (git mergetool) | | +| `` `` | Выбрать эту часть | | +| `` b `` | Выбрать все части | | +| `` `` | Вернуться к панели файлов | | ## Главная панель (сборка патчей) -
-  <left>: Выбрать предыдущую часть
-  <right>: Выбрать следующую часть
-  v: Переключить выборку перетаскивания
-  a: Переключить выборку частей
-  <c-o>: Скопировать выделенный текст в буфер обмена
-  o: Открыть файл
-  e: Редактировать файл
-  <space>: Добавить/удалить строку(и) для патча
-  <esc>: Выйти из сборщика пользовательских патчей
-  /: Найти
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Выбрать предыдущую часть | | +| `` `` | Выбрать следующую часть | | +| `` v `` | Переключить выборку перетаскивания | | +| `` a `` | Переключить выборку частей | | +| `` `` | Скопировать выделенный текст в буфер обмена | | +| `` o `` | Открыть файл | | +| `` e `` | Редактировать файл | | +| `` `` | Добавить/удалить строку(и) для патча | | +| `` `` | Выйти из сборщика пользовательских патчей | | +| `` / `` | Найти | | ## Журнал ссылок (Reflog) -
-  <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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Скопировать SHA коммита в буфер обмена | | +| `` w `` | View worktree options | | +| `` `` | Переключить коммит | | +| `` y `` | Скопировать атрибут коммита | | +| `` o `` | Открыть коммит в браузере | | +| `` n `` | Создать новую ветку с этого коммита | | +| `` g `` | Просмотреть параметры сброса | | +| `` C `` | Скопировать отобранные коммит (cherry-pick) | | +| `` `` | Сбросить отобранную (скопированную | cherry-picked) выборку коммитов | | +| `` `` | Open external diff tool (git difftool) | | +| `` `` | Просмотреть коммиты | | +| `` / `` | Filter the current view by text | | ## Коммиты -
-  <c-o>: Скопировать SHA коммита в буфер обмена
-  <c-r>: Сбросить отобранную (скопированную | cherry-picked) выборку коммитов
-  b: Просмотреть параметры бинарного поиска
-  s: Объединить несколько коммитов в один нижний
-  f: Объединить несколько коммитов в один отбросив сообщение коммита
-  r: Перефразировать коммит
-  R: Переписать коммит с помощью редактора
-  d: Удалить коммит
-  e: Изменить коммит
-  i: Start interactive rebase
-  p: Выбрать коммит (в середине перебазирования)
-  F: Создать fixup коммит для этого коммита
-  S: Объединить все 'fixup!' коммиты выше в выбранный коммит (автосохранение)
-  <c-j>: Переместить коммит вниз на один
-  <c-k>: Переместить коммит вверх на один
-  V: Вставить отобранные коммиты (cherry-pick)
-  B: Mark commit as base commit for rebase
-  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>: Просмотреть файлы выбранного элемента
-  /: Найти
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Скопировать SHA коммита в буфер обмена | | +| `` `` | Сбросить отобранную (скопированную | 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!' коммиты выше в выбранный коммит (автосохранение) | | +| `` `` | Переместить коммит вниз на один | | +| `` `` | Переместить коммит вверх на один | | +| `` 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 `` | Пометить коммит тегом | | +| `` `` | Открыть меню журнала | | +| `` w `` | View worktree options | | +| `` `` | Переключить коммит | | +| `` y `` | Скопировать атрибут коммита | | +| `` o `` | Открыть коммит в браузере | | +| `` n `` | Создать новую ветку с этого коммита | | +| `` g `` | Просмотреть параметры сброса | | +| `` C `` | Скопировать отобранные коммит (cherry-pick) | | +| `` `` | Open external diff tool (git difftool) | | +| `` `` | Просмотреть файлы выбранного элемента | | +| `` / `` | Найти | | ## Локальные Ветки -
-  <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
-  w: View worktree options
-  <enter>: Просмотреть коммиты
-  /: Filter the current view by text
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Скопировать название ветки в буфер обмена | | +| `` i `` | Показать параметры git-flow | | +| `` `` | Переключить | | +| `` n `` | Новая ветка | | +| `` o `` | Создать запрос на принятие изменений | | +| `` O `` | Создать параметры запроса принятие изменений | | +| `` `` | Скопировать 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 | | +| `` `` | Просмотреть коммиты | | +| `` / `` | Filter the current view by text | | ## Меню -
-  <enter>: Выполнить
-  <esc>: Закрыть
-  /: Filter the current view by text
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Выполнить | | +| `` `` | Закрыть | | +| `` / `` | Filter the current view by text | | ## Панель Подтверждения -
-  <enter>: Подтвердить
-  <esc>: Закрыть/отменить
-
+| 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>: Просмотреть файлы выбранного элемента
-  /: Найти
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Скопировать SHA коммита в буфер обмена | | +| `` w `` | View worktree options | | +| `` `` | Переключить коммит | | +| `` y `` | Скопировать атрибут коммита | | +| `` o `` | Открыть коммит в браузере | | +| `` n `` | Создать новую ветку с этого коммита | | +| `` g `` | Просмотреть параметры сброса | | +| `` C `` | Скопировать отобранные коммит (cherry-pick) | | +| `` `` | Сбросить отобранную (скопированную | cherry-picked) выборку коммитов | | +| `` `` | Open external diff tool (git difftool) | | +| `` `` | Просмотреть файлы выбранного элемента | | +| `` / `` | Найти | | ## Подмодули -
-  <c-o>: Скопировать название подмодуля в буфер обмена
-  <enter>: Ввести подмодуль
-  <space>: Ввести подмодуль
-  d: Удалить подмодуль
-  u: Обновить подмодуль
-  n: Добавить новый подмодуль
-  e: Обновить URL подмодуля
-  i: Инициализировать подмодуль
-  b: Просмотреть параметры массового подмодуля
-  /: Filter the current view by text
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Скопировать название подмодуля в буфер обмена | | +| `` `` | Ввести подмодуль | | +| `` `` | Ввести подмодуль | | +| `` d `` | Удалить подмодуль | | +| `` u `` | Обновить подмодуль | | +| `` n `` | Добавить новый подмодуль | | +| `` e `` | Обновить URL подмодуля | | +| `` i `` | Инициализировать подмодуль | | +| `` b `` | Просмотреть параметры массового подмодуля | | +| `` / `` | Filter the current view by text | | ## Сводка коммита -
-  <enter>: Подтвердить
-  <esc>: Закрыть
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Подтвердить | | +| `` `` | Закрыть | | ## Сохранить Изменения Файлов -
-  <c-o>: Скопировать закомиченное имя файла в буфер обмена
-  c: Переключить файл
-  d: Отменить изменения коммита в этом файле
-  o: Открыть файл
-  e: Редактировать файл
-  <c-t>: Open external diff tool (git difftool)
-  <space>: Переключить файлы включённые в патч
-  a: Переключить все файлы, включённые в патч
-  <enter>: Введите файл, чтобы добавить выбранные строки в патч (или свернуть каталог переключения)
-  `: Переключить вид дерева файлов
-  /: Найти
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Скопировать закомиченное имя файла в буфер обмена | | +| `` c `` | Переключить файл | | +| `` d `` | Отменить изменения коммита в этом файле | | +| `` o `` | Открыть файл | | +| `` e `` | Редактировать файл | | +| `` `` | Open external diff tool (git difftool) | | +| `` `` | Переключить файлы включённые в патч | | +| `` a `` | Переключить все файлы, включённые в патч | | +| `` `` | Введите файл, чтобы добавить выбранные строки в патч (или свернуть каталог переключения) | | +| `` ` `` | Переключить вид дерева файлов | | +| `` / `` | Найти | | ## Статус -
-  o: Открыть файл конфигурации
-  e: Редактировать файл конфигурации
-  u: Проверить обновления
-  <enter>: Переключиться на последний репозиторий
-  a: Показать все логи ветки
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` o `` | Открыть файл конфигурации | | +| `` e `` | Редактировать файл конфигурации | | +| `` u `` | Проверить обновления | | +| `` `` | Переключиться на последний репозиторий | | +| `` a `` | Показать все логи ветки | | ## Теги -
-  <space>: Переключить
-  d: View delete options
-  P: Отправить тег
-  n: Создать тег
-  g: Просмотреть параметры сброса
-  w: View worktree options
-  <enter>: Просмотреть коммиты
-  /: Filter the current view by text
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Переключить | | +| `` d `` | View delete options | | +| `` P `` | Отправить тег | | +| `` n `` | Создать тег | | +| `` g `` | Просмотреть параметры сброса | | +| `` w `` | View worktree options | | +| `` `` | Просмотреть коммиты | | +| `` / `` | Filter the current view by text | | ## Удалённые ветки -
-  <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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Скопировать название ветки в буфер обмена | | +| `` `` | Переключить | | +| `` n `` | Новая ветка | | +| `` M `` | Слияние с текущей переключённой веткой | | +| `` r `` | Перебазировать переключённую ветку на эту ветку | | +| `` d `` | Delete remote tag | | +| `` u `` | Установить как upstream-ветку переключённую ветку | | +| `` s `` | Порядок сортировки | | +| `` g `` | Просмотреть параметры сброса | | +| `` w `` | View worktree options | | +| `` `` | Просмотреть коммиты | | +| `` / `` | Filter the current view by text | | ## Удалённые репозитории -
-  f: Получение изменения из удалённого репозитория
-  n: Добавить новую удалённую ветку
-  d: Удалить удалённую ветку
-  e: Редактировать удалённый репозитории
-  /: Filter the current view by text
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` f `` | Получение изменения из удалённого репозитория | | +| `` n `` | Добавить новую удалённую ветку | | +| `` d `` | Удалить удалённую ветку | | +| `` e `` | Редактировать удалённый репозитории | | +| `` / `` | Filter the current view by text | | ## Файлы -
-  <c-o>: Скопировать название файла в буфер обмена
-  <space>: Переключить индекс
-  <c-b>: Фильтровать файлы (проиндексированные/непроиндексированные)
-  y: Copy to clipboard
-  c: Сохранить изменения
-  w: Закоммитить изменения без предварительного хука коммита
-  A: Правка последнего коммита
-  C: Сохранить изменения с помощью редактора git
-  <c-f>: Find base commit for fixup
-  e: Редактировать файл
-  o: Открыть файл
-  i: Игнорировать или исключить файл
-  r: Обновить файлы
-  s: Припрятать все изменения
-  S: Просмотреть параметры хранилища
-  a: Все проиндексированные/непроиндексированные
-  <enter>: Проиндексировать отдельные части/строки для файла или свернуть/развернуть для каталога
-  d: Просмотреть параметры «отмены изменении»
-  g: Просмотреть параметры сброса upstream-ветки
-  D: Просмотреть параметры сброса
-  `: Переключить вид дерева файлов
-  <c-t>: Open external diff tool (git difftool)
-  M: Открыть внешний инструмент слияния (git mergetool)
-  f: Получить изменения
-  /: Найти
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Скопировать название файла в буфер обмена | | +| `` `` | Переключить индекс | | +| `` `` | Фильтровать файлы (проиндексированные/непроиндексированные) | | +| `` y `` | Copy to clipboard | | +| `` c `` | Сохранить изменения | | +| `` w `` | Закоммитить изменения без предварительного хука коммита | | +| `` A `` | Правка последнего коммита | | +| `` C `` | Сохранить изменения с помощью редактора git | | +| `` `` | 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: | +| `` e `` | Редактировать файл | | +| `` o `` | Открыть файл | | +| `` i `` | Игнорировать или исключить файл | | +| `` r `` | Обновить файлы | | +| `` s `` | Припрятать все изменения | | +| `` S `` | Просмотреть параметры хранилища | | +| `` a `` | Все проиндексированные/непроиндексированные | | +| `` `` | Проиндексировать отдельные части/строки для файла или свернуть/развернуть для каталога | | +| `` d `` | Просмотреть параметры «отмены изменении» | | +| `` g `` | Просмотреть параметры сброса upstream-ветки | | +| `` D `` | Просмотреть параметры сброса | | +| `` ` `` | Переключить вид дерева файлов | | +| `` `` | Open external diff tool (git difftool) | | +| `` M `` | Открыть внешний инструмент слияния (git mergetool) | | +| `` f `` | Получить изменения | | +| `` / `` | Найти | | ## Хранилище -
-  <space>: Применить припрятанные изменения
-  g: Применить припрятанные изменения и тут же удалить их из хранилища
-  d: Удалить припрятанные изменения из хранилища
-  n: Новая ветка
-  r: Переименовать хранилище
-  w: View worktree options
-  <enter>: Просмотреть файлы выбранного элемента
-  /: Filter the current view by text
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | Применить припрятанные изменения | | +| `` g `` | Применить припрятанные изменения и тут же удалить их из хранилища | | +| `` d `` | Удалить припрятанные изменения из хранилища | | +| `` n `` | Новая ветка | | +| `` r `` | Переименовать хранилище | | +| `` w `` | View worktree options | | +| `` `` | Просмотреть файлы выбранного элемента | | +| `` / `` | Filter the current view by text | | diff --git a/docs/keybindings/Keybindings_zh-CN.md b/docs/keybindings/Keybindings_zh-CN.md index 3cdf0b65c..12a92d192 100644 --- a/docs/keybindings/Keybindings_zh-CN.md +++ b/docs/keybindings/Keybindings_zh-CN.md @@ -6,356 +6,357 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ ## 全局键绑定 -
-  <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）撤销「实验功能」
-  <c-z>: （通过 reflog）重做「实验功能」
-  P: 推送
-  p: 拉取
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 切换到最近的仓库 | | +| `` (fn+up/shift+k) `` | 向上滚动主面板 | | +| `` (fn+down/shift+j) `` | 向下滚动主面板 | | +| `` @ `` | 打开命令日志菜单 | | +| `` } `` | 扩大差异视图中显示的上下文范围 | | +| `` { `` | 缩小差异视图中显示的上下文范围 | | +| `` : `` | 执行自定义命令 | | +| `` `` | 查看自定义补丁选项 | | +| `` m `` | 查看 合并/变基 选项 | | +| `` R `` | 刷新 | | +| `` + `` | 下一屏模式（正常/半屏/全屏） | | +| `` _ `` | 上一屏模式 | | +| `` ? `` | 打开菜单 | | +| `` `` | 查看按路径过滤选项 | | +| `` W `` | 打开 diff 菜单 | | +| `` `` | 打开 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. | +| `` `` | （通过 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 `` | 拉取 | | ## 列表面板导航 -
-  ,: 上一页
-  .: 下一页
-  <: 滚动到顶部
-  >: 滚动到底部
-  v: 切换拖动选择
-  <s-down>: Range select down
-  <s-up>: Range select up
-  /: 开始搜索
-  H: 向左滚动
-  L: 向右滚动
-  ]: 下一个标签
-  [: 上一个标签
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` , `` | 上一页 | | +| `` . `` | 下一页 | | +| `` < `` | 滚动到顶部 | | +| `` > `` | 滚动到底部 | | +| `` v `` | 切换拖动选择 | | +| `` `` | Range select down | | +| `` `` | Range select up | | +| `` / `` | 开始搜索 | | +| `` H `` | 向左滚动 | | +| `` L `` | 向右滚动 | | +| `` ] `` | 下一个标签 | | +| `` [ `` | 上一个标签 | | ## Reflog 页面 -
-  <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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 将提交的 SHA 复制到剪贴板 | | +| `` w `` | View worktree options | | +| `` `` | 检出提交 | | +| `` y `` | Copy commit attribute | | +| `` o `` | 在浏览器中打开提交 | | +| `` n `` | 从提交创建新分支 | | +| `` g `` | 查看重置选项 | | +| `` C `` | 复制提交（拣选） | | +| `` `` | 重置已拣选（复制）的提交 | | +| `` `` | Open external diff tool (git difftool) | | +| `` `` | 查看提交 | | +| `` / `` | Filter the current view by text | | ## Worktrees -
-  n: Create worktree
-  <space>: Switch to worktree
-  <enter>: Switch to worktree
-  o: Open in editor
-  d: Remove worktree
-  /: Filter the current view by text
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` n `` | Create worktree | | +| `` `` | Switch to worktree | | +| `` `` | Switch to worktree | | +| `` o `` | Open in editor | | +| `` d `` | Remove worktree | | +| `` / `` | Filter the current view by text | | ## 分支页面 -
-  <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
-  w: View worktree options
-  <enter>: 查看提交
-  /: Filter the current view by text
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 将分支名称复制到剪贴板 | | +| `` i `` | 显示 git-flow 选项 | | +| `` `` | 检出 | | +| `` n `` | 新分支 | | +| `` o `` | 创建抓取请求 | | +| `` O `` | 创建抓取请求选项 | | +| `` `` | 将抓取请求 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 | | +| `` `` | 查看提交 | | +| `` / `` | Filter the current view by text | | ## 子提交 -
-  <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>: 查看提交的文件
-  /: 开始搜索
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 将提交的 SHA 复制到剪贴板 | | +| `` w `` | View worktree options | | +| `` `` | 检出提交 | | +| `` y `` | Copy commit attribute | | +| `` o `` | 在浏览器中打开提交 | | +| `` n `` | 从提交创建新分支 | | +| `` g `` | 查看重置选项 | | +| `` C `` | 复制提交（拣选） | | +| `` `` | 重置已拣选（复制）的提交 | | +| `` `` | Open external diff tool (git difftool) | | +| `` `` | 查看提交的文件 | | +| `` / `` | 开始搜索 | | ## 子模块 -
-  <c-o>: 将子模块名称复制到剪贴板
-  <enter>: 输入子模块
-  <space>: 输入子模块
-  d: 删除子模块
-  u: 更新子模块
-  n: 添加新的子模块
-  e: 更新子模块 URL
-  i: 初始化子模块
-  b: 查看批量子模块选项
-  /: Filter the current view by text
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 将子模块名称复制到剪贴板 | | +| `` `` | 输入子模块 | | +| `` `` | 输入子模块 | | +| `` d `` | 删除子模块 | | +| `` u `` | 更新子模块 | | +| `` n `` | 添加新的子模块 | | +| `` e `` | 更新子模块 URL | | +| `` i `` | 初始化子模块 | | +| `` b `` | 查看批量子模块选项 | | +| `` / `` | Filter the current view by text | | ## 提交 -
-  <c-o>: 将提交的 SHA 复制到剪贴板
-  <c-r>: 重置已拣选（复制）的提交
-  b: 查看二分查找选项
-  s: 向下压缩
-  f: 修正提交（fixup）
-  r: 改写提交
-  R: 使用编辑器重命名提交
-  d: 删除提交
-  e: 编辑提交
-  i: Start interactive rebase
-  p: 选择提交（变基过程中）
-  F: 创建修正提交
-  S: 压缩在所选提交之上的所有“fixup!”提交（自动压缩）
-  <c-j>: 下移提交
-  <c-k>: 上移提交
-  V: 粘贴提交（拣选）
-  B: Mark commit as base commit for rebase
-  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>: 查看提交的文件
-  /: 开始搜索
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 将提交的 SHA 复制到剪贴板 | | +| `` `` | 重置已拣选（复制）的提交 | | +| `` 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!”提交（自动压缩） | | +| `` `` | 下移提交 | | +| `` `` | 上移提交 | | +| `` 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 `` | 标签提交 | | +| `` `` | 打开日志菜单 | | +| `` w `` | View worktree options | | +| `` `` | 检出提交 | | +| `` y `` | Copy commit attribute | | +| `` o `` | 在浏览器中打开提交 | | +| `` n `` | 从提交创建新分支 | | +| `` g `` | 查看重置选项 | | +| `` C `` | 复制提交（拣选） | | +| `` `` | Open external diff tool (git difftool) | | +| `` `` | 查看提交的文件 | | +| `` / `` | 开始搜索 | | ## 提交文件 -
-  <c-o>: 将提交的文件名复制到剪贴板
-  c: 检出文件
-  d: 放弃对此文件的提交更改
-  o: 打开文件
-  e: 编辑文件
-  <c-t>: Open external diff tool (git difftool)
-  <space>: 补丁中包含的切换文件
-  a: Toggle all files included in patch
-  <enter>: 输入文件以将所选行添加到补丁中（或切换目录折叠）
-  `: 切换文件树视图
-  /: 开始搜索
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 将提交的文件名复制到剪贴板 | | +| `` c `` | 检出文件 | | +| `` d `` | 放弃对此文件的提交更改 | | +| `` o `` | 打开文件 | | +| `` e `` | 编辑文件 | | +| `` `` | Open external diff tool (git difftool) | | +| `` `` | 补丁中包含的切换文件 | | +| `` a `` | Toggle all files included in patch | | +| `` `` | 输入文件以将所选行添加到补丁中（或切换目录折叠） | | +| `` ` `` | 切换文件树视图 | | +| `` / `` | 开始搜索 | | ## 提交讯息 -
-  <enter>: 确认
-  <esc>: 关闭
-
+| 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
-  e: 编辑文件
-  o: 打开文件
-  i: 忽略文件
-  r: 刷新文件
-  s: 将所有更改加入贮藏
-  S: 查看贮藏选项
-  a: 切换所有文件的暂存状态
-  <enter>: 暂存单个 块/行 用于文件, 或 折叠/展开 目录
-  d: 查看'放弃更改'选项
-  g: 查看上游重置选项
-  D: 查看重置选项
-  `: 切换文件树视图
-  <c-t>: Open external diff tool (git difftool)
-  M: 打开外部合并工具 (git mergetool)
-  f: 抓取
-  /: 开始搜索
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 将文件名复制到剪贴板 | | +| `` `` | 切换暂存状态 | | +| `` `` | Filter files by status | | +| `` y `` | Copy to clipboard | | +| `` c `` | 提交更改 | | +| `` w `` | 提交更改而无需预先提交钩子 | | +| `` A `` | 修补最后一次提交 | | +| `` C `` | 提交更改（使用编辑器编辑提交信息） | | +| `` `` | 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: | +| `` e `` | 编辑文件 | | +| `` o `` | 打开文件 | | +| `` i `` | 忽略文件 | | +| `` r `` | 刷新文件 | | +| `` s `` | 将所有更改加入贮藏 | | +| `` S `` | 查看贮藏选项 | | +| `` a `` | 切换所有文件的暂存状态 | | +| `` `` | 暂存单个 块/行 用于文件, 或 折叠/展开 目录 | | +| `` d `` | 查看'放弃更改'选项 | | +| `` g `` | 查看上游重置选项 | | +| `` D `` | 查看重置选项 | | +| `` ` `` | 切换文件树视图 | | +| `` `` | Open external diff tool (git difftool) | | +| `` M `` | 打开外部合并工具 (git mergetool) | | +| `` f `` | 抓取 | | +| `` / `` | 开始搜索 | | ## 构建补丁中 -
-  <left>: 选择上一个区块
-  <right>: 选择下一个区块
-  v: 切换拖动选择
-  a: 切换选择区块
-  <c-o>: 将选中文本复制到剪贴板
-  o: 打开文件
-  e: 编辑文件
-  <space>: 添加/移除 行到补丁
-  <esc>: 退出逐行模式
-  /: 开始搜索
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 选择上一个区块 | | +| `` `` | 选择下一个区块 | | +| `` v `` | 切换拖动选择 | | +| `` a `` | 切换选择区块 | | +| `` `` | 将选中文本复制到剪贴板 | | +| `` o `` | 打开文件 | | +| `` e `` | 编辑文件 | | +| `` `` | 添加/移除 行到补丁 | | +| `` `` | 退出逐行模式 | | +| `` / `` | 开始搜索 | | ## 标签页面 -
-  <space>: 检出
-  d: View delete options
-  P: 推送标签
-  n: 创建标签
-  g: 查看重置选项
-  w: View worktree options
-  <enter>: 查看提交
-  /: Filter the current view by text
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 检出 | | +| `` d `` | View delete options | | +| `` P `` | 推送标签 | | +| `` n `` | 创建标签 | | +| `` g `` | 查看重置选项 | | +| `` w `` | View worktree options | | +| `` `` | 查看提交 | | +| `` / `` | Filter the current view by text | | ## 正在合并 -
-  e: 编辑文件
-  o: 打开文件
-  <left>: 选择上一个冲突
-  <right>: 选择下一个冲突
-  <up>: 选择顶部块
-  <down>: 选择底部块
-  z: 撤销
-  M: 打开外部合并工具 (git mergetool)
-  <space>: 选中区块
-  b: 选中所有区块
-  <esc>: 返回文件面板
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` e `` | 编辑文件 | | +| `` o `` | 打开文件 | | +| `` `` | 选择上一个冲突 | | +| `` `` | 选择下一个冲突 | | +| `` `` | 选择顶部块 | | +| `` `` | 选择底部块 | | +| `` z `` | 撤销 | | +| `` M `` | 打开外部合并工具 (git mergetool) | | +| `` `` | 选中区块 | | +| `` b `` | 选中所有区块 | | +| `` `` | 返回文件面板 | | ## 正在暂存 -
-  <left>: 选择上一个区块
-  <right>: 选择下一个区块
-  v: 切换拖动选择
-  a: 切换选择区块
-  <c-o>: 将选中文本复制到剪贴板
-  o: 打开文件
-  e: 编辑文件
-  <esc>: 返回文件面板
-  <tab>: 切换到其他面板
-  <space>: 切换行暂存状态
-  d: 取消变更 (git reset)
-  E: Edit hunk
-  c: 提交更改
-  w: 提交更改而无需预先提交钩子
-  C: 提交更改（使用编辑器编辑提交信息）
-  /: 开始搜索
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 选择上一个区块 | | +| `` `` | 选择下一个区块 | | +| `` v `` | 切换拖动选择 | | +| `` a `` | 切换选择区块 | | +| `` `` | 将选中文本复制到剪贴板 | | +| `` o `` | 打开文件 | | +| `` e `` | 编辑文件 | | +| `` `` | 返回文件面板 | | +| `` `` | 切换到其他面板 | | +| `` `` | 切换行暂存状态 | | +| `` d `` | 取消变更 (git reset) | | +| `` E `` | Edit hunk | | +| `` c `` | 提交更改 | | +| `` w `` | 提交更改而无需预先提交钩子 | | +| `` C `` | 提交更改（使用编辑器编辑提交信息） | | +| `` / `` | 开始搜索 | | ## 正常 -
-  mouse wheel down: 向下滚动 (fn+up)
-  mouse wheel up: 向上滚动 (fn+down)
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` mouse wheel down (fn+up) `` | 向下滚动 | | +| `` mouse wheel up (fn+down) `` | 向上滚动 | | ## 状态 -
-  o: 打开配置文件
-  e: 编辑配置文件
-  u: 检查更新
-  <enter>: 切换到最近的仓库
-  a: 显示所有分支的日志
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` o `` | 打开配置文件 | | +| `` e `` | 编辑配置文件 | | +| `` u `` | 检查更新 | | +| `` `` | 切换到最近的仓库 | | +| `` a `` | 显示所有分支的日志 | | ## 确认面板 -
-  <enter>: 确认
-  <esc>: 关闭
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 确认 | | +| `` `` | 关闭 | | ## 菜单 -
-  <enter>: 执行
-  <esc>: 关闭
-  /: Filter the current view by text
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 执行 | | +| `` `` | 关闭 | | +| `` / `` | Filter the current view by text | | ## 贮藏 -
-  <space>: 应用
-  g: 应用并删除
-  d: 删除
-  n: 新分支
-  r: Rename stash
-  w: View worktree options
-  <enter>: 查看提交的文件
-  /: Filter the current view by text
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 应用 | | +| `` g `` | 应用并删除 | | +| `` d `` | 删除 | | +| `` n `` | 新分支 | | +| `` r `` | Rename stash | | +| `` w `` | View worktree options | | +| `` `` | 查看提交的文件 | | +| `` / `` | Filter the current view by text | | ## 远程分支 -
-  <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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 将分支名称复制到剪贴板 | | +| `` `` | 检出 | | +| `` n `` | 新分支 | | +| `` M `` | 合并到当前检出的分支 | | +| `` r `` | 将已检出的分支变基到该分支 | | +| `` d `` | Delete remote tag | | +| `` u `` | 设置为检出分支的上游 | | +| `` s `` | Sort order | | +| `` g `` | 查看重置选项 | | +| `` w `` | View worktree options | | +| `` `` | 查看提交 | | +| `` / `` | Filter the current view by text | | ## 远程页面 -
-  f: 抓取远程仓库
-  n: 添加新的远程仓库
-  d: 删除远程
-  e: 编辑远程仓库
-  /: Filter the current view by text
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` f `` | 抓取远程仓库 | | +| `` n `` | 添加新的远程仓库 | | +| `` d `` | 删除远程 | | +| `` e `` | 编辑远程仓库 | | +| `` / `` | Filter the current view by text | | diff --git a/docs/keybindings/Keybindings_zh-TW.md b/docs/keybindings/Keybindings_zh-TW.md index 2511cf206..4cb0180c9 100644 --- a/docs/keybindings/Keybindings_zh-TW.md +++ b/docs/keybindings/Keybindings_zh-TW.md @@ -6,356 +6,357 @@ _說明：`` 表示 Ctrl+B、`` 表示 Alt+B，`B`表示 Shift+B_ ## 全局快捷鍵 -
-  <c-r>: 切換到最近使用的版本庫
-  <pgup>: 向上捲動主面板 (fn+up/shift+k)
-  <pgdown>: 向下捲動主面板 (fn+down/shift+j)
-  @: 開啟命令記錄選單
-  }: 增加差異檢視中顯示變更周圍上下文的大小
-  {: 減小差異檢視中顯示變更周圍上下文的大小
-  :: 執行自訂命令
-  <c-p>: 檢視自訂補丁選項
-  m: 查看合併/變基選項
-  R: 重新整理
-  +: 下一個螢幕模式（常規/半螢幕/全螢幕）
-  _: 上一個螢幕模式
-  ?: 開啟選單
-  <c-s>: 檢視篩選路徑選項
-  W: 開啟差異比較選單
-  <c-e>: 開啟差異比較選單
-  <c-w>: 切換是否在差異檢視中顯示空格變更
-  z: 復原
-  <c-z>: 取消復原
-  P: 推送
-  p: 拉取
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 切換到最近使用的版本庫 | | +| `` (fn+up/shift+k) `` | 向上捲動主面板 | | +| `` (fn+down/shift+j) `` | 向下捲動主面板 | | +| `` @ `` | 開啟命令記錄選單 | | +| `` } `` | 增加差異檢視中顯示變更周圍上下文的大小 | | +| `` { `` | 減小差異檢視中顯示變更周圍上下文的大小 | | +| `` : `` | 執行自訂命令 | | +| `` `` | 檢視自訂補丁選項 | | +| `` m `` | 查看合併/變基選項 | | +| `` R `` | 重新整理 | | +| `` + `` | 下一個螢幕模式（常規/半螢幕/全螢幕） | | +| `` _ `` | 上一個螢幕模式 | | +| `` ? `` | 開啟選單 | | +| `` `` | 檢視篩選路徑選項 | | +| `` W `` | 開啟差異比較選單 | | +| `` `` | 開啟差異比較選單 | | +| `` `` | 切換是否在差異檢視中顯示空格變更 | | +| `` z `` | 復原 | 將使用 reflog 確定要運行哪個 git 命令以復原上一個 git 命令。這不包括工作區的更改；只考慮提交。 | +| `` `` | 取消復原 | 將使用 reflog 確定要運行哪個 git 命令以重作上一個 git 命令。這不包括工作區的更改；只考慮提交。 | +| `` P `` | 推送 | | +| `` p `` | 拉取 | | ## 列表面板導航 -
-  ,: 上一頁
-  .: 下一頁
-  <: 捲動到頂部
-  >: 捲動到底部
-  v: 切換拖曳選擇
-  <s-down>: Range select down
-  <s-up>: Range select up
-  /: 開始搜尋
-  H: 向左捲動
-  L: 向右捲動
-  ]: 下一個索引標籤
-  [: 上一個索引標籤
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` , `` | 上一頁 | | +| `` . `` | 下一頁 | | +| `` < `` | 捲動到頂部 | | +| `` > `` | 捲動到底部 | | +| `` v `` | 切換拖曳選擇 | | +| `` `` | Range select down | | +| `` `` | Range select up | | +| `` / `` | 開始搜尋 | | +| `` H `` | 向左捲動 | | +| `` L `` | 向右捲動 | | +| `` ] `` | 下一個索引標籤 | | +| `` [ `` | 上一個索引標籤 | | ## Reflog -
-  <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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 複製提交 SHA 到剪貼簿 | | +| `` w `` | View worktree options | | +| `` `` | 檢出提交 | | +| `` y `` | 複製提交屬性 | | +| `` o `` | 在瀏覽器中開啟提交 | | +| `` n `` | 從提交建立新分支 | | +| `` g `` | 檢視重設選項 | | +| `` C `` | 複製提交 (揀選) | | +| `` `` | 重設選定的揀選 (複製) 提交 | | +| `` `` | Open external diff tool (git difftool) | | +| `` `` | 檢視提交 | | +| `` / `` | Filter the current view by text | | ## Worktrees -
-  n: Create worktree
-  <space>: Switch to worktree
-  <enter>: Switch to worktree
-  o: Open in editor
-  d: Remove worktree
-  /: Filter the current view by text
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` n `` | Create worktree | | +| `` `` | Switch to worktree | | +| `` `` | Switch to worktree | | +| `` o `` | Open in editor | | +| `` d `` | Remove worktree | | +| `` / `` | Filter the current view by text | | ## 主視窗 (一般) -
-  mouse wheel down: 向下捲動 (fn+up)
-  mouse wheel up: 向上捲動 (fn+down)
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` mouse wheel down (fn+up) `` | 向下捲動 | | +| `` mouse wheel up (fn+down) `` | 向上捲動 | | ## 主視窗 (合併中) -
-  e: 編輯檔案
-  o: 開啟檔案
-  <left>: 選擇上一個衝突
-  <right>: 選擇下一個衝突
-  <up>: 選擇上一段
-  <down>: 選擇下一段
-  z: 復原
-  M: 開啟外部合併工具 (git mergetool)
-  <space>: 挑選程式碼片段
-  b: 挑選所有程式碼片段
-  <esc>: 返回檔案面板
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` e `` | 編輯檔案 | | +| `` o `` | 開啟檔案 | | +| `` `` | 選擇上一個衝突 | | +| `` `` | 選擇下一個衝突 | | +| `` `` | 選擇上一段 | | +| `` `` | 選擇下一段 | | +| `` z `` | 復原 | | +| `` M `` | 開啟外部合併工具 (git mergetool) | | +| `` `` | 挑選程式碼片段 | | +| `` b `` | 挑選所有程式碼片段 | | +| `` `` | 返回檔案面板 | | ## 主視窗 (預存中) -
-  <left>: 選擇上一段
-  <right>: 選擇下一段
-  v: 切換拖曳選擇
-  a: 切換選擇程式碼塊
-  <c-o>: 複製所選文本至剪貼簿
-  o: 開啟檔案
-  e: 編輯檔案
-  <esc>: 返回檔案面板
-  <tab>: 切換至另一個面板 (已預存/未預存更改)
-  <space>: 切換現有行的狀態 (已預存/未預存)
-  d: 刪除變更 (git reset)
-  E: 編輯程式碼塊
-  c: 提交變更
-  w: 沒有預提交 hook 就提交更改
-  C: 使用 git 編輯器提交變更
-  /: 開始搜尋
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 選擇上一段 | | +| `` `` | 選擇下一段 | | +| `` v `` | 切換拖曳選擇 | | +| `` a `` | 切換選擇程式碼塊 | | +| `` `` | 複製所選文本至剪貼簿 | | +| `` o `` | 開啟檔案 | | +| `` e `` | 編輯檔案 | | +| `` `` | 返回檔案面板 | | +| `` `` | 切換至另一個面板 (已預存/未預存更改) | | +| `` `` | 切換現有行的狀態 (已預存/未預存) | | +| `` d `` | 刪除變更 (git reset) | | +| `` E `` | 編輯程式碼塊 | | +| `` c `` | 提交變更 | | +| `` w `` | 沒有預提交 hook 就提交更改 | | +| `` C `` | 使用 git 編輯器提交變更 | | +| `` / `` | 開始搜尋 | | ## 主面板 (補丁生成) -
-  <left>: 選擇上一段
-  <right>: 選擇下一段
-  v: 切換拖曳選擇
-  a: 切換選擇程式碼塊
-  <c-o>: 複製所選文本至剪貼簿
-  o: 開啟檔案
-  e: 編輯檔案
-  <space>: 向 (或從) 補丁中添加/刪除行
-  <esc>: 退出自訂補丁建立器
-  /: 開始搜尋
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 選擇上一段 | | +| `` `` | 選擇下一段 | | +| `` v `` | 切換拖曳選擇 | | +| `` a `` | 切換選擇程式碼塊 | | +| `` `` | 複製所選文本至剪貼簿 | | +| `` o `` | 開啟檔案 | | +| `` e `` | 編輯檔案 | | +| `` `` | 向 (或從) 補丁中添加/刪除行 | | +| `` `` | 退出自訂補丁建立器 | | +| `` / `` | 開始搜尋 | | ## 功能表 -
-  <enter>: 執行
-  <esc>: 關閉
-  /: Filter the current view by text
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 執行 | | +| `` `` | 關閉 | | +| `` / `` | Filter the current view by text | | ## 子提交 -
-  <c-o>: 複製提交 SHA 到剪貼簿
-  w: View worktree options
-  <space>: 檢出提交
-  y: 複製提交屬性
-  o: 在瀏覽器中開啟提交
-  n: 從提交建立新分支
-  g: 檢視重設選項
-  C: 複製提交 (揀選)
-  <c-r>: 重設選定的揀選 (複製) 提交
-  <c-t>: Open external diff tool (git difftool)
-  <enter>: 檢視所選項目的檔案
-  /: 開始搜尋
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 複製提交 SHA 到剪貼簿 | | +| `` w `` | View worktree options | | +| `` `` | 檢出提交 | | +| `` y `` | 複製提交屬性 | | +| `` o `` | 在瀏覽器中開啟提交 | | +| `` n `` | 從提交建立新分支 | | +| `` g `` | 檢視重設選項 | | +| `` C `` | 複製提交 (揀選) | | +| `` `` | 重設選定的揀選 (複製) 提交 | | +| `` `` | Open external diff tool (git difftool) | | +| `` `` | 檢視所選項目的檔案 | | +| `` / `` | 開始搜尋 | | ## 子模組 -
-  <c-o>: 複製子模組名稱到剪貼簿
-  <enter>: 進入子模組
-  <space>: 進入子模組
-  d: 移除子模組
-  u: 更新子模組
-  n: 新增子模組
-  e: 更新子模組 URL
-  i: 初始化子模組
-  b: 查看批量子模組選項
-  /: Filter the current view by text
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 複製子模組名稱到剪貼簿 | | +| `` `` | 進入子模組 | | +| `` `` | 進入子模組 | | +| `` d `` | 移除子模組 | | +| `` u `` | 更新子模組 | | +| `` n `` | 新增子模組 | | +| `` e `` | 更新子模組 URL | | +| `` i `` | 初始化子模組 | | +| `` b `` | 查看批量子模組選項 | | +| `` / `` | Filter the current view by text | | ## 提交 -
-  <c-o>: 複製提交 SHA 到剪貼簿
-  <c-r>: 重設選定的揀選 (複製) 提交
-  b: 查看二分選項
-  s: 向下壓縮
-  f: 修復提交 (Fixup)
-  r: 改寫提交
-  R: 使用編輯器改寫提交
-  d: 刪除提交
-  e: 編輯提交
-  i: Start interactive rebase
-  p: 挑選提交 (於變基過程中)
-  F: 為此提交建立修復提交
-  S: 壓縮上方所有的“fixup!”提交 (自動壓縮)
-  <c-j>: 向下移動提交
-  <c-k>: 向上移動提交
-  V: 貼上提交 (揀選)
-  B: Mark commit as base commit for rebase
-  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>: 檢視所選項目的檔案
-  /: 開始搜尋
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 複製提交 SHA 到剪貼簿 | | +| `` `` | 重設選定的揀選 (複製) 提交 | | +| `` 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!”提交 (自動壓縮) | | +| `` `` | 向下移動提交 | | +| `` `` | 向上移動提交 | | +| `` 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 `` | 打標籤到提交 | | +| `` `` | 開啟記錄選單 | | +| `` w `` | View worktree options | | +| `` `` | 檢出提交 | | +| `` y `` | 複製提交屬性 | | +| `` o `` | 在瀏覽器中開啟提交 | | +| `` n `` | 從提交建立新分支 | | +| `` g `` | 檢視重設選項 | | +| `` C `` | 複製提交 (揀選) | | +| `` `` | Open external diff tool (git difftool) | | +| `` `` | 檢視所選項目的檔案 | | +| `` / `` | 開始搜尋 | | ## 提交摘要 -
-  <enter>: 確認
-  <esc>: 關閉
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 確認 | | +| `` `` | 關閉 | | ## 提交檔案 -
-  <c-o>: 複製提交的檔案名稱到剪貼簿
-  c: 檢出檔案
-  d: 捨棄此提交對此檔案的更改
-  o: 開啟檔案
-  e: 編輯檔案
-  <c-t>: Open external diff tool (git difftool)
-  <space>: 切換檔案是否包含在補丁中
-  a: 切換所有檔案是否包含在補丁中
-  <enter>: 輸入檔案以將選定的行添加至補丁（或切換目錄折疊）
-  `: 切換檔案樹狀視圖
-  /: 開始搜尋
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 複製提交的檔案名稱到剪貼簿 | | +| `` c `` | 檢出檔案 | | +| `` d `` | 捨棄此提交對此檔案的更改 | | +| `` o `` | 開啟檔案 | | +| `` e `` | 編輯檔案 | | +| `` `` | Open external diff tool (git difftool) | | +| `` `` | 切換檔案是否包含在補丁中 | | +| `` a `` | 切換所有檔案是否包含在補丁中 | | +| `` `` | 輸入檔案以將選定的行添加至補丁（或切換目錄折疊） | | +| `` ` `` | 切換檔案樹狀視圖 | | +| `` / `` | 開始搜尋 | | ## 收藏 (Stash) -
-  <space>: 套用
-  g: 還原
-  d: 捨棄
-  n: 新分支
-  r: 重新命名收藏
-  w: View worktree options
-  <enter>: 檢視所選項目的檔案
-  /: Filter the current view by text
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 套用 | | +| `` g `` | 還原 | | +| `` d `` | 捨棄 | | +| `` n `` | 新分支 | | +| `` r `` | 重新命名收藏 | | +| `` w `` | View worktree options | | +| `` `` | 檢視所選項目的檔案 | | +| `` / `` | Filter the current view by text | | ## 本地分支 -
-  <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
-  w: View worktree options
-  <enter>: 檢視提交
-  /: Filter the current view by text
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 複製分支名稱到剪貼簿 | | +| `` i `` | 顯示 git-flow 選項 | | +| `` `` | 檢出 | | +| `` n `` | 新分支 | | +| `` o `` | 建立拉取請求 | | +| `` O `` | 建立拉取請求選項 | | +| `` `` | 複製拉取請求的 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 | | +| `` `` | 檢視提交 | | +| `` / `` | Filter the current view by text | | ## 標籤 -
-  <space>: 檢出
-  d: View delete options
-  P: 推送標籤
-  n: 建立標籤
-  g: 檢視重設選項
-  w: View worktree options
-  <enter>: 檢視提交
-  /: Filter the current view by text
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 檢出 | | +| `` d `` | View delete options | | +| `` P `` | 推送標籤 | | +| `` n `` | 建立標籤 | | +| `` g `` | 檢視重設選項 | | +| `` w `` | View worktree options | | +| `` `` | 檢視提交 | | +| `` / `` | Filter the current view by text | | ## 檔案 -
-  <c-o>: 複製檔案名稱到剪貼簿
-  <space>: 切換預存
-  <c-b>: 篩選檔案 (預存/未預存)
-  y: Copy to clipboard
-  c: 提交變更
-  w: 沒有預提交 hook 就提交更改
-  A: 修正上次提交
-  C: 使用 git 編輯器提交變更
-  <c-f>: Find base commit for fixup
-  e: 編輯檔案
-  o: 開啟檔案
-  i: 忽略或排除檔案
-  r: 重新整理檔案
-  s: 收藏所有變更
-  S: 檢視收藏選項
-  a: 全部預存/取消預存
-  <enter>: 選擇檔案中的單個程式碼塊/行，或展開/折疊目錄
-  d: 檢視“捨棄更改”的選項
-  g: 檢視上游重設選項
-  D: 檢視重設選項
-  `: 切換檔案樹狀視圖
-  <c-t>: Open external diff tool (git difftool)
-  M: 開啟外部合併工具 (git mergetool)
-  f: 擷取
-  /: 開始搜尋
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 複製檔案名稱到剪貼簿 | | +| `` `` | 切換預存 | | +| `` `` | 篩選檔案 (預存/未預存) | | +| `` y `` | Copy to clipboard | | +| `` c `` | 提交變更 | | +| `` w `` | 沒有預提交 hook 就提交更改 | | +| `` A `` | 修正上次提交 | | +| `` C `` | 使用 git 編輯器提交變更 | | +| `` `` | 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: | +| `` e `` | 編輯檔案 | | +| `` o `` | 開啟檔案 | | +| `` i `` | 忽略或排除檔案 | | +| `` r `` | 重新整理檔案 | | +| `` s `` | 收藏所有變更 | | +| `` S `` | 檢視收藏選項 | | +| `` a `` | 全部預存/取消預存 | | +| `` `` | 選擇檔案中的單個程式碼塊/行，或展開/折疊目錄 | | +| `` d `` | 檢視“捨棄更改”的選項 | | +| `` g `` | 檢視上游重設選項 | | +| `` D `` | 檢視重設選項 | | +| `` ` `` | 切換檔案樹狀視圖 | | +| `` `` | Open external diff tool (git difftool) | | +| `` M `` | 開啟外部合併工具 (git mergetool) | | +| `` f `` | 擷取 | | +| `` / `` | 開始搜尋 | | ## 狀態 -
-  o: 開啟設定檔案
-  e: 編輯設定檔案
-  u: 檢查更新
-  <enter>: 切換到最近使用的版本庫
-  a: 顯示所有分支日誌
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` o `` | 開啟設定檔案 | | +| `` e `` | 編輯設定檔案 | | +| `` u `` | 檢查更新 | | +| `` `` | 切換到最近使用的版本庫 | | +| `` a `` | 顯示所有分支日誌 | | ## 確認面板 -
-  <enter>: 確認
-  <esc>: 關閉/取消
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 確認 | | +| `` `` | 關閉/取消 | | ## 遠端 -
-  f: 擷取遠端
-  n: 新增遠端
-  d: 移除遠端
-  e: 編輯遠端
-  /: Filter the current view by text
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` f `` | 擷取遠端 | | +| `` n `` | 新增遠端 | | +| `` d `` | 移除遠端 | | +| `` e `` | 編輯遠端 | | +| `` / `` | Filter the current view by text | | ## 遠端分支 -
-  <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
-
+| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 複製分支名稱到剪貼簿 | | +| `` `` | 檢出 | | +| `` n `` | 新分支 | | +| `` M `` | 合併到當前檢出的分支 | | +| `` r `` | 將已檢出的分支變基至此分支 | | +| `` d `` | Delete remote tag | | +| `` u `` | 將此分支設為當前分支之上游 | | +| `` s `` | Sort order | | +| `` g `` | 檢視重設選項 | | +| `` w `` | View worktree options | | +| `` `` | 檢視提交 | | +| `` / `` | Filter the current view by text | | diff --git a/pkg/cheatsheet/generate.go b/pkg/cheatsheet/generate.go index 205abf7cb..27667e686 100644 --- a/pkg/cheatsheet/generate.go +++ b/pkg/cheatsheet/generate.go @@ -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 += "
\n"
+		content += "| Key | Action | Info |\n"
+		content += "|-----|--------|-------------|\n"
 		for _, binding := range section.bindings {
 			content += formatBinding(binding)
 		}
-		content += "
\n" } return content @@ -206,19 +205,15 @@ func formatTitle(title string) string { } func formatBinding(binding *types.Binding) string { - result := fmt.Sprintf(" %s: %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 {