diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2023-05-21 11:34:19 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-21 11:34:19 +1000 |
| commit | 5b933762c2c0d7d8c1b26720a2d4c39b57e1af6e (patch) | |
| tree | 22a7ec053c0a9d82b6af8a09d2f60fdf249c6840 | |
| parent | 2e0d0a92eedef1c9059e666548004e03aa143c8a (diff) | |
| parent | 3eed99716105481dffddc9a74db0d444a9c469a2 (diff) | |
Merge pull request #2651 from jesseduffield/strikethrough-menu
| -rw-r--r-- | .vscode/tasks.json | 4 | ||||
| -rw-r--r-- | docs/Config.md | 3 | ||||
| -rw-r--r-- | docs/keybindings/Keybindings_en.md | 146 | ||||
| -rw-r--r-- | docs/keybindings/Keybindings_ja.md | 146 | ||||
| -rw-r--r-- | docs/keybindings/Keybindings_ko.md | 146 | ||||
| -rw-r--r-- | docs/keybindings/Keybindings_nl.md | 146 | ||||
| -rw-r--r-- | docs/keybindings/Keybindings_pl.md | 146 | ||||
| -rw-r--r-- | docs/keybindings/Keybindings_zh.md | 146 | ||||
| -rw-r--r-- | pkg/cheatsheet/generate.go | 25 | ||||
| -rw-r--r-- | pkg/gui/context/menu_context.go | 30 | ||||
| -rw-r--r-- | pkg/gui/controllers/menu_controller.go | 2 | ||||
| -rw-r--r-- | pkg/gui/keybindings/keybindings.go | 201 | ||||
| -rw-r--r-- | pkg/gui/options_map.go | 4 | ||||
| -rw-r--r-- | pkg/gui/style/decoration.go | 19 | ||||
| -rw-r--r-- | pkg/gui/style/text_style.go | 6 | ||||
| -rw-r--r-- | pkg/i18n/english.go | 2 | ||||
| -rw-r--r-- | pkg/theme/style.go | 2 |
17 files changed, 586 insertions, 588 deletions
diff --git a/.vscode/tasks.json b/.vscode/tasks.json index f020e1d0c..8027a5344 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -5,8 +5,8 @@ "tasks": [ { "label": "Generate cheatsheet", - "type": "process", - "command": "go run scripts/cheatsheet/main.go ", + "type": "shell", + "command": "go run scripts/cheatsheet/main.go generate", "problemMatcher": [], }, { diff --git a/docs/Config.md b/docs/Config.md index f752e026b..bc860156c 100644 --- a/docs/Config.md +++ b/docs/Config.md @@ -88,7 +88,7 @@ git: # displays the whole git graph by default in the commits panel (equivalent to passing the `--all` argument to `git log`) showWholeGraph: false skipHookPrefix: WIP - # The main branches. We colour commits green if they belong to one of these branches, + # The main branches. We colour commits green if they belong to one of these branches, # so that you can easily see which commits are unique to your branch (coloured in yellow) mainBranches: [master, main] autoFetch: true @@ -347,6 +347,7 @@ The available attributes are: - default - reverse # useful for high-contrast - underline +- strikethrough ## Highlighting the selected line diff --git a/docs/keybindings/Keybindings_en.md b/docs/keybindings/Keybindings_en.md index feb188b28..8e48afcba 100644 --- a/docs/keybindings/Keybindings_en.md +++ b/docs/keybindings/Keybindings_en.md @@ -2,28 +2,30 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct # Lazygit Keybindings +_Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ + ## Global Keybindings <pre> - <kbd>ctrl+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><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>ctrl+p</kbd>: view custom patch options + <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>ctrl+s</kbd>: view filter-by-path options + <kbd><c-s></kbd>: view filter-by-path options <kbd>W</kbd>: open diff menu - <kbd>ctrl+e</kbd>: open diff menu - <kbd>ctrl+w</kbd>: Toggle whether or not whitespace changes are shown in the diff view + <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>ctrl+z</kbd>: redo (via reflog) (experimental) + <kbd><c-z></kbd>: redo (via reflog) (experimental) <kbd>P</kbd>: push <kbd>p</kbd>: pull </pre> @@ -33,9 +35,9 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct <pre> <kbd>,</kbd>: previous page <kbd>.</kbd>: next page - <kbd><</kbd>: scroll to top + <kbd><</kbd>: scroll to top <kbd>/</kbd>: start search - <kbd>></kbd>: scroll to bottom + <kbd>></kbd>: scroll to bottom <kbd>H</kbd>: scroll left <kbd>L</kbd>: scroll right <kbd>]</kbd>: next tab @@ -45,29 +47,29 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct ## Commit Files <pre> - <kbd>ctrl+o</kbd>: copy the committed file name to the clipboard + <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><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><enter></kbd>: enter file to add selected lines to the patch (or toggle directory collapsed) <kbd>`</kbd>: toggle file tree view </pre> ## Commit Summary <pre> - <kbd>enter</kbd>: confirm - <kbd>esc</kbd>: close + <kbd><enter></kbd>: confirm + <kbd><esc></kbd>: close </pre> ## Commits <pre> - <kbd>ctrl+o</kbd>: copy commit SHA to clipboard - <kbd>ctrl+r</kbd>: reset cherry-picked (copied) commits selection + <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 @@ -78,38 +80,38 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct <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>ctrl+j</kbd>: move commit down one - <kbd>ctrl+k</kbd>: move commit up one + <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>ctrl+l</kbd>: open log menu - <kbd>space</kbd>: checkout 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><enter></kbd>: view selected item's files </pre> ## 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>ctrl+o</kbd>: copy the file name to the clipboard + <kbd><c-o></kbd>: copy the file name to the clipboard <kbd>d</kbd>: view 'discard changes' options - <kbd>space</kbd>: toggle staged - <kbd>ctrl+b</kbd>: Filter files (staged/unstaged) + <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 @@ -121,7 +123,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct <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><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 @@ -132,13 +134,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct ## Local Branches <pre> - <kbd>ctrl+o</kbd>: copy branch name to clipboard + <kbd><c-o></kbd>: copy branch name to clipboard <kbd>i</kbd>: show git-flow options - <kbd>space</kbd>: checkout + <kbd><space></kbd>: checkout <kbd>n</kbd>: new branch <kbd>o</kbd>: create pull request <kbd>O</kbd>: create pull request options - <kbd>ctrl+y</kbd>: copy pull request URL to clipboard + <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 @@ -149,7 +151,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct <kbd>g</kbd>: view reset options <kbd>R</kbd>: rename branch <kbd>u</kbd>: set/unset upstream - <kbd>enter</kbd>: view commits + <kbd><enter></kbd>: view commits </pre> ## Main Panel (Merging) @@ -157,53 +159,53 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct <pre> <kbd>e</kbd>: edit file <kbd>o</kbd>: open file - <kbd>◀</kbd>: select previous conflict - <kbd>▶</kbd>: select next conflict - <kbd>▲</kbd>: select previous hunk - <kbd>▼</kbd>: select next hunk + <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><space></kbd>: pick hunk <kbd>b</kbd>: pick all hunks - <kbd>esc</kbd>: return to files panel + <kbd><esc></kbd>: return to files panel </pre> ## Main Panel (Normal) <pre> - <kbd>mouse wheel ▼</kbd>: scroll down (fn+up) - <kbd>mouse wheel ▲</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) <pre> - <kbd>◀</kbd>: select previous hunk - <kbd>▶</kbd>: select next hunk + <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>ctrl+o</kbd>: copy the selected text to the clipboard + <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><space></kbd>: add/remove line(s) to patch + <kbd><esc></kbd>: exit custom patch builder </pre> ## Main Panel (Staging) <pre> - <kbd>◀</kbd>: select previous hunk - <kbd>▶</kbd>: select next hunk + <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>ctrl+o</kbd>: copy the selected text to the clipboard + <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><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 @@ -214,38 +216,38 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct ## Menu <pre> - <kbd>enter</kbd>: execute - <kbd>esc</kbd>: close + <kbd><enter></kbd>: execute + <kbd><esc></kbd>: close </pre> ## Reflog <pre> - <kbd>ctrl+o</kbd>: copy commit SHA to clipboard - <kbd>space</kbd>: checkout commit + <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>ctrl+r</kbd>: reset cherry-picked (copied) commits selection - <kbd>enter</kbd>: view commits + <kbd><c-r></kbd>: reset cherry-picked (copied) commits selection + <kbd><enter></kbd>: view commits </pre> ## Remote Branches <pre> - <kbd>ctrl+o</kbd>: copy branch name to clipboard - <kbd>space</kbd>: checkout + <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><esc></kbd>: Return to remotes list <kbd>g</kbd>: view reset options - <kbd>enter</kbd>: view commits + <kbd><enter></kbd>: view commits </pre> ## Remotes @@ -260,12 +262,12 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct ## Stash <pre> - <kbd>space</kbd>: apply + <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><enter></kbd>: view selected item's files </pre> ## Status @@ -274,30 +276,30 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct <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><enter></kbd>: switch to a recent repo <kbd>a</kbd>: show all branch logs </pre> ## Sub-commits <pre> - <kbd>ctrl+o</kbd>: copy commit SHA to clipboard - <kbd>space</kbd>: checkout commit + <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>ctrl+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> ## Submodules <pre> - <kbd>ctrl+o</kbd>: copy submodule name to clipboard - <kbd>enter</kbd>: enter submodule + <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 @@ -309,10 +311,10 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct ## Tags <pre> - <kbd>space</kbd>: checkout + <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><enter></kbd>: view commits </pre> diff --git a/docs/keybindings/Keybindings_ja.md b/docs/keybindings/Keybindings_ja.md index 69aa0d4e7..80430a69d 100644 --- a/docs/keybindings/Keybindings_ja.md +++ b/docs/keybindings/Keybindings_ja.md @@ -2,28 +2,30 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct # Lazygit キーバインド +_Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ + ## グローバルキーバインド <pre> - <kbd>ctrl+r</kbd>: 最近使用したリポジトリに切り替え - <kbd>pgup</kbd>: メインパネルを上にスクロール (fn+up/shift+k) - <kbd>pgdown</kbd>: メインパネルを下にスクロール (fn+down/shift+j) + <kbd><c-r></kbd>: 最近使用したリポジトリに切り替え + <kbd><pgup></kbd>: メインパネルを上にスクロール (fn+up/shift+k) + <kbd><pgdown></kbd>: メインパネルを下にスクロール (fn+down/shift+j) <kbd>@</kbd>: コマンドログメニューを開く <kbd>}</kbd>: Increase the size of the context shown around changes in the diff view <kbd>{</kbd>: Decrease the size of the context shown around changes in the diff view <kbd>:</kbd>: カスタムコマンドを実行 - <kbd>ctrl+p</kbd>: view custom patch 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>ctrl+s</kbd>: view filter-by-path options + <kbd><c-s></kbd>: view filter-by-path options <kbd>W</kbd>: 差分メニューを開く - <kbd>ctrl+e</kbd>: 差分メニューを開く - <kbd>ctrl+w</kbd>: 空白文字の差分の表示有無を切り替え + <kbd><c-e></kbd>: 差分メニューを開く + <kbd><c-w></kbd>: 空白文字の差分の表示有無を切り替え <kbd>z</kbd>: アンドゥ (via reflog) (experimental) - <kbd>ctrl+z</kbd>: リドゥ (via reflog) (experimental) + <kbd><c-z></kbd>: リドゥ (via reflog) (experimental) <kbd>P</kbd>: push <kbd>p</kbd>: pull </pre> @@ -33,9 +35,9 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct <pre> <kbd>,</kbd>: 前のページ <kbd>.</kbd>: 次のページ - <kbd><</kbd>: 最上部までスクロール + <kbd><</kbd>: 最上部までスクロール <kbd>/</kbd>: 検索を開始 - <kbd>></kbd>: 最下部までスクロール + <kbd>></kbd>: 最下部までスクロール <kbd>H</kbd>: 左スクロール <kbd>L</kbd>: 右スクロール <kbd>]</kbd>: 次のタブ @@ -45,34 +47,34 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct ## Stash <pre> - <kbd>space</kbd>: 適用 + <kbd><space></kbd>: 適用 <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 <pre> - <kbd>ctrl+o</kbd>: コミットのSHAをクリップボードにコピー - <kbd>space</kbd>: コミットをチェックアウト + <kbd><c-o></kbd>: コミットのSHAをクリップボードにコピー + <kbd><space></kbd>: コミットをチェックアウト <kbd>y</kbd>: コミットの情報をコピー <kbd>o</kbd>: ブラウザでコミットを開く <kbd>n</kbd>: コミットにブランチを作成 <kbd>g</kbd>: view reset options <kbd>c</kbd>: コミットをコピー (cherry-pick) <kbd>C</kbd>: コミットを範囲コピー (cherry-pick) - <kbd>ctrl+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>ctrl+o</kbd>: コミットのSHAをクリップボードにコピー - <kbd>ctrl+r</kbd>: reset cherry-picked (copied) commits selection + <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 @@ -83,50 +85,50 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct <kbd>p</kbd>: pick commit (when mid-rebase) <kbd>F</kbd>: このコミットに対するfixupコミットを作成 <kbd>S</kbd>: squash all 'fixup!' commits above selected commit (autosquash) - <kbd>ctrl+j</kbd>: コミットを1つ下に移動 - <kbd>ctrl+k</kbd>: コミットを1つ上に移動 + <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>t</kbd>: コミットをrevert <kbd>T</kbd>: タグを作成 - <kbd>ctrl+l</kbd>: ログメニューを開く - <kbd>space</kbd>: コミットをチェックアウト + <kbd><c-l></kbd>: ログメニューを開く + <kbd><space></kbd>: コミットをチェックアウト <kbd>y</kbd>: コミットの情報をコピー <kbd>o</kbd>: ブラウザでコミットを開く <kbd>n</kbd>: コミットにブランチを作成 <kbd>g</kbd>: view reset options <kbd>c</kbd>: コミットをコピー (cherry-pick) <kbd>C</kbd>: コミットを範囲コピー (cherry-pick) - <kbd>enter</kbd>: view selected item's files + <kbd><enter></kbd>: view selected item's files </pre> ## コミットファイル <pre> - <kbd>ctrl+o</kbd>: コミットされたファイル名をクリップボードにコピー + <kbd><c-o></kbd>: コミットされたファイル名をクリップボードにコピー <kbd>c</kbd>: checkout file <kbd>d</kbd>: discard this commit's changes to this file <kbd>o</kbd>: ファイルを開く <kbd>e</kbd>: ファイルを編集 - <kbd>space</kbd>: toggle file included in patch + <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><enter></kbd>: enter file to add selected lines to the patch (or toggle directory collapsed) <kbd>`</kbd>: ファイルツリーの表示を切り替え </pre> ## コミットメッセージ <pre> - <kbd>enter</kbd>: 確認 - <kbd>esc</kbd>: 閉じる + <kbd><enter></kbd>: 確認 + <kbd><esc></kbd>: 閉じる </pre> ## サブモジュール <pre> - <kbd>ctrl+o</kbd>: サブモジュール名をクリップボードにコピー - <kbd>enter</kbd>: サブモジュールを開く + <kbd><c-o></kbd>: サブモジュール名をクリップボードにコピー + <kbd><enter></kbd>: サブモジュールを開く <kbd>d</kbd>: サブモジュールを削除 <kbd>u</kbd>: サブモジュールを更新 <kbd>n</kbd>: サブモジュールを新規追加 @@ -141,28 +143,28 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct <kbd>o</kbd>: 設定ファイルを開く <kbd>e</kbd>: 設定ファイルを編集 <kbd>u</kbd>: 更新を確認 - <kbd>enter</kbd>: 最近使用したリポジトリに切り替え + <kbd><enter></kbd>: 最近使用したリポジトリに切り替え <kbd>a</kbd>: すべてのブランチログを表示 </pre> ## タグ <pre> - <kbd>space</kbd>: チェックアウト + <kbd><space></kbd>: チェックアウト <kbd>d</kbd>: タグを削除 <kbd>P</kbd>: タグをpush <kbd>n</kbd>: タグを作成 <kbd>g</kbd>: view reset options - <kbd>enter</kbd>: コミットを閲覧 + <kbd><enter></kbd>: コミットを閲覧 </pre> ## ファイル <pre> - <kbd>ctrl+o</kbd>: ファイル名をクリップボードにコピー + <kbd><c-o></kbd>: ファイル名をクリップボードにコピー <kbd>d</kbd>: view 'discard changes' options - <kbd>space</kbd>: ステージ/アンステージ - <kbd>ctrl+b</kbd>: ファイルをフィルタ (ステージ/アンステージ) + <kbd><space></kbd>: ステージ/アンステージ + <kbd><c-b></kbd>: ファイルをフィルタ (ステージ/アンステージ) <kbd>c</kbd>: 変更をコミット <kbd>w</kbd>: pre-commitフックを実行せずに変更をコミット <kbd>A</kbd>: 最新のコミットにamend @@ -174,7 +176,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct <kbd>s</kbd>: 変更をstash <kbd>S</kbd>: view stash options <kbd>a</kbd>: すべての変更をステージ/アンステージ - <kbd>enter</kbd>: stage individual hunks/lines for file, or collapse/expand for directory + <kbd><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>: ファイルツリーの表示を切り替え @@ -185,13 +187,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct ## ブランチ <pre> - <kbd>ctrl+o</kbd>: ブランチ名をクリップボードにコピー + <kbd><c-o></kbd>: ブランチ名をクリップボードにコピー <kbd>i</kbd>: show git-flow options - <kbd>space</kbd>: チェックアウト + <kbd><space></kbd>: チェックアウト <kbd>n</kbd>: 新しいブランチを作成 <kbd>o</kbd>: Pull Requestを作成 <kbd>O</kbd>: create pull request options - <kbd>ctrl+y</kbd>: Pull RequestのURLをクリップボードにコピー + <kbd><c-y></kbd>: Pull RequestのURLをクリップボードにコピー <kbd>c</kbd>: checkout by name <kbd>F</kbd>: force checkout <kbd>d</kbd>: ブランチを削除 @@ -202,7 +204,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct <kbd>g</kbd>: view reset options <kbd>R</kbd>: ブランチ名を変更 <kbd>u</kbd>: set/unset upstream - <kbd>enter</kbd>: コミットを閲覧 + <kbd><enter></kbd>: コミットを閲覧 </pre> ## メインパネル (Merging) @@ -210,53 +212,53 @@ _This file is auto-generated. To update, make the changes in th |