Skip to content

Commit 7ae8d71

Browse files
committed
Update keybindings, config docs, and schema
1 parent 1bb3147 commit 7ae8d71

11 files changed

+167
-0
lines changed

docs/Config.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -497,6 +497,7 @@ keybinding:
497497
- "3"
498498
- "4"
499499
- "5"
500+
focusMainView: "0"
500501
nextMatch: "n"
501502
prevMatch: "N"
502503
startSearch: /

docs/keybindings/Keybindings_en.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
6868
| `` ` `` | Toggle file tree view | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory. |
6969
| `` - `` | Collapse all files | Collapse all directories in the files tree |
7070
| `` = `` | Expand all files | Expand all directories in the file tree |
71+
| `` 0 `` | Focus main view | |
7172
| `` / `` | Search the current view by text | |
7273

7374
## Commit summary
@@ -111,6 +112,7 @@ If you would instead like to start an interactive rebase from the selected commi
111112
| `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
112113
| `` C `` | Copy (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
113114
| `` <c-t> `` | Open external diff tool (git difftool) | |
115+
| `` 0 `` | Focus main view | |
114116
| `` <enter> `` | View files | |
115117
| `` w `` | View worktree options | |
116118
| `` / `` | Search the current view by text | |
@@ -152,6 +154,7 @@ If you would instead like to start an interactive rebase from the selected commi
152154
| `` f `` | Fetch | Fetch changes from remote. |
153155
| `` - `` | Collapse all files | Collapse all directories in the files tree |
154156
| `` = `` | Expand all files | Expand all directories in the file tree |
157+
| `` 0 `` | Focus main view | |
155158
| `` / `` | Search the current view by text | |
156159

157160
## Local branches
@@ -177,6 +180,7 @@ If you would instead like to start an interactive rebase from the selected commi
177180
| `` R `` | Rename branch | |
178181
| `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream. |
179182
| `` <c-t> `` | Open external diff tool (git difftool) | |
183+
| `` 0 `` | Focus main view | |
180184
| `` <enter> `` | View commits | |
181185
| `` w `` | View worktree options | |
182186
| `` / `` | Filter the current view by text | |
@@ -203,6 +207,8 @@ If you would instead like to start an interactive rebase from the selected commi
203207
|-----|--------|-------------|
204208
| `` mouse wheel down (fn+up) `` | Scroll down | |
205209
| `` mouse wheel up (fn+down) `` | Scroll up | |
210+
| `` <tab> `` | Switch view | Switch to other view (staged/unstaged changes). |
211+
| `` <esc> `` | Exit back to side panel | |
206212

207213
## Main panel (patch building)
208214

@@ -262,6 +268,7 @@ If you would instead like to start an interactive rebase from the selected commi
262268
| `` C `` | Copy (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
263269
| `` <c-r> `` | Reset copied (cherry-picked) commits selection | |
264270
| `` <c-t> `` | Open external diff tool (git difftool) | |
271+
| `` 0 `` | Focus main view | |
265272
| `` <enter> `` | View commits | |
266273
| `` w `` | View worktree options | |
267274
| `` / `` | Filter the current view by text | |
@@ -280,6 +287,7 @@ If you would instead like to start an interactive rebase from the selected commi
280287
| `` s `` | Sort order | |
281288
| `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
282289
| `` <c-t> `` | Open external diff tool (git difftool) | |
290+
| `` 0 `` | Focus main view | |
283291
| `` <enter> `` | View commits | |
284292
| `` w `` | View worktree options | |
285293
| `` / `` | Filter the current view by text | |
@@ -295,6 +303,13 @@ If you would instead like to start an interactive rebase from the selected commi
295303
| `` f `` | Fetch | Fetch updates from the remote repository. This retrieves new commits and branches without merging them into your local branches. |
296304
| `` / `` | Filter the current view by text | |
297305

306+
## Secondary
307+
308+
| Key | Action | Info |
309+
|-----|--------|-------------|
310+
| `` <tab> `` | Switch view | Switch to other view (staged/unstaged changes). |
311+
| `` <esc> `` | Exit back to side panel | |
312+
298313
## Stash
299314

300315
| Key | Action | Info |
@@ -304,6 +319,7 @@ If you would instead like to start an interactive rebase from the selected commi
304319
| `` d `` | Drop | Remove the stash entry from the stash list. |
305320
| `` n `` | New branch | Create a new branch from the selected stash entry. This works by git checking out the commit that the stash entry was created from, creating a new branch from that commit, then applying the stash entry to the new branch as an additional commit. |
306321
| `` r `` | Rename stash | |
322+
| `` 0 `` | Focus main view | |
307323
| `` <enter> `` | View files | |
308324
| `` w `` | View worktree options | |
309325
| `` / `` | Filter the current view by text | |
@@ -331,6 +347,7 @@ If you would instead like to start an interactive rebase from the selected commi
331347
| `` C `` | Copy (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
332348
| `` <c-r> `` | Reset copied (cherry-picked) commits selection | |
333349
| `` <c-t> `` | Open external diff tool (git difftool) | |
350+
| `` 0 `` | Focus main view | |
334351
| `` <enter> `` | View files | |
335352
| `` w `` | View worktree options | |
336353
| `` / `` | Search the current view by text | |
@@ -360,6 +377,7 @@ If you would instead like to start an interactive rebase from the selected commi
360377
| `` P `` | Push tag | Push the selected tag to a remote. You'll be prompted to select a remote. |
361378
| `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
362379
| `` <c-t> `` | Open external diff tool (git difftool) | |
380+
| `` 0 `` | Focus main view | |
363381
| `` <enter> `` | View commits | |
364382
| `` w `` | View worktree options | |
365383
| `` / `` | Filter the current view by text | |

docs/keybindings/Keybindings_ja.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,13 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
5151
| `` ] `` | 次のタブ | |
5252
| `` [ `` | 前のタブ | |
5353

54+
## Secondary
55+
56+
| Key | Action | Info |
57+
|-----|--------|-------------|
58+
| `` <tab> `` | パネルを切り替え | Switch to other view (staged/unstaged changes). |
59+
| `` <esc> `` | Exit back to side panel | |
60+
5461
## Stash
5562

5663
| Key | Action | Info |
@@ -60,6 +67,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
6067
| `` d `` | Drop | Remove the stash entry from the stash list. |
6168
| `` n `` | 新しいブランチを作成 | Create a new branch from the selected stash entry. This works by git checking out the commit that the stash entry was created from, creating a new branch from that commit, then applying the stash entry to the new branch as an additional commit. |
6269
| `` r `` | Stashを変更 | |
70+
| `` 0 `` | Focus main view | |
6371
| `` <enter> `` | View files | |
6472
| `` w `` | View worktree options | |
6573
| `` / `` | Filter the current view by text | |
@@ -77,6 +85,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
7785
| `` C `` | コミットをコピー (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
7886
| `` <c-r> `` | Reset copied (cherry-picked) commits selection | |
7987
| `` <c-t> `` | Open external diff tool (git difftool) | |
88+
| `` 0 `` | Focus main view | |
8089
| `` <enter> `` | View files | |
8190
| `` w `` | View worktree options | |
8291
| `` / `` | 検索を開始 | |
@@ -125,6 +134,7 @@ If you would instead like to start an interactive rebase from the selected commi
125134
| `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
126135
| `` C `` | コミットをコピー (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
127136
| `` <c-t> `` | Open external diff tool (git difftool) | |
137+
| `` 0 `` | Focus main view | |
128138
| `` <enter> `` | View files | |
129139
| `` w `` | View worktree options | |
130140
| `` / `` | 検索を開始 | |
@@ -146,6 +156,7 @@ If you would instead like to start an interactive rebase from the selected commi
146156
| `` ` `` | ファイルツリーの表示を切り替え | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory. |
147157
| `` - `` | Collapse all files | Collapse all directories in the files tree |
148158
| `` = `` | Expand all files | Expand all directories in the file tree |
159+
| `` 0 `` | Focus main view | |
149160
| `` / `` | 検索を開始 | |
150161

151162
## コミットメッセージ
@@ -190,6 +201,7 @@ If you would instead like to start an interactive rebase from the selected commi
190201
| `` P `` | タグをpush | Push the selected tag to a remote. You'll be prompted to select a remote. |
191202
| `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
192203
| `` <c-t> `` | Open external diff tool (git difftool) | |
204+
| `` 0 `` | Focus main view | |
193205
| `` <enter> `` | コミットを閲覧 | |
194206
| `` w `` | View worktree options | |
195207
| `` / `` | Filter the current view by text | |
@@ -224,6 +236,7 @@ If you would instead like to start an interactive rebase from the selected commi
224236
| `` f `` | Fetch | Fetch changes from remote. |
225237
| `` - `` | Collapse all files | Collapse all directories in the files tree |
226238
| `` = `` | Expand all files | Expand all directories in the file tree |
239+
| `` 0 `` | Focus main view | |
227240
| `` / `` | 検索を開始 | |
228241

229242
## ブランチ
@@ -249,6 +262,7 @@ If you would instead like to start an interactive rebase from the selected commi
249262
| `` R `` | ブランチ名を変更 | |
250263
| `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream. |
251264
| `` <c-t> `` | Open external diff tool (git difftool) | |
265+
| `` 0 `` | Focus main view | |
252266
| `` <enter> `` | コミットを閲覧 | |
253267
| `` w `` | View worktree options | |
254268
| `` / `` | Filter the current view by text | |
@@ -275,6 +289,8 @@ If you would instead like to start an interactive rebase from the selected commi
275289
|-----|--------|-------------|
276290
| `` mouse wheel down (fn+up) `` | 下にスクロール | |
277291
| `` mouse wheel up (fn+down) `` | 上にスクロール | |
292+
| `` <tab> `` | パネルを切り替え | Switch to other view (staged/unstaged changes). |
293+
| `` <esc> `` | Exit back to side panel | |
278294

279295
## メインパネル (Patch Building)
280296

@@ -346,6 +362,7 @@ If you would instead like to start an interactive rebase from the selected commi
346362
| `` s `` | 並び替え | |
347363
| `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
348364
| `` <c-t> `` | Open external diff tool (git difftool) | |
365+
| `` 0 `` | Focus main view | |
349366
| `` <enter> `` | コミットを閲覧 | |
350367
| `` w `` | View worktree options | |
351368
| `` / `` | Filter the current view by text | |
@@ -363,6 +380,7 @@ If you would instead like to start an interactive rebase from the selected commi
363380
| `` C `` | コミットをコピー (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
364381
| `` <c-r> `` | Reset copied (cherry-picked) commits selection | |
365382
| `` <c-t> `` | Open external diff tool (git difftool) | |
383+
| `` 0 `` | Focus main view | |
366384
| `` <enter> `` | コミットを閲覧 | |
367385
| `` w `` | View worktree options | |
368386
| `` / `` | Filter the current view by text | |

docs/keybindings/Keybindings_ko.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,18 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
6464
| `` C `` | 커밋을 복사 (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
6565
| `` <c-r> `` | Reset cherry-picked (copied) commits selection | |
6666
| `` <c-t> `` | Open external diff tool (git difftool) | |
67+
| `` 0 `` | Focus main view | |
6768
| `` <enter> `` | 커밋 보기 | |
6869
| `` w `` | View worktree options | |
6970
| `` / `` | Filter the current view by text | |
7071

72+
## Secondary
73+
74+
| Key | Action | Info |
75+
|-----|--------|-------------|
76+
| `` <tab> `` | 패널 전환 | Switch to other view (staged/unstaged changes). |
77+
| `` <esc> `` | Exit back to side panel | |
78+
7179
## Stash
7280

7381
| Key | Action | Info |
@@ -77,6 +85,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
7785
| `` d `` | Drop | Remove the stash entry from the stash list. |
7886
| `` n `` | 새 브랜치 생성 | Create a new branch from the selected stash entry. This works by git checking out the commit that the stash entry was created from, creating a new branch from that commit, then applying the stash entry to the new branch as an additional commit. |
7987
| `` r `` | Rename stash | |
88+
| `` 0 `` | Focus main view | |
8089
| `` <enter> `` | View selected item's files | |
8190
| `` w `` | View worktree options | |
8291
| `` / `` | Filter the current view by text | |
@@ -94,6 +103,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
94103
| `` C `` | 커밋을 복사 (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
95104
| `` <c-r> `` | Reset cherry-picked (copied) commits selection | |
96105
| `` <c-t> `` | Open external diff tool (git difftool) | |
106+
| `` 0 `` | Focus main view | |
97107
| `` <enter> `` | View selected item's files | |
98108
| `` w `` | View worktree options | |
99109
| `` / `` | 검색 시작 | |
@@ -138,6 +148,8 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
138148
|-----|--------|-------------|
139149
| `` mouse wheel down (fn+up) `` | 아래로 스크롤 | |
140150
| `` mouse wheel up (fn+down) `` | 위로 스크롤 | |
151+
| `` <tab> `` | 패널 전환 | Switch to other view (staged/unstaged changes). |
152+
| `` <esc> `` | Exit back to side panel | |
141153

142154
## 메인 패널 (Patch Building)
143155

@@ -199,6 +211,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
199211
| `` R `` | 브랜치 이름 변경 | |
200212
| `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream. |
201213
| `` <c-t> `` | Open external diff tool (git difftool) | |
214+
| `` 0 `` | Focus main view | |
202215
| `` <enter> `` | 커밋 보기 | |
203216
| `` w `` | View worktree options | |
204217
| `` / `` | Filter the current view by text | |
@@ -252,6 +265,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
252265
| `` s `` | Sort order | |
253266
| `` g `` | View reset options | View reset options (soft/mixed/hard) for resetting onto selected item. |
254267
| `` <c-t> `` | Open external diff tool (git difftool) | |
268+
| `` 0 `` | Focus main view | |
255269
| `` <enter> `` | 커밋 보기 | |
256270
| `` w `` | View worktree options | |
257271
| `` / `` | Filter the current view by text | |
@@ -290,6 +304,7 @@ If you would instead like to start an interactive rebase from the selected commi
290304
| `` g `` | View reset options | View reset options (soft/mixed/hard) for resetting onto selected item. |
291305
| `` C `` | 커밋을 복사 (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
292306
| `` <c-t> `` | Open external diff tool (git difftool) | |
307+
| `` 0 `` | Focus main view | |
293308
| `` <enter> `` | View selected item's files | |
294309
| `` w `` | View worktree options | |
295310
| `` / `` | 검색 시작 | |
@@ -311,6 +326,7 @@ If you would instead like to start an interactive rebase from the selected commi
311326
| `` ` `` | 파일 트리뷰로 전환 | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory. |
312327
| `` - `` | Collapse all files | Collapse all directories in the files tree |
313328
| `` = `` | Expand all files | Expand all directories in the file tree |
329+
| `` 0 `` | Focus main view | |
314330
| `` / `` | 검색 시작 | |
315331

316332
## 커밋메시지
@@ -331,6 +347,7 @@ If you would instead like to start an interactive rebase from the selected commi
331347
| `` P `` | 태그를 push | Push the selected tag to a remote. You'll be prompted to select a remote. |
332348
| `` g `` | 초기화 | View reset options (soft/mixed/hard) for resetting onto selected item. |
333349
| `` <c-t> `` | Open external diff tool (git difftool) | |
350+
| `` 0 `` | Focus main view | |
334351
| `` <enter> `` | 커밋 보기 | |
335352
| `` w `` | View worktree options | |
336353
| `` / `` | Filter the current view by text | |
@@ -365,6 +382,7 @@ If you would instead like to start an interactive rebase from the selected commi
365382
| `` f `` | Fetch | Fetch changes from remote. |
366383
| `` - `` | Collapse all files | Collapse all directories in the files tree |
367384
| `` = `` | Expand all files | Expand all directories in the file tree |
385+
| `` 0 `` | Focus main view | |
368386
| `` / `` | 검색 시작 | |
369387

370388
## 확인 패널

0 commit comments

Comments
 (0)