diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2023-05-25 21:11:51 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2023-05-25 23:52:19 +1000 |
| commit | d772c9f1d446f9566d0c46a1cb76dc63ef31cb21 (patch) | |
| tree | c5d3208eb325241bb34816ee2a363bdba0adcf37 /docs | |
| parent | e5534d9781d3e19fb2f2b3c86b737bddf914d405 (diff) | |
Use sentence case everywhere
We have not been good at consistent casing so far. Now we use 'Sentence case' everywhere. EVERYWHERE.
Also Removing 'Lc' prefix from i18n field names: the 'Lc' stood for lowercase but now that everything
is in 'Sentence case' there's no need for the distinction.
I've got a couple lower case things I've kept: namely, things that show up in parentheses.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/keybindings/Keybindings_en.md | 432 | ||||
| -rw-r--r-- | docs/keybindings/Keybindings_ja.md | 108 | ||||
| -rw-r--r-- | docs/keybindings/Keybindings_ko.md | 114 | ||||
| -rw-r--r-- | docs/keybindings/Keybindings_nl.md | 420 | ||||
| -rw-r--r-- | docs/keybindings/Keybindings_pl.md | 414 | ||||
| -rw-r--r-- | docs/keybindings/Keybindings_zh.md | 18 |
6 files changed, 753 insertions, 753 deletions
diff --git a/docs/keybindings/Keybindings_en.md b/docs/keybindings/Keybindings_en.md index 8e48afcba..7a6687d9f 100644 --- a/docs/keybindings/Keybindings_en.md +++ b/docs/keybindings/Keybindings_en.md @@ -4,317 +4,317 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ -## Global Keybindings +## Global keybindings <pre> - <kbd><c-r></kbd>: switch to a recent repo - <kbd><pgup></kbd>: scroll up main panel (fn+up/shift+k) - <kbd><pgdown></kbd>: scroll down main panel (fn+down/shift+j) - <kbd>@</kbd>: open command log menu + <kbd><c-r></kbd>: Switch to a recent repo + <kbd><pgup></kbd>: Scroll up main panel (fn+up/shift+k) + <kbd><pgdown></kbd>: Scroll down main panel (fn+down/shift+j) + <kbd>@</kbd>: Open command log menu <kbd>}</kbd>: Increase the size of the context shown around changes in the diff view <kbd>{</kbd>: Decrease the size of the context shown around changes in the diff view - <kbd>:</kbd>: execute custom command - <kbd><c-p></kbd>: view custom patch options - <kbd>m</kbd>: view merge/rebase options - <kbd>R</kbd>: refresh - <kbd>+</kbd>: next screen mode (normal/half/fullscreen) - <kbd>_</kbd>: prev screen mode - <kbd>?</kbd>: open menu - <kbd><c-s></kbd>: view filter-by-path options - <kbd>W</kbd>: open diff menu - <kbd><c-e></kbd>: open diff menu + <kbd>:</kbd>: Execute custom command + <kbd><c-p></kbd>: View custom patch options + <kbd>m</kbd>: View merge/rebase options + <kbd>R</kbd>: Refresh + <kbd>+</kbd>: Next screen mode (normal/half/fullscreen) + <kbd>_</kbd>: Prev screen mode + <kbd>?</kbd>: Open menu + <kbd><c-s></kbd>: View filter-by-path options + <kbd>W</kbd>: Open diff menu + <kbd><c-e></kbd>: Open diff menu <kbd><c-w></kbd>: Toggle whether or not whitespace changes are shown in the diff view - <kbd>z</kbd>: undo (via reflog) (experimental) - <kbd><c-z></kbd>: redo (via reflog) (experimental) - <kbd>P</kbd>: push - <kbd>p</kbd>: pull + <kbd>z</kbd>: Undo + <kbd><c-z></kbd>: Redo + <kbd>P</kbd>: Push + <kbd>p</kbd>: Pull </pre> -## List Panel Navigation +## List panel navigation <pre> - <kbd>,</kbd>: previous page - <kbd>.</kbd>: next page - <kbd><</kbd>: scroll to top - <kbd>/</kbd>: start search - <kbd>></kbd>: scroll to bottom - <kbd>H</kbd>: scroll left - <kbd>L</kbd>: scroll right - <kbd>]</kbd>: next tab - <kbd>[</kbd>: previous tab + <kbd>,</kbd>: Previous page + <kbd>.</kbd>: Next page + <kbd><</kbd>: Scroll to top + <kbd>/</kbd>: Start search + <kbd>></kbd>: Scroll to bottom + <kbd>H</kbd>: Scroll left + <kbd>L</kbd>: Scroll right + <kbd>]</kbd>: Next tab + <kbd>[</kbd>: Previous tab </pre> -## Commit Files +## Commit files <pre> - <kbd><c-o></kbd>: copy the committed file name to the clipboard - <kbd>c</kbd>: checkout file - <kbd>d</kbd>: discard this commit's changes to this file - <kbd>o</kbd>: open file - <kbd>e</kbd>: edit file - <kbd><space></kbd>: toggle file included in patch - <kbd>a</kbd>: toggle all files included in patch - <kbd><enter></kbd>: enter file to add selected lines to the patch (or toggle directory collapsed) - <kbd>`</kbd>: toggle file tree view + <kbd><c-o></kbd>: Copy the committed file name to the clipboard + <kbd>c</kbd>: Checkout file + <kbd>d</kbd>: Discard this commit's changes to this file + <kbd>o</kbd>: Open file + <kbd>e</kbd>: Edit file + <kbd><space></kbd>: Toggle file included in patch + <kbd>a</kbd>: Toggle all files included in patch + <kbd><enter></kbd>: Enter file to add selected lines to the patch (or toggle directory collapsed) + <kbd>`</kbd>: Toggle file tree view </pre> -## Commit Summary +## Commit summary <pre> - <kbd><enter></kbd>: confirm - <kbd><esc></kbd>: close + <kbd><enter></kbd>: Confirm + <kbd><esc></kbd>: Close </pre> ## Commits <pre> - <kbd><c-o></kbd>: copy commit SHA to clipboard - <kbd><c-r></kbd>: reset cherry-picked (copied) commits selection - <kbd>b</kbd>: view bisect options - <kbd>s</kbd>: squash down - <kbd>f</kbd>: fixup commit - <kbd>r</kbd>: reword commit - <kbd>R</kbd>: reword commit with editor - <kbd>d</kbd>: delete commit - <kbd>e</kbd>: edit commit - <kbd>p</kbd>: pick commit (when mid-rebase) - <kbd>F</kbd>: create fixup commit for this commit - <kbd>S</kbd>: squash all 'fixup!' commits above selected commit (autosquash) - <kbd><c-j></kbd>: move commit down one - <kbd><c-k></kbd>: move commit up one - <kbd>v</kbd>: paste commits (cherry-pick) - <kbd>A</kbd>: amend commit with staged changes - <kbd>a</kbd>: reset commit author - <kbd>t</kbd>: revert commit - <kbd>T</kbd>: tag commit - <kbd><c-l></kbd>: open log menu - <kbd><space></kbd>: checkout commit - <kbd>y</kbd>: copy commit attribute - <kbd>o</kbd>: open commit in browser - <kbd>n</kbd>: create new branch off of commit - <kbd>g</kbd>: view reset options - <kbd>c</kbd>: copy commit (cherry-pick) - <kbd>C</kbd>: copy commit range (cherry-pick) - <kbd><enter></kbd>: view selected item's files + <kbd><c-o></kbd>: Copy commit SHA to clipboard + <kbd><c-r></kbd>: Reset cherry-picked (copied) commits selection + <kbd>b</kbd>: View bisect options + <kbd>s</kbd>: Squash down + <kbd>f</kbd>: Fixup commit + <kbd>r</kbd>: Reword commit + <kbd>R</kbd>: Reword commit with editor + <kbd>d</kbd>: Delete commit + <kbd>e</kbd>: Edit commit + <kbd>p</kbd>: Pick commit (when mid-rebase) + <kbd>F</kbd>: Create fixup commit for this commit + <kbd>S</kbd>: Squash all 'fixup!' commits above selected commit (autosquash) + <kbd><c-j></kbd>: Move commit down one + <kbd><c-k></kbd>: Move commit up one + <kbd>v</kbd>: Paste commits (cherry-pick) + <kbd>A</kbd>: Amend commit with staged changes + <kbd>a</kbd>: Set/Reset commit author + <kbd>t</kbd>: Revert commit + <kbd>T</kbd>: Tag commit + <kbd><c-l></kbd>: Open log menu + <kbd><space></kbd>: Checkout commit + <kbd>y</kbd>: Copy commit attribute + <kbd>o</kbd>: Open commit in browser + <kbd>n</kbd>: Create new branch off of commit + <kbd>g</kbd>: View reset options + <kbd>c</kbd>: Copy commit (cherry-pick) + <kbd>C</kbd>: Copy commit range (cherry-pick) + <kbd><enter></kbd>: View selected item's files </pre> -## Confirmation Panel +## Confirmation panel <pre> - <kbd><enter></kbd>: confirm - <kbd><esc></kbd>: close/cancel + <kbd><enter></kbd>: Confirm + <kbd><esc></kbd>: Close/Cancel </pre> ## Files <pre> - <kbd><c-o></kbd>: copy the file name to the clipboard - <kbd>d</kbd>: view 'discard changes' options - <kbd><space></kbd>: toggle staged + <kbd><c-o></kbd>: Copy the file name to the clipboard + <kbd>d</kbd>: View 'discard changes' options + <kbd><space></kbd>: Toggle staged <kbd><c-b></kbd>: Filter files (staged/unstaged) - <kbd>c</kbd>: commit changes - <kbd>w</kbd>: commit changes without pre-commit hook - <kbd>A</kbd>: amend last commit - <kbd>C</kbd>: commit changes using git editor - <kbd>e</kbd>: edit file - <kbd>o</kbd>: open file - <kbd>i</kbd>: ignore or exclude file - <kbd>r</kbd>: refresh files - <kbd>s</kbd>: stash all changes - <kbd>S</kbd>: view stash options - <kbd>a</kbd>: stage/unstage all - <kbd><enter></kbd>: stage individual hunks/lines for file, or collapse/expand for directory - <kbd>g</kbd>: view upstream reset options - <kbd>D</kbd>: view reset options - <kbd>`</kbd>: toggle file tree view - <kbd>M</kbd>: open external merge tool (git mergetool) - <kbd>f</kbd>: fetch + <kbd>c</kbd>: Commit changes + <kbd>w</kbd>: Commit changes without pre-commit hook + <kbd>A</kbd>: Amend last commit + <kbd>C</kbd>: Commit changes using git editor + <kbd>e</kbd>: Edit file + <kbd>o</kbd>: Open file + <kbd>i</kbd>: Ignore or exclude file + <kbd>r</kbd>: Refresh files + <kbd>s</kbd>: Stash all changes + <kbd>S</kbd>: View stash options + <kbd>a</kbd>: Stage/unstage all + <kbd><enter></kbd>: Stage individual hunks/lines for file, or collapse/expand for directory + <kbd>g</kbd>: View upstream reset options + <kbd>D</kbd>: View reset options + <kbd>`</kbd>: Toggle file tree view + <kbd>M</kbd>: Open external merge tool (git mergetool) + <kbd>f</kbd>: Fetch </pre> -## Local Branches +## Local branches <pre> - <kbd><c-o></kbd>: copy branch name to clipboard - <kbd>i</kbd>: show git-flow options - <kbd><space></kbd>: checkout - <kbd>n</kbd>: new branch - <kbd>o</kbd>: create pull request - <kbd>O</kbd>: create pull request options - <kbd><c-y></kbd>: copy pull request URL to clipboard - <kbd>c</kbd>: checkout by name - <kbd>F</kbd>: force checkout - <kbd>d</kbd>: delete branch - <kbd>r</kbd>: rebase checked-out branch onto this branch - <kbd>M</kbd>: merge into currently checked out branch - <kbd>f</kbd>: fast-forward this branch from its upstream - <kbd>T</kbd>: create tag - <kbd>g</kbd>: view reset options - <kbd>R</kbd>: rename branch - <kbd>u</kbd>: set/unset upstream - <kbd><enter></kbd>: view commits + <kbd><c-o></kbd>: Copy branch name to clipboard + <kbd>i</kbd>: Show git-flow options + <kbd><space></kbd>: Checkout + <kbd>n</kbd>: New branch + <kbd>o</kbd>: Create pull request + <kbd>O</kbd>: Create pull request options + <kbd><c-y></kbd>: Copy pull request URL to clipboard + <kbd>c</kbd>: Checkout by name + <kbd>F</kbd>: Force checkout + <kbd>d</kbd>: Delete branch + <kbd>r</kbd>: Rebase checked-out branch onto this branch + <kbd>M</kbd>: Merge into currently checked out branch + <kbd>f</kbd>: Fast-forward this branch from its upstream + <kbd>T</kbd>: Create tag + <kbd>g</kbd>: View reset options + <kbd>R</kbd>: Rename branch + <kbd>u</kbd>: Set/Unset upstream + <kbd><enter></kbd>: View commits </pre> -## Main Panel (Merging) +## Main panel (merging) <pre> - <kbd>e</kbd>: edit file - <kbd>o</kbd>: open file - <kbd><left></kbd>: select previous conflict - <kbd><right></kbd>: select next conflict - <kbd><up></kbd>: select previous hunk - <kbd><down></kbd>: select next hunk - <kbd>z</kbd>: undo - <kbd>M</kbd>: open external merge tool (git mergetool) - <kbd><space></kbd>: pick hunk - <kbd>b</kbd>: pick all hunks - <kbd><esc></kbd>: return to files panel + <kbd>e</kbd>: Edit file + <kbd>o</kbd>: Open file + <kbd><left></kbd>: Select previous conflict + <kbd><right></kbd>: Select next conflict + <kbd><up></kbd>: Select previous hunk + <kbd><down></kbd>: Select next hunk + <kbd>z</kbd>: Undo + <kbd>M</kbd>: Open external merge tool (git mergetool) + <kbd><space></kbd>: Pick hunk + <kbd>b</kbd>: Pick all hunks + <kbd><esc></kbd>: Return to files panel </pre> -## Main Panel (Normal) +## Main panel (normal) <pre> - <kbd>mouse wheel down</kbd>: scroll down (fn+up) - <kbd>mouse wheel up</kbd>: scroll up (fn+down) + <kbd>mouse wheel down</kbd>: Scroll down (fn+up) + <kbd>mouse wheel up</kbd>: Scroll up (fn+down) </pre> -## Main Panel (Patch Building) +## Main panel (patch building) <pre> - <kbd><left></kbd>: select previous hunk - <kbd><right></kbd>: select next hunk - <kbd>v</kbd>: toggle drag select - <kbd>V</kbd>: toggle drag select - <kbd>a</kbd>: toggle select hunk - <kbd><c-o></kbd>: copy the selected text to the clipboard - <kbd>o</kbd>: open file - <kbd>e</kbd>: edit file - <kbd><space></kbd>: add/remove line(s) to patch - <kbd><esc></kbd>: exit custom patch builder + <kbd><left></kbd>: Select previous hunk + <kbd><right></kbd>: Select next hunk + <kbd>v</kbd>: Toggle drag select + <kbd>V</kbd>: Toggle drag select + <kbd>a</kbd>: Toggle select hunk + <kbd><c-o></kbd>: Copy the selected text to the clipboard + <kbd>o</kbd>: Open file + <kbd>e</kbd>: Edit file + <kbd><space></kbd>: Add/Remove line(s) to patch + <kbd><esc></kbd>: Exit custom patch builder </pre> -## Main Panel (Staging) +## Main panel (staging) <pre> - <kbd><left></kbd>: select previous hunk - <kbd><right></kbd>: select next hunk - <kbd>v</kbd>: toggle drag select - <kbd>V</kbd>: toggle drag select - <kbd>a</kbd>: toggle select hunk - <kbd><c-o></kbd>: copy the selected text to the clipboard - <kbd>o</kbd>: open file - <kbd>e</kbd>: edit file - <kbd><esc></kbd>: return to files panel - <kbd><tab></kbd>: switch to other panel (staged/unstaged changes) - <kbd><space></kbd>: toggle line staged / unstaged - <kbd>d</kbd>: delete change (git reset) - <kbd>E</kbd>: edit hunk - <kbd>c</kbd>: commit changes - <kbd>w</kbd>: commit changes without pre-commit hook - <kbd>C</kbd>: commit changes using git editor + <kbd><left></kbd>: Select previous hunk + <kbd><right></kbd>: Select next hunk + <kbd>v</kbd>: Toggle drag select + <kbd>V</kbd>: Toggle drag select + <kbd>a</kbd>: Toggle select hunk + <kbd><c-o></kbd>: Copy the selected text to the clipboard + <kbd>o</kbd>: Open file + <kbd>e</kbd>: Edit file + <kbd><esc></kbd>: Return to files panel + <kbd><tab></kbd>: Switch to other panel (staged/unstaged changes) + <kbd><space></kbd>: Toggle line staged / unstaged + <kbd>d</kbd>: Delete change (git reset) + <kbd>E</kbd>: Edit hunk + <kbd>c</kbd>: Commit changes + <kbd>w</kbd>: Commit changes without pre-commit hook + <kbd>C</kbd>: Commit changes using git editor </pre> ## Menu <pre> - <kbd><enter></kbd>: execute - <kbd><esc></kbd>: close + <kbd><enter></kbd>: Execute + <kbd><esc></kbd>: Close </pre> ## Reflog <pre> - <kbd><c-o></kbd>: copy commit SHA to clipboard - <kbd><space></kbd>: checkout commit - <kbd>y</kbd>: copy commit attribute - <kbd>o</kbd>: open commit in browser - <kbd>n</kbd>: create new branch off of commit - <kbd>g</kbd>: view reset options - <kbd>c</kbd>: copy commit (cherry-pick) - <kbd>C</kbd>: copy commit range (cherry-pick) - <kbd><c-r></kbd>: reset cherry-picked (copied) commits selection - <kbd><enter></kbd>: view commits + <kbd><c-o></kbd>: Copy commit SHA to clipboard + <kbd><space></kbd>: Checkout commit + <kbd>y</kbd>: Copy commit attribute + <kbd>o</kbd>: Open commit in browser + <kbd>n</kbd>: Create new branch off of commit + <kbd>g</kbd>: View reset options + <kbd>c</kbd>: Copy commit (cherry-pick) + <kbd>C</kbd>: Copy commit range (cherry-pick) + <kbd><c-r></kbd>: Reset cherry-picked (copied) commits selection + <kbd><enter></kbd>: View commits </pre> -## Remote Branches +## Remote branches <pre> - <kbd><c-o></kbd>: copy branch name to clipboard - <kbd><space></kbd>: checkout - <kbd>n</kbd>: new branch - <kbd>M</kbd>: merge into currently checked out branch - <kbd>r</kbd>: rebase checked-out branch onto this branch - <kbd>d</kbd>: delete branch - <kbd>u</kbd>: set as upstream of checked-out branch + <kbd><c-o></kbd>: Copy branch name to clipboard + <kbd><space></kbd>: Checkout + <kbd>n</kbd>: New branch + <kbd>M</kbd>: Merge into currently checked out branch + <kbd>r</kbd>: Rebase checked-out branch onto this branch + <kbd>d</kbd>: Delete branch + <kbd>u</kbd>: Set as upstream of checked-out branch <kbd><esc></kbd>: Return to remotes list - <kbd>g</kbd>: view reset options - <kbd><enter></kbd>: view commits + <kbd>g</kbd>: View reset options + <kbd><enter></kbd>: View commits </pre> ## Remotes <pre> - <kbd>f</kbd>: fetch remote - <kbd>n</kbd>: add new remote - <kbd>d</kbd>: remove remote - <kbd>e</kbd>: edit remote + <kbd>f</kbd>: Fetch remote + <kbd>n</kbd>: Add new remote + <kbd>d</kbd>: Remove remote + <kbd>e</kbd>: Edit remote </pre> ## Stash <pre> - <kbd><space></kbd>: apply - <kbd>g</kbd>: pop - <kbd>d</kbd>: drop - <kbd>n</kbd>: new branch - <kbd>r</kbd>: rename stash - <kbd><enter></kbd>: view selected item's files + <kbd><space></kbd>: Apply + <kbd>g</kbd>: Pop + <kbd>d</kbd>: Drop + <kbd>n</kbd>: New branch + <kbd>r</kbd>: Rename stash + <kbd><enter></kbd>: View selected item's files </pre> ## Status <pre> - <kbd>o</kbd>: open config file - <kbd>e</kbd>: edit config file - <kbd>u</kbd>: check for update - <kbd><enter></kbd>: switch to a recent repo - <kbd>a</kbd>: show all branch logs + <kbd>o</kbd>: Open config file + <kbd>e</kbd>: Edit config file + <kbd>u</kbd>: Check for update + <kbd><enter></kbd>: Switch to a recent repo + <kbd>a</kbd>: Show all branch logs </pre> ## Sub-commits <pre> - <kbd><c-o></kbd>: copy commit SHA to clipboard - <kbd><space></kbd>: checkout commit - <kbd>y</kbd>: copy commit attribute - <kbd>o</kbd>: open commit in browser - <kbd>n</kbd>: create new branch off of commit - <kbd>g</kbd>: view reset options - <kbd>c</kbd>: copy commit (cherry-pick) - <kbd>C</kbd>: copy commit range (cherry-pick) - <kbd><c-r></kbd>: reset cherry-picked (copied) commits selection - <kbd><enter></kbd>: view selected item's files + <kbd><c-o></kbd>: Copy commit SHA to clipboard + <kbd><space></kbd>: Checkout commit + <kbd>y</kbd>: Copy commit attribute + <kbd>o</kbd>: Open commit in browser + <kbd>n</kbd>: Create new branch off of commit + <kbd>g</kbd>: View reset options + <kbd>c</kbd>: Copy commit (cherry-pick) + <kbd>C</kbd>: Copy commit range (cherry-pick) + <kbd><c-r></kbd>: Reset cherry-picked (copied) commits selection + <kbd><enter></kbd>: View selected item's files </pre> ## Submodules <pre> - <kbd><c-o></kbd>: copy submodule name to clipboard - <kbd><enter></kbd>: enter submodule - <kbd>d</kbd>: remove submodule - <kbd>u</kbd>: update submodule - <kbd>n</kbd>: add new submodule - <kbd>e</kbd>: update submodule URL - <kbd>i</kbd>: initialize submodule - <kbd>b</kbd>: view bulk submodule options + <kbd><c-o></kbd>: Copy submodule name to clipboard + <kbd><enter></kbd>: Enter submodule + <kbd>d</kbd>: Remove submodule + <kbd>u</kbd>: Update submodule + <kbd>n</kbd>: Add new submodule + <kbd>e</kbd>: Update submodule URL + <kbd>i</kbd>: Initialize submodule + <kbd>b</kbd>: View bulk submodule options </pre> ## Tags <pre> - <kbd><space></kbd>: checkout - <kbd>d</kbd>: delete tag - <kbd>P</kbd>: push tag - <kbd>n</kbd>: create tag - <kbd>g</kbd>: view reset options - <kbd><enter></kbd>: view commits + <kbd><space></kbd>: Checkout + <kbd>d</kbd>: Delete tag + <kbd>P</kbd>: Push tag + <kbd>n</kbd>: Create tag + <kbd>g</kbd>: View reset options + <kbd><enter></kbd>: View commits </pre> diff --git a/docs/keybindings/Keybindings_ja.md b/docs/keybindings/Keybindings_ja.md index 80430a69d..1fbef475a 100644 --- a/docs/keybindings/Keybindings_ja.md +++ b/docs/keybindings/Keybindings_ja.md @@ -14,20 +14,20 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>}</kbd>: Increase the size of the context shown around changes in the diff view <kbd>{</kbd>: Decrease the size of the context shown around changes in the diff view <kbd>:</kbd>: カスタムコマンドを実行 - <kbd><c-p></kbd>: view custom patch options - <kbd>m</kbd>: view merge/rebase options + <kbd><c-p></kbd>: View custom patch options + <kbd>m</kbd>: View merge/rebase options <kbd>R</kbd>: リフレッシュ <kbd>+</kbd>: 次のスクリーンモード (normal/half/fullscreen) <kbd>_</kbd>: 前のスクリーンモード <kbd>?</kbd>: メニューを開く - <kbd><c-s></kbd>: view filter-by-path options + <kbd><c-s></kbd>: View filter-by-path options <kbd>W</kbd>: 差分メニューを開く <kbd><c-e></kbd>: 差分メニューを開く <kbd><c-w></kbd>: 空白文字の差分の表示有無を切り替え <kbd>z</kbd>: アンドゥ (via reflog) (experimental) <kbd><c-z></kbd>: リドゥ (via reflog) (experimental) - <kbd>P</kbd>: push - <kbd>p</kbd>: pull + <kbd>P</kbd>: Push + <kbd>p</kbd>: Pull </pre> ## 一覧パネルの操作 @@ -48,11 +48,11 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <pre> <kbd><space></kbd>: 適用 - <kbd>g</kbd>: pop - <kbd>d</kbd>: drop + <kbd>g</kbd>: Pop + <kbd>d</kbd>: Drop <kbd>n</kbd>: 新しいブランチを作成 <kbd>r</kbd>: Stashを変更 - <kbd><enter></kbd>: view selected item's files + <kbd><enter></kbd>: View selected item's files </pre> ## Sub-commits @@ -63,33 +63,33 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>y</kbd>: コミットの情報をコピー <kbd>o</kbd>: ブラウザでコミットを開く <kbd>n</kbd>: コミットにブランチを作成 - <kbd>g</kbd>: view reset options + <kbd>g</kbd>: View reset options <kbd>c</kbd>: コミットをコピー (cherry-pick) <kbd>C</kbd>: コミットを範囲コピー (cherry-pick) - <kbd><c-r></kbd>: reset cherry-picked (copied) commits selection - <kbd><enter></kbd>: view selected item's files + <kbd><c-r></kbd>: Reset cherry-picked (copied) commits selection + <kbd><enter></kbd>: View selected item's files </pre> ## コミット <pre> <kbd><c-o></kbd>: コミットのSHAをクリップボードにコピー - <kbd><c-r></kbd>: reset cherry-picked (copied) commits selection - <kbd>b</kbd>: view bisect options - <kbd>s</kbd>: squash down - <kbd>f</kbd>: fixup commit + <kbd><c-r></kbd>: Reset cherry-picked (copied) commits selection + <kbd>b</kbd>: View bisect options + <kbd>s</kbd>: Squash down + <kbd>f</kbd>: Fixup commit <kbd>r</kbd>: コミットメッセージを変更 <kbd>R</kbd>: エディタでコミットメッセージを編集 <kbd>d</kbd>: コミットを削除 <kbd>e</kbd>: コミットを編集 - <kbd>p</kbd>: pick commit (when mid-rebase) + <kbd>p</kbd>: Pick commit (when mid-rebase) <kbd>F</kbd>: このコミットに対するfixupコミットを作成 - <kbd>S</kbd>: squash all 'fixup!' commits above selected commit (autosquash) + <kbd>S</kbd>: Squash all 'fixup!' commits above selected commit (autosquash) <kbd><c-j></kbd>: コミットを1つ下に移動 <kbd><c-k></kbd>: コミットを1つ上に移動 <kbd>v</kbd>: コミットを貼り付け (cherry-pick) <kbd>A</kbd>: ステージされた変更でamendコミット - <kbd>a</kbd>: reset commit author + <kbd>a</kbd>: Set/Reset commit author <kbd>t</kbd>: コミットをrevert <kbd>T</kbd>: タグを作成 <kbd><c-l></kbd>: ログメニューを開く @@ -97,23 +97,23 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>y</kbd>: コミットの情報をコピー <kbd>o</kbd>: ブラウザでコミットを開く <kbd>n</kbd>: コミットにブランチを作成 - <kbd>g</kbd>: view reset options + <kbd>g</kbd>: View reset options <kbd>c</kbd>: コミットをコピー (cherry-pick) <kbd>C</kbd>: コミットを範囲コピー (cherry-pick) - <kbd><enter></kbd>: view selected item's files + <kbd><enter></kbd>: View selected item's files </pre> ## コミットファイル <pre> <kbd><c-o></kbd>: コミットされたファイル名をクリップボードにコピー - <kbd>c</kbd>: checkout file - <kbd>d</kbd>: discard this commit's changes to this file + <kbd>c</kbd>: Checkout file + <kbd>d</kbd>: Discard this commit's changes to this file <kbd>o</kbd>: ファイルを開く <kbd>e</kbd>: ファイルを編集 - <kbd><space></kbd>: toggle file included in patch - <kbd>a</kbd>: toggle all files included in patch - <kbd><enter></kbd>: enter file to add selected lines to the patch (or toggle directory collapsed) + <kbd><space></kbd>: Toggle file included in patch + <kbd>a</kbd>: Toggle all files included in patch + <kbd><enter></kbd>: Enter file to add selected lines to the patch (or toggle directory collapsed) <kbd>`</kbd>: ファイルツリーの表示を切り替え </pre> @@ -134,7 +134,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>n</kbd>: サブモジュールを新規追加 <kbd>e</kbd>: サブモジュールのURLを更新 <kbd>i</kbd>: サブモジュールを初期化 - <kbd>b</kbd>: view bulk submodule options + <kbd>b</kbd>: View bulk submodule options </pre> ## ステータス @@ -154,7 +154,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>d</kbd>: タグを削除 <kbd>P</kbd>: タグをpush <kbd>n</kbd>: タグを作成 - <kbd>g</kbd>: view reset options + <kbd>g</kbd>: View reset options <kbd><enter></kbd>: コミットを閲覧 </pre> @@ -162,7 +162,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <pre> <kbd><c-o></kbd>: ファイル名をクリップボードにコピー - <kbd>d</kbd>: view 'discard changes' options + <kbd>d</kbd>: View 'discard changes' options <kbd><space></kbd>: ステージ/アンステージ <kbd><c-b></kbd>: ファイルをフィルタ (ステージ/アンステージ) <kbd>c</kbd>: 変更をコミット @@ -174,36 +174,36 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>i</kbd>: ファイルをignore <kbd>r</kbd>: ファイルをリフレッシュ <kbd>s</kbd>: 変更をstash - <kbd>S</kbd>: view stash options + <kbd>S</kbd>: View stash options <kbd>a</kbd>: すべての変更をステージ/アンステージ - <kbd><enter></kbd>: stage individual hunks/lines for file, or collapse/expand for directory - <kbd>g</kbd>: view upstream reset options - <kbd>D</kbd>: view reset options + <kbd><enter></kbd>: Stage individual hunks/lines for file, or collapse/expand for directory + <kbd>g</kbd>: View upstream reset options + <kbd>D</kbd>: View reset options <kbd>`</kbd>: ファイルツリーの表示を切り替え - <kbd>M</kbd>: git mergetoolを開く - <kbd>f</kbd>: fetch + <kbd>M</kbd>: Git mergetoolを開く + <kbd>f</kbd>: Fetch </pre> ## ブランチ <pre> <kbd><c-o></kbd>: ブランチ名をクリップボードにコピー - <kbd>i</kbd>: show git-flow options + <kbd>i</kbd>: Show git-flow options <kbd><space></kbd>: チェックアウト <kbd>n</kbd>: 新しいブランチを作成 <kbd>o</kbd>: Pull Requestを作成 - <kbd>O</kbd>: create pull request options + <kbd>O</kbd>: Create pull request options <kbd><c-y></kbd>: Pull RequestのURLをクリップボードにコピー - <kbd>c</kbd>: checkout by name - <kbd>F</kbd>: force checkout + <kbd>c</kbd>: Checkout by name + <kbd>F</kbd>: Force checkout <kbd>d</kbd>: ブランチを削除 - <kbd>r</kbd>: rebase checked-out branch onto this branch + <kbd>r</kbd>: Rebase checked-out branch onto this branch <kbd>M</kbd>: 現在のブランチにマージ - <kbd>f</kbd>: fast-forward this branch from its upstream + <kbd>f</kbd>: Fast-forward this branch from its upstream <kbd>T</kbd>: タグを作成 - <kbd>g</kbd>: view reset options + <kbd>g</kbd>: View reset options <kbd>R</kbd>: ブランチ名を変更 - <kbd>u</kbd>: set/unset upstream + <kbd>u</kbd>: Set/Unset upstream <kbd><enter></kbd |