Skip to content

Commit 0b85db1

Browse files
stefanhallerstefanhaller
committed
Update keybindings, config docs, and schema
1 parent 2ac3e8b commit 0b85db1

11 files changed

+167
-0
lines changed

‎docs/Config.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -501,6 +501,7 @@ keybinding:
501501
- "3"
502502
- "4"
503503
- "5"
504+
focusMainView: "0"
504505
nextMatch: "n"
505506
prevMatch: "N"
506507
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
@@ -112,6 +113,7 @@ If you would instead like to start an interactive rebase from the selected commi
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) | |
114115
| `` * `` | Select commits of current branch | |
116+
| `` 0 `` | Focus main view | |
115117
| `` <enter> `` | View files | |
116118
| `` w `` | View worktree options | |
117119
| `` / `` | Search the current view by text | |
@@ -153,6 +155,7 @@ If you would instead like to start an interactive rebase from the selected commi
153155
| `` f `` | Fetch | Fetch changes from remote. |
154156
| `` - `` | Collapse all files | Collapse all directories in the files tree |
155157
| `` = `` | Expand all files | Expand all directories in the file tree |
158+
| `` 0 `` | Focus main view | |
156159
| `` / `` | Search the current view by text | |
157160

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

208214
## Main panel (patch building)
209215

@@ -264,6 +270,7 @@ If you would instead like to start an interactive rebase from the selected commi
264270
| `` <c-r> `` | Reset copied (cherry-picked) commits selection | |
265271
| `` <c-t> `` | Open external diff tool (git difftool) | |
266272
| `` * `` | Select commits of current branch | |
273+
| `` 0 `` | Focus main view | |
267274
| `` <enter> `` | View commits | |
268275
| `` w `` | View worktree options | |
269276
| `` / `` | Filter the current view by text | |
@@ -282,6 +289,7 @@ If you would instead like to start an interactive rebase from the selected commi
282289
| `` s `` | Sort order | |
283290
| `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
284291
| `` <c-t> `` | Open external diff tool (git difftool) | |
292+
| `` 0 `` | Focus main view | |
285293
| `` <enter> `` | View commits | |
286294
| `` w `` | View worktree options | |
287295
| `` / `` | Filter the current view by text | |
@@ -297,6 +305,13 @@ If you would instead like to start an interactive rebase from the selected commi
297305
| `` f `` | Fetch | Fetch updates from the remote repository. This retrieves new commits and branches without merging them into your local branches. |
298306
| `` / `` | Filter the current view by text | |
299307

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

302317
| Key | Action | Info |
@@ -306,6 +321,7 @@ If you would instead like to start an interactive rebase from the selected commi
306321
| `` d `` | Drop | Remove the stash entry from the stash list. |
307322
| `` 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. |
308323
| `` r `` | Rename stash | |
324+
| `` 0 `` | Focus main view | |
309325
| `` <enter> `` | View files | |
310326
| `` w `` | View worktree options | |
311327
| `` / `` | Filter the current view by text | |
@@ -334,6 +350,7 @@ If you would instead like to start an interactive rebase from the selected commi
334350
| `` <c-r> `` | Reset copied (cherry-picked) commits selection | |
335351
| `` <c-t> `` | Open external diff tool (git difftool) | |
336352
| `` * `` | Select commits of current branch | |
353+
| `` 0 `` | Focus main view | |
337354
| `` <enter> `` | View files | |
338355
| `` w `` | View worktree options | |
339356
| `` / `` | Search the current view by text | |
@@ -363,6 +380,7 @@ If you would instead like to start an interactive rebase from the selected commi
363380
| `` P `` | Push tag | Push the selected tag to a remote. You'll be prompted to select a remote. |
364381
| `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
365382
| `` <c-t> `` | Open external diff tool (git difftool) | |
383+
| `` 0 `` | Focus main view | |
366384
| `` <enter> `` | View commits | |
367385
| `` w `` | View worktree options | |
368386
| `` / `` | 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 | |
@@ -78,6 +86,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
7886
| `` <c-r> `` | Reset copied (cherry-picked) commits selection | |
7987
| `` <c-t> `` | Open external diff tool (git difftool) | |
8088
| `` * `` | Select commits of current branch | |
89+
| `` 0 `` | Focus main view | |
8190
| `` <enter> `` | View files | |
8291
| `` w `` | View worktree options | |
8392
| `` / `` | 検索を開始 | |
@@ -127,6 +136,7 @@ If you would instead like to start an interactive rebase from the selected commi
127136
| `` 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. |
128137
| `` <c-t> `` | Open external diff tool (git difftool) | |
129138
| `` * `` | Select commits of current branch | |
139+
| `` 0 `` | Focus main view | |
130140
| `` <enter> `` | View files | |
131141
| `` w `` | View worktree options | |
132142
| `` / `` | 検索を開始 | |
@@ -148,6 +158,7 @@ If you would instead like to start an interactive rebase from the selected commi
148158
| `` ` `` | ファイルツリーの表示を切り替え | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory. |
149159
| `` - `` | Collapse all files | Collapse all directories in the files tree |
150160
| `` = `` | Expand all files | Expand all directories in the file tree |
161+
| `` 0 `` | Focus main view | |
151162
| `` / `` | 検索を開始 | |
152163

153164
## コミットメッセージ
@@ -192,6 +203,7 @@ If you would instead like to start an interactive rebase from the selected commi
192203
| `` P `` | タグをpush | Push the selected tag to a remote. You'll be prompted to select a remote. |
193204
| `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
194205
| `` <c-t> `` | Open external diff tool (git difftool) | |
206+
| `` 0 `` | Focus main view | |
195207
| `` <enter> `` | コミットを閲覧 | |
196208
| `` w `` | View worktree options | |
197209
| `` / `` | Filter the current view by text | |
@@ -226,6 +238,7 @@ If you would instead like to start an interactive rebase from the selected commi
226238
| `` f `` | Fetch | Fetch changes from remote. |
227239
| `` - `` | Collapse all files | Collapse all directories in the files tree |
228240
| `` = `` | Expand all files | Expand all directories in the file tree |
241+
| `` 0 `` | Focus main view | |
229242
| `` / `` | 検索を開始 | |
230243

231244
## ブランチ
@@ -251,6 +264,7 @@ If you would instead like to start an interactive rebase from the selected commi
251264
| `` R `` | ブランチ名を変更 | |
252265
| `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream. |
253266
| `` <c-t> `` | Open external diff tool (git difftool) | |
267+
| `` 0 `` | Focus main view | |
254268
| `` <enter> `` | コミットを閲覧 | |
255269
| `` w `` | View worktree options | |
256270
| `` / `` | Filter the current view by text | |
@@ -277,6 +291,8 @@ If you would instead like to start an interactive rebase from the selected commi
277291
|-----|--------|-------------|
278292
| `` mouse wheel down (fn+up) `` | 下にスクロール | |
279293
| `` mouse wheel up (fn+down) `` | 上にスクロール | |
294+
| `` <tab> `` | パネルを切り替え | Switch to other view (staged/unstaged changes). |
295+
| `` <esc> `` | Exit back to side panel | |
280296

281297
## メインパネル (Patch Building)
282298

@@ -348,6 +364,7 @@ If you would instead like to start an interactive rebase from the selected commi
348364
| `` s `` | 並び替え | |
349365
| `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
350366
| `` <c-t> `` | Open external diff tool (git difftool) | |
367+
| `` 0 `` | Focus main view | |
351368
| `` <enter> `` | コミットを閲覧 | |
352369
| `` w `` | View worktree options | |
353370
| `` / `` | Filter the current view by text | |
@@ -366,6 +383,7 @@ If you would instead like to start an interactive rebase from the selected commi
366383
| `` <c-r> `` | Reset copied (cherry-picked) commits selection | |
367384
| `` <c-t> `` | Open external diff tool (git difftool) | |
368385
| `` * `` | Select commits of current branch | |
386+
| `` 0 `` | Focus main view | |
369387
| `` <enter> `` | コミットを閲覧 | |
370388
| `` w `` | View worktree options | |
371389
| `` / `` | 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
@@ -65,10 +65,18 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
6565
| `` <c-r> `` | Reset cherry-picked (copied) commits selection | |
6666
| `` <c-t> `` | Open external diff tool (git difftool) | |
6767
| `` * `` | Select commits of current branch | |
68+
| `` 0 `` | Focus main view | |
6869
| `` <enter> `` | 커밋 보기 | |
6970
| `` w `` | View worktree options | |
7071
| `` / `` | Filter the current view by text | |
7172

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

7482
| Key | Action | Info |
@@ -78,6 +86,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
7886
| `` d `` | Drop | Remove the stash entry from the stash list. |
7987
| `` 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. |
8088
| `` r `` | Rename stash | |
89+
| `` 0 `` | Focus main view | |
8190
| `` <enter> `` | View selected item's files | |
8291
| `` w `` | View worktree options | |
8392
| `` / `` | Filter the current view by text | |
@@ -96,6 +105,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
96105
| `` <c-r> `` | Reset cherry-picked (copied) commits selection | |
97106
| `` <c-t> `` | Open external diff tool (git difftool) | |
98107
| `` * `` | Select commits of current branch | |
108+
| `` 0 `` | Focus main view | |
99109
| `` <enter> `` | View selected item's files | |
100110
| `` w `` | View worktree options | |
101111
| `` / `` | 검색 시작 | |
@@ -140,6 +150,8 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
140150
|-----|--------|-------------|
141151
| `` mouse wheel down (fn+up) `` | 아래로 스크롤 | |
142152
| `` mouse wheel up (fn+down) `` | 위로 스크롤 | |
153+
| `` <tab> `` | 패널 전환 | Switch to other view (staged/unstaged changes). |
154+
| `` <esc> `` | Exit back to side panel | |
143155

144156
## 메인 패널 (Patch Building)
145157

@@ -201,6 +213,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
201213
| `` R `` | 브랜치 이름 변경 | |
202214
| `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream. |
203215
| `` <c-t> `` | Open external diff tool (git difftool) | |
216+
| `` 0 `` | Focus main view | |
204217
| `` <enter> `` | 커밋 보기 | |
205218
| `` w `` | View worktree options | |
206219
| `` / `` | Filter the current view by text | |
@@ -254,6 +267,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
254267
| `` s `` | Sort order | |
255268
| `` g `` | View reset options | View reset options (soft/mixed/hard) for resetting onto selected item. |
256269
| `` <c-t> `` | Open external diff tool (git difftool) | |
270+
| `` 0 `` | Focus main view | |
257271
| `` <enter> `` | 커밋 보기 | |
258272
| `` w `` | View worktree options | |
259273
| `` / `` | Filter the current view by text | |
@@ -293,6 +307,7 @@ If you would instead like to start an interactive rebase from the selected commi
293307
| `` 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. |
294308
| `` <c-t> `` | Open external diff tool (git difftool) | |
295309
| `` * `` | Select commits of current branch | |
310+
| `` 0 `` | Focus main view | |
296311
| `` <enter> `` | View selected item's files | |
297312
| `` w `` | View worktree options | |
298313
| `` / `` | 검색 시작 | |
@@ -314,6 +329,7 @@ If you would instead like to start an interactive rebase from the selected commi
314329
| `` ` `` | 파일 트리뷰로 전환 | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory. |
315330
| `` - `` | Collapse all files | Collapse all directories in the files tree |
316331
| `` = `` | Expand all files | Expand all directories in the file tree |
332+
| `` 0 `` | Focus main view | |
317333
| `` / `` | 검색 시작 | |
318334

319335
## 커밋메시지
@@ -334,6 +350,7 @@ If you would instead like to start an interactive rebase from the selected commi
334350
| `` P `` | 태그를 push | Push the selected tag to a remote. You'll be prompted to select a remote. |
335351
| `` g `` | 초기화 | View reset options (soft/mixed/hard) for resetting onto selected item. |
336352
| `` <c-t> `` | Open external diff tool (git difftool) | |
353+
| `` 0 `` | Focus main view | |
337354
| `` <enter> `` | 커밋 보기 | |
338355
| `` w `` | View worktree options | |
339356
| `` / `` | Filter the current view by text | |
@@ -368,6 +385,7 @@ If you would instead like to start an interactive rebase from the selected commi
368385
| `` f `` | Fetch | Fetch changes from remote. |
369386
| `` - `` | Collapse all files | Collapse all directories in the files tree |
370387
| `` = `` | Expand all files | Expand all directories in the file tree |
388+
| `` 0 `` | Focus main view | |
371389
| `` / `` | 검색 시작 | |
372390

373391
## 확인 패널

0 commit comments

Comments
 (0)