Skip to content

Commit 17d03ec

Browse files
authored
Update docs and schema for release (#5091)
2 parents 8ced11b + da4494f commit 17d03ec

12 files changed

+35
-19
lines changed

docs/Config.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -703,6 +703,7 @@ keybinding:
703703
pushTag: P
704704
setUpstream: u
705705
fetchRemote: f
706+
addForkRemote: F
706707
sortOrder: s
707708
worktrees:
708709
viewWorktreeOptions: w

docs/Custom_Command_Keybindings.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ The permitted contexts are:
7474
| status | The 'Status' tab |
7575
| files | The 'Files' tab |
7676
| worktrees | The 'Worktrees' tab |
77+
| submodules | The 'Submodules' tab |
7778
| localBranches | The 'Local Branches' tab |
7879
| remotes | The 'Remotes' tab |
7980
| remoteBranches | The context you get when pressing enter on a remote in the remotes tab |
@@ -298,6 +299,7 @@ SelectedCommit
298299
SelectedCommitRange
299300
SelectedFile
300301
SelectedPath
302+
SelectedSubmodule
301303
SelectedLocalBranch
302304
SelectedRemoteBranch
303305
SelectedRemote

docs/keybindings/Keybindings_en.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
317317
| `` d `` | Remove | Remove the selected remote. Any local branches tracking a remote branch from the remote will be unaffected. |
318318
| `` e `` | Edit | Edit the selected remote's name or URL. |
319319
| `` f `` | Fetch | Fetch updates from the remote repository. This retrieves new commits and branches without merging them into your local branches. |
320+
| `` F `` | Add fork remote | Quickly add a fork remote by replacing the owner in the origin URL and optionally check out a branch from new remote. |
320321
| `` / `` | Filter the current view by text | |
321322

322323
## Secondary

docs/keybindings/Keybindings_ja.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,7 @@ _凡例:`<c-b>` はctrl+b、`<a-b>` はalt+b、`B` はshift+bを意味
343343
| `` d `` | 削除 | 選択したリモートを削除します。そのリモートからのリモートブランチを追跡しているローカルブランチは影響を受けません。 |
344344
| `` e `` | 編集 | 選択したリモートの名前またはURLを編集します。 |
345345
| `` f `` | フェッチ | リモートリポジトリから更新をフェッチします。これにより、ローカルブランチにマージせずに新しいコミットとブランチを取得します。 |
346+
| `` F `` | Add fork remote | Quickly add a fork remote by replacing the owner in the origin URL and optionally check out a branch from new remote. |
346347
| `` / `` | 現在のビューをテキストでフィルタリング | |
347348

348349
## リモートブランチ

docs/keybindings/Keybindings_ko.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
267267
| `` d `` | Remove | Remove the selected remote. Any local branches tracking a remote branch from the remote will be unaffected. |
268268
| `` e `` | Edit | Remote를 수정 |
269269
| `` f `` | Fetch | 원격을 업데이트 |
270+
| `` F `` | Add fork remote | Quickly add a fork remote by replacing the owner in the origin URL and optionally check out a branch from new remote. |
270271
| `` / `` | Filter the current view by text | |
271272

272273
## 원격 브랜치

docs/keybindings/Keybindings_nl.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
295295
| `` d `` | Remove | Remove the selected remote. Any local branches tracking a remote branch from the remote will be unaffected. |
296296
| `` e `` | Edit | Wijzig remote |
297297
| `` f `` | Fetch | Fetch remote |
298+
| `` F `` | Add fork remote | Quickly add a fork remote by replacing the owner in the origin URL and optionally check out a branch from new remote. |
298299
| `` / `` | Filter the current view by text | |
299300

300301
## Secondary

docs/keybindings/Keybindings_pl.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,7 @@ _Legenda: `<c-b>` oznacza ctrl+b, `<a-b>` oznacza alt+b, `B` oznacza shift+b_
391391
| `` d `` | Usuń | Usuń wybrany zdalny. Wszelkie lokalne gałęzie śledzące gałąź zdalną z tego zdalnego nie zostaną dotknięte. |
392392
| `` e `` | Edytuj | Edytuj nazwę lub URL wybranego zdalnego. |
393393
| `` f `` | Pobierz | Pobierz aktualizacje z zdalnego repozytorium. Pobiera nowe commity i gałęzie bez scalania ich z lokalnymi gałęziami. |
394+
| `` F `` | Add fork remote | Quickly add a fork remote by replacing the owner in the origin URL and optionally check out a branch from new remote. |
394395
| `` / `` | Filtruj bieżący widok po tekście | |
395396

396397
## Zdalne gałęzie

docs/keybindings/Keybindings_pt.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
326326
| `` d `` | Remover | Remover o controle remoto. Quaisquer ramificações locais de rastreamento de um ramo remoto do controle não serão afetadas. |
327327
| `` e `` | Editar | Edit the selected remote's name or URL. |
328328
| `` f `` | Buscar | Fetch updates from the remote repository. This retrieves new commits and branches without merging them into your local branches. |
329+
| `` F `` | Add fork remote | Quickly add a fork remote by replacing the owner in the origin URL and optionally check out a branch from new remote. |
329330
| `` / `` | Filter the current view by text | |
330331

331332
## Secundário

docs/keybindings/Keybindings_ru.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,7 @@ _Связки клавиш_
363363
| `` d `` | Remove | Remove the selected remote. Any local branches tracking a remote branch from the remote will be unaffected. |
364364
| `` e `` | Edit | Редактировать удалённый репозитории |
365365
| `` f `` | Получить изменения | Получение изменения из удалённого репозитория |
366+
| `` F `` | Add fork remote | Quickly add a fork remote by replacing the owner in the origin URL and optionally check out a branch from new remote. |
366367
| `` / `` | Filter the current view by text | |
367368

368369
## Файлы

docs/keybindings/Keybindings_zh-CN.md

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,13 @@ _图例:`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
6969
| `` y `` | 复制提交属性到剪贴板 | 复制提交属性到剪贴板(如hash、URL、diff、消息、作者)。 |
7070
| `` o `` | 在浏览器中打开提交 | |
7171
| `` n `` | 从提交创建新分支 | |
72-
| `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.<br><br>Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). |
72+
| `` N `` | 移动提交至新分支 | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.<br><br>Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). |
7373
| `` g `` | 查看重置选项 | 查看重置选项 (soft/mixed/hard) 用于重置到选择项 |
7474
| `` C `` | 复制提交(拣选) | 标记提交为已复制。然后,在本地提交视图中,您可以按 `V` (Cherry-Pick) 将已复制的提交粘贴到已检出的分支中。任何时候都可以按 `<esc>` 来取消选择。 |
7575
| `` <c-r> `` | 重置已拣选(复制)的提交 | |
7676
| `` <c-t> `` | 使用外部差异比较工具(git difftool) | |
7777
| `` * `` | 选择当前分支的提交 | |
78-
| `` 0 `` | Focus main view | |
78+
| `` 0 `` | 聚焦主视图 | |
7979
| `` <enter> `` | 查看提交 | |
8080
| `` w `` | 查看工作区选项 | |
8181
| `` / `` | 通过文本过滤当前视图 | |
@@ -89,13 +89,13 @@ _图例:`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
8989
| `` y `` | 复制提交属性到剪贴板 | 复制提交属性到剪贴板(如hash、URL、diff、消息、作者)。 |
9090
| `` o `` | 在浏览器中打开提交 | |
9191
| `` n `` | 从提交创建新分支 | |
92-
| `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.<br><br>Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). |
92+
| `` N `` | 移动提交至新分支 | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.<br><br>Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). |
9393
| `` g `` | 查看重置选项 | 查看重置选项 (soft/mixed/hard) 用于重置到选择项 |
9494
| `` C `` | 复制提交(拣选) | 标记提交为已复制。然后,在本地提交视图中,您可以按 `V` (Cherry-Pick) 将已复制的提交粘贴到已检出的分支中。任何时候都可以按 `<esc>` 来取消选择。 |
9595
| `` <c-r> `` | 重置已拣选(复制)的提交 | |
9696
| `` <c-t> `` | 使用外部差异比较工具(git difftool) | |
9797
| `` * `` | 选择当前分支的提交 | |
98-
| `` 0 `` | Focus main view | |
98+
| `` 0 `` | 聚焦主视图 | |
9999
| `` <enter> `` | 查看提交的文件 | |
100100
| `` w `` | 查看工作区选项 | |
101101
| `` / `` | 开始搜索 | |
@@ -154,12 +154,12 @@ _图例:`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
154154
| `` y `` | 复制提交属性到剪贴板 | 复制提交属性到剪贴板(如hash、URL、diff、消息、作者)。 |
155155
| `` o `` | 在浏览器中打开提交 | |
156156
| `` n `` | 从提交创建新分支 | |
157-
| `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.<br><br>Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). |
157+
| `` N `` | 移动提交至新分支 | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.<br><br>Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). |
158158
| `` g `` | 查看重置选项 | 查看重置选项 (soft/mixed/hard) 用于重置到选择项 |
159159
| `` C `` | 复制提交(拣选) | 标记提交为已复制。然后,在本地提交视图中,您可以按 `V` (Cherry-Pick) 将已复制的提交粘贴到已检出的分支中。任何时候都可以按 `<esc>` 来取消选择。 |
160160
| `` <c-t> `` | 使用外部差异比较工具(git difftool) | |
161161
| `` * `` | 选择当前分支的提交 | |
162-
| `` 0 `` | Focus main view | |
162+
| `` 0 `` | 聚焦主视图 | |
163163
| `` <enter> `` | 查看提交的文件 | |
164164
| `` w `` | 查看工作区选项 | |
165165
| `` / `` | 开始搜索 | |
@@ -185,10 +185,10 @@ _图例:`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
185185
| `` <space> `` | 补丁中包含的切换文件 | 切换文件是否包含在自定义补丁中。请参阅 https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches。 |
186186
| `` a `` | 操作所有文件 | 添加或删除所有提交中的文件到自定义的补丁中。请参阅 https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches。 |
187187
| `` <enter> `` | 输入文件以将所选行添加到补丁中(或切换目录折叠) | 如果已选择一个文件,则Enter进入该文件,以便您可以向自定义补丁添加/删除单独的行。如果选择了目录,则切换目录。 |
188-
| `` ` `` | 切换文件树视图 | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory.<br><br>The default can be changed in the config file with the key 'gui.showFileTree'. |
188+
| `` ` `` | 切换文件树视图 | 在平面布局和树布局之间切换文件视图。平面布局在单个列表中显示所有文件路径,树布局按目录分组文件。<br><br>可以在配置文件中使用 'gui.showFileTree' 键更改默认设置。 |
189189
| `` - `` | 折叠全部文件 | 折叠文件树中的全部目录 |
190190
| `` = `` | 展开全部文件 | 展开文件树中的全部目录 |
191-
| `` 0 `` | Focus main view | |
191+
| `` 0 `` | 聚焦主视图 | |
192192
| `` / `` | 开始搜索 | |
193193

194194
## 文件
@@ -215,13 +215,13 @@ _图例:`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
215215
| `` d `` | 查看'放弃变更'选项 | 查看选中文件的放弃变更选项 |
216216
| `` g `` | 查看上游重置选项 | |
217217
| `` D `` | 重置 | 查看工作树的重置选项(例如:清除工作树)。 |
218-
| `` ` `` | 切换文件树视图 | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory.<br><br>The default can be changed in the config file with the key 'gui.showFileTree'. |
218+
| `` ` `` | 切换文件树视图 | 在平面布局和树布局之间切换文件视图。平面布局在单个列表中显示所有文件路径,树布局按目录分组文件。<br><br>可以在配置文件中使用 'gui.showFileTree' 键更改默认设置。 |
219219
| `` <c-t> `` | 使用外部差异比较工具(git difftool) | |
220220
| `` M `` | View merge conflict options | View options for resolving merge conflicts. |
221221
| `` f `` | 抓取 | 从远程获取变更 |
222222
| `` - `` | 折叠全部文件 | 折叠文件树中的全部目录 |
223223
| `` = `` | 展开全部文件 | 展开文件树中的全部目录 |
224-
| `` 0 `` | Focus main view | |
224+
| `` 0 `` | 聚焦主视图 | |
225225
| `` / `` | 开始搜索 | |
226226

227227
## 本地分支
@@ -232,12 +232,12 @@ _图例:`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
232232
| `` i `` | 显示 git-flow 选项 | |
233233
| `` <space> `` | 检出 | 检出选中的项目 |
234234
| `` n `` | 新分支 | |
235-
| `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.<br><br>Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). |
235+
| `` N `` | 移动提交至新分支 | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.<br><br>Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). |
236236
| `` o `` | 创建拉取请求 | |
237237
| `` O `` | 创建拉取请求选项 | |
238238
| `` <c-y> `` | 复制拉取请求 URL 到剪贴板 | |
239239
| `` c `` | 按名称检出 | 按名称检出。在输入框中,您可以输入'-' 来切换到最后一个分支。 |
240-
| `` - `` | Checkout previous branch | |
240+
| `` - `` | 签出上一个分支 | |
241241
| `` F `` | 强制检出 | 强制检出所选分支。这将在检出所选分支之前放弃工作目录中的所有本地更改。 |
242242
| `` d `` | 删除 | 查看本地/远程分支的删除选项 |
243243
| `` r `` | 变基 | 将检出的分支变基到所选的分支上。 |
@@ -249,7 +249,7 @@ _图例:`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
249249
| `` R `` | 重命名分支 | |
250250
| `` u `` | 查看上游选项 | 查看与分支上游相关的选项,例如设置/取消设置上游和重置为上游。 |
251251
| `` <c-t> `` | 使用外部差异比较工具(git difftool) | |
252-
| `` 0 `` | Focus main view | |
252+
| `` 0 `` | 聚焦主视图 | |
253253
| `` <enter> `` | 查看提交 | |
254254
| `` w `` | 查看工作区选项 | |
255255
| `` / `` | 通过文本过滤当前视图 | |
@@ -261,7 +261,7 @@ _图例:`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
261261
| `` <left> `` | 选择上一个区块 | |
262262
| `` <right> `` | 选择下一个区块 | |
263263
| `` v `` | 切换拖动选择 | |
264-
| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
264+
| `` a `` | 切换代码块选择 | Toggle line-by-line vs. hunk selection mode. |
265265
| `` <c-o> `` | 复制选中文本到剪贴板 | |
266266
| `` o `` | 打开文件 | 使用默认程序打开该文件 |
267267
| `` e `` | 编辑文件 | 使用外部编辑器打开文件 |
@@ -280,7 +280,7 @@ _图例:`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
280280
| `` P `` | 推送标签 | 推送选择的标签到远端。您将在弹窗中选择一个远端。 |
281281
| `` g `` | 重置 | 查看重置选项 (soft/mixed/hard) 用于重置到选择项 |
282282
| `` <c-t> `` | 使用外部差异比较工具(git difftool) | |
283-
| `` 0 `` | Focus main view | |
283+
| `` 0 `` | 聚焦主视图 | |
284284
| `` <enter> `` | 查看提交 | |
285285
| `` w `` | 查看工作区选项 | |
286286
| `` / `` | 通过文本过滤当前视图 | |
@@ -316,7 +316,7 @@ _图例:`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
316316
| `` <left> `` | 选择上一个区块 | |
317317
| `` <right> `` | 选择下一个区块 | |
318318
| `` v `` | 切换拖动选择 | |
319-
| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
319+
| `` a `` | 切换代码块选择 | Toggle line-by-line vs. hunk selection mode. |
320320
| `` <c-o> `` | 复制选中文本到剪贴板 | |
321321
| `` <space> `` | 切换暂存状态 | 切换行暂存状态 |
322322
| `` d `` | 取消变更(git reset) | 当选择未暂存的变更时,使用git reset丢弃该变更。当选择已暂存的变更时,取消暂存该变更 |
@@ -350,7 +350,7 @@ _图例:`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
350350
| `` u `` | 检查更新 | |
351351
| `` <enter> `` | 切换到最近的仓库 | |
352352
| `` a `` | 显示/循环所有分支日志 | |
353-
| `` 0 `` | Focus main view | |
353+
| `` 0 `` | 聚焦主视图 | |
354354

355355
## 确认面板
356356

@@ -377,7 +377,7 @@ _图例:`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
377377
| `` d `` | 删除 | 从贮藏列表中删除该贮藏项 |
378378
| `` n `` | 新分支 | 从选定的贮藏项创建一个新分支。这是通过 git 检查创建贮藏项的提交,从该提交创建一个新分支,然后将贮藏项作为附加提交应用到新分支来实现的。 |
379379
| `` r `` | 重命名贮藏 | |
380-
| `` 0 `` | Focus main view | |
380+
| `` 0 `` | 聚焦主视图 | |
381381
| `` <enter> `` | 查看提交的文件 | |
382382
| `` w `` | 查看工作区选项 | |
383383
| `` / `` | 通过文本过滤当前视图 | |
@@ -391,6 +391,7 @@ _图例:`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
391391
| `` d `` | 删除 | 删除选中的远程。从远程跟踪远程分支的任何本地分支都不会受到影响。 |
392392
| `` e `` | 编辑 | 编辑远程仓库 |
393393
| `` f `` | 抓取 | 抓取远程仓库 |
394+
| `` F `` | Add fork remote | Quickly add a fork remote by replacing the owner in the origin URL and optionally check out a branch from new remote. |
394395
| `` / `` | 通过文本过滤当前视图 | |
395396

396397
## 远程分支
@@ -407,7 +408,7 @@ _图例:`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
407408
| `` s `` | 排序 | |
408409
| `` g `` | 查看重置选项 | 查看重置选项 (soft/mixed/hard) 用于重置到选择项 |
409410
| `` <c-t> `` | 使用外部差异比较工具(git difftool) | |
410-
| `` 0 `` | Focus main view | |
411+
| `` 0 `` | 聚焦主视图 | |
411412
| `` <enter> `` | 查看提交 | |
412413
| `` w `` | 查看工作区选项 | |
413414
| `` / `` | 通过文本过滤当前视图 | |

0 commit comments

Comments
 (0)