diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/Config.md | 3 | ||||
| -rw-r--r-- | docs/README.md | 3 | ||||
| -rw-r--r-- | docs/Searching.md | 21 | ||||
| -rw-r--r-- | docs/keybindings/Keybindings_en.md | 19 | ||||
| -rw-r--r-- | docs/keybindings/Keybindings_ja.md | 17 | ||||
| -rw-r--r-- | docs/keybindings/Keybindings_ko.md | 17 | ||||
| -rw-r--r-- | docs/keybindings/Keybindings_nl.md | 19 | ||||
| -rw-r--r-- | docs/keybindings/Keybindings_pl.md | 19 | ||||
| -rw-r--r-- | docs/keybindings/Keybindings_ru.md | 17 | ||||
| -rw-r--r-- | docs/keybindings/Keybindings_zh-CN.md | 19 | ||||
| -rw-r--r-- | docs/keybindings/Keybindings_zh-TW.md | 17 |
11 files changed, 150 insertions, 21 deletions
diff --git a/docs/Config.md b/docs/Config.md index 86681264c..08e82b5ab 100644 --- a/docs/Config.md +++ b/docs/Config.md @@ -36,6 +36,9 @@ gui: - bold inactiveBorderColor: - white + searchingActiveBorderColor: + - cyan + - bold optionsTextColor: - blue selectedLineBgColor: diff --git a/docs/README.md b/docs/README.md index 4f58a2a56..c0c8191d2 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,7 +1,8 @@ -# Documentation Overview
+# Documentation Overview
* [Configuration](./Config.md).
* [Custom Commands](./Custom_Command_Keybindings.md)
* [Custom Pagers](./Custom_Pagers.md)
* [Keybindings](./keybindings)
* [Undo/Redo](./Undoing.md)
+* [Searching/Filtering](./Searching.md)
diff --git a/docs/Searching.md b/docs/Searching.md new file mode 100644 index 000000000..589831c55 --- /dev/null +++ b/docs/Searching.md @@ -0,0 +1,21 @@ +# Searching/Filtering + +## View searching/filtering + +Depending on the currently focused view, hitting '/' will bring up a filter or search prompt. When filtering, the contents of the view will be filtered down to only those lines which match the query string. When searching, the contents of the view are not filtered, but matching lines are highlighted and you can iterate through matches with `n`/`N`. + +We intend to support filtering for the files view soon, but at the moment it uses searching. We intend to continue using search for the commits view because you typically care about the commits that come before/after a matching commit. + +If you would like both filtering and searching to be enabled on a given view, please raise an issue for this. + +## Filtering files by status + +You can filter the files view to only show staged/unstaged files by pressing `<c-b>` in the files view. + +## Filtering commits by file path + +You can filter the commits view to only show commits which contain changes to a given file path. + +You can do this in a couple of ways: +1) Start lazygit with the -f flag e.g. `lazygit -f my/path` +2) From within lazygit, press `<c-s>` and then enter the path of the file you want to filter by diff --git a/docs/keybindings/Keybindings_en.md b/docs/keybindings/Keybindings_en.md index 4dee9cbad..5e682be7e 100644 --- a/docs/keybindings/Keybindings_en.md +++ b/docs/keybindings/Keybindings_en.md @@ -36,8 +36,8 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>,</kbd>: Previous page <kbd>.</kbd>: Next page <kbd><</kbd>: Scroll to top - <kbd>/</kbd>: Start search <kbd>></kbd>: Scroll to bottom + <kbd>/</kbd>: Search the current view by text <kbd>H</kbd>: Scroll left <kbd>L</kbd>: Scroll right <kbd>]</kbd>: Next tab @@ -56,6 +56,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <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>/</kbd>: Search the current view by text </pre> ## Commit summary @@ -96,6 +97,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>c</kbd>: Copy commit (cherry-pick) <kbd>C</kbd>: Copy commit range (cherry-pick) <kbd><enter></kbd>: View selected item's files + <kbd>/</kbd>: Search the current view by text </pre> ## Confirmation panel @@ -111,7 +113,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <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-b></kbd>: Filter files by status <kbd>c</kbd>: Commit changes <kbd>w</kbd>: Commit changes without pre-commit hook <kbd>A</kbd>: Amend last commit @@ -129,6 +131,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>`</kbd>: Toggle file tree view <kbd>M</kbd>: Open external merge tool (git mergetool) <kbd>f</kbd>: Fetch + <kbd>/</kbd>: Search the current view by text </pre> ## Local branches @@ -152,6 +155,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>R</kbd>: Rename branch <kbd>u</kbd>: Set/Unset upstream <kbd><enter></kbd>: View commits + <kbd>/</kbd>: Filter the current view by text </pre> ## Main panel (merging) @@ -190,6 +194,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>e</kbd>: Edit file <kbd><space></kbd>: Add/Remove line(s) to patch <kbd><esc></kbd>: Exit custom patch builder + <kbd>/</kbd>: Search the current view by text </pre> ## Main panel (staging) @@ -211,6 +216,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>c</kbd>: Commit changes <kbd>w</kbd>: Commit changes without pre-commit hook <kbd>C</kbd>: Commit changes using git editor + <kbd>/</kbd>: Search the current view by text </pre> ## Menu @@ -218,6 +224,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <pre> <kbd><enter></kbd>: Execute <kbd><esc></kbd>: Close + <kbd>/</kbd>: Filter the current view by text </pre> ## Reflog @@ -233,6 +240,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>C</kbd>: Copy commit range (cherry-pick) <kbd><c-r></kbd>: Reset cherry-picked (copied) commits selection <kbd><enter></kbd>: View commits + <kbd>/</kbd>: Filter the current view by text </pre> ## Remote branches @@ -245,9 +253,9 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <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>/</kbd>: Filter the current view by text </pre> ## Remotes @@ -257,6 +265,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>n</kbd>: Add new remote <kbd>d</kbd>: Remove remote <kbd>e</kbd>: Edit remote + <kbd>/</kbd>: Filter the current view by text </pre> ## Stash @@ -268,6 +277,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>n</kbd>: New branch <kbd>r</kbd>: Rename stash <kbd><enter></kbd>: View selected item's files + <kbd>/</kbd>: Filter the current view by text </pre> ## Status @@ -293,6 +303,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <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>/</kbd>: Search the current view by text </pre> ## Submodules @@ -306,6 +317,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>e</kbd>: Update submodule URL <kbd>i</kbd>: Initialize submodule <kbd>b</kbd>: View bulk submodule options + <kbd>/</kbd>: Filter the current view by text </pre> ## Tags @@ -317,4 +329,5 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>n</kbd>: Create tag <kbd>g</kbd>: View reset options <kbd><enter></kbd>: View commits + <kbd>/</kbd>: Filter the current view by text </pre> diff --git a/docs/keybindings/Keybindings_ja.md b/docs/keybindings/Keybindings_ja.md index 1fbef475a..787796679 100644 --- a/docs/keybindings/Keybindings_ja.md +++ b/docs/keybindings/Keybindings_ja.md @@ -36,8 +36,8 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>,</kbd>: 前のページ <kbd>.</kbd>: 次のページ <kbd><</kbd>: 最上部までスクロール - <kbd>/</kbd>: 検索を開始 <kbd>></kbd>: 最下部までスクロール + <kbd>/</kbd>: 検索を開始 <kbd>H</kbd>: 左スクロール <kbd>L</kbd>: 右スクロール <kbd>]</kbd>: 次のタブ @@ -53,6 +53,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>n</kbd>: 新しいブランチを作成 <kbd>r</kbd>: Stashを変更 <kbd><enter></kbd>: View selected item's files + <kbd>/</kbd>: Filter the current view by text </pre> ## Sub-commits @@ -68,6 +69,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>C</kbd>: コミットを範囲コピー (cherry-pick) <kbd><c-r></kbd>: Reset cherry-picked (copied) commits selection <kbd><enter></kbd>: View selected item's files + <kbd>/</kbd>: 検索を開始 </pre> ## コミット @@ -101,6 +103,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>c</kbd>: コミットをコピー (cherry-pick) <kbd>C</kbd>: コミットを範囲コピー (cherry-pick) <kbd><enter></kbd>: View selected item's files + <kbd>/</kbd>: 検索を開始 </pre> ## コミットファイル @@ -115,6 +118,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <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>: ファイルツリーの表示を切り替え + <kbd>/</kbd>: 検索を開始 </pre> ## コミットメッセージ @@ -135,6 +139,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>e</kbd>: サブモジュールのURLを更新 <kbd>i</kbd>: サブモジュールを初期化 <kbd>b</kbd>: View bulk submodule options + <kbd>/</kbd>: Filter the current view by text </pre> ## ステータス @@ -156,6 +161,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>n</kbd>: タグを作成 <kbd>g</kbd>: View reset options <kbd><enter></kbd>: コミットを閲覧 + <kbd>/</kbd>: Filter the current view by text </pre> ## ファイル @@ -182,6 +188,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>`</kbd>: ファイルツリーの表示を切り替え <kbd>M</kbd>: Git mergetoolを開く <kbd>f</kbd>: Fetch + <kbd>/</kbd>: 検索を開始 </pre> ## ブランチ @@ -205,6 +212,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>R</kbd>: ブランチ名を変更 <kbd>u</kbd>: Set/Unset upstream <kbd><enter></kbd>: コミットを閲覧 + <kbd>/</kbd>: Filter the current view by text </pre> ## メインパネル (Merging) @@ -243,6 +251,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>e</kbd>: ファイルを編集 <kbd><space></kbd>: 行をパッチに追加/削除 <kbd><esc></kbd>: Exit custom patch builder + <kbd>/</kbd>: 検索を開始 </pre> ## メインパネル (Staging) @@ -264,6 +273,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>c</kbd>: 変更をコミット <kbd>w</kbd>: pre-commitフックを実行せずに変更をコミット <kbd>C</kbd>: gitエディタを使用して変更をコミット + <kbd>/</kbd>: 検索を開始 </pre> ## メニュー @@ -271,6 +281,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <pre> <kbd><enter></kbd>: 実行 <kbd><esc></kbd>: 閉じる + <kbd>/</kbd>: Filter the current view by text </pre> ## リモート @@ -280,6 +291,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>n</kbd>: リモートを新規追加 <kbd>d</kbd>: リモートを削除 <kbd>e</kbd>: リモートを編集 + <kbd>/</kbd>: Filter the current view by text </pre> ## リモートブランチ @@ -292,9 +304,9 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>r</kbd>: Rebase checked-out branch onto this branch <kbd>d</kbd>: ブランチを削除 <kbd>u</kbd>: Set as upstream of checked-out branch - <kbd><esc></kbd>: リモート一覧に戻る <kbd>g</kbd>: View reset options <kbd><enter></kbd>: コミットを閲覧 + <kbd>/</kbd>: Filter the current view by text </pre> ## 参照ログ @@ -310,6 +322,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>C</kbd>: コミットを範囲コピー (cherry-pick) <kbd><c-r></kbd>: Reset cherry-picked (copied) commits selection <kbd><enter></kbd>: コミットを閲覧 + <kbd>/</kbd>: Filter the current view by text </pre> ## 確認パネル diff --git a/docs/keybindings/Keybindings_ko.md b/docs/keybindings/Keybindings_ko.md index 54c09e7e8..3ebe1f3ad 100644 --- a/docs/keybindings/Keybindings_ko.md +++ b/docs/keybindings/Keybindings_ko.md @@ -36,8 +36,8 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>,</kbd>: 이전 페이지 <kbd>.</kbd>: 다음 페이지 <kbd><</kbd>: 맨 위로 스크롤 - <kbd>/</kbd>: 검색 시작 <kbd>></kbd>: 맨 아래로 스크롤 + <kbd>/</kbd>: 검색 시작 <kbd>H</kbd>: 우 스크롤 <kbd>L</kbd>: 좌 스크롤 <kbd>]</kbd>: 이전 탭 @@ -57,6 +57,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>C</kbd>: 커밋을 범위로 복사 (cherry-pick) <kbd><c-r></kbd>: Reset cherry-picked (copied) commits selection <kbd><enter></kbd>: 커밋 보기 + <kbd>/</kbd>: Filter the current view by text </pre> ## Stash @@ -68,6 +69,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>n</kbd>: 새 브랜치 생성 <kbd>r</kbd>: Rename stash <kbd><enter></kbd>: View selected item's files + <kbd>/</kbd>: Filter the current view by text </pre> ## Sub-commits @@ -83,6 +85,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>C</kbd>: 커밋을 범위로 복사 (cherry-pick) <kbd><c-r></kbd>: Reset cherry-picked (copied) commits selection <kbd><enter></kbd>: View selected item's files + <kbd>/</kbd>: 검색 시작 </pre> ## 메뉴 @@ -90,6 +93,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <pre> <kbd><enter></kbd>: 실행 <kbd><esc></kbd>: 닫기 + <kbd>/</kbd>: Filter the current view by text </pre> ## 메인 패널 (Merging) @@ -128,6 +132,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>e</kbd>: 파일 편집 <kbd><space></kbd>: Line(s)을 패치에 추가/삭제 <kbd><esc></kbd>: Exit custom patch builder + <kbd>/</kbd>: 검색 시작 </pre> ## 메인 패널 (Staging) @@ -149,6 +154,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>c</kbd>: 커밋 변경내용 <kbd>w</kbd>: Commit changes without pre-commit hook <kbd>C</kbd>: Git 편집기를 사용하여 변경 내용을 커밋합니다. + <kbd>/</kbd>: 검색 시작 </pre> ## 브랜치 @@ -172,6 +178,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>R</kbd>: 브랜치 이름 변경 <kbd>u</kbd>: Set/Unset upstream <kbd><enter></kbd>: 커밋 보기 + <kbd>/</kbd>: Filter the current view by text </pre> ## 상태 @@ -195,6 +202,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>e</kbd>: 서브모듈의 URL을 수정 <kbd>i</kbd>: 서브모듈 초기화 <kbd>b</kbd>: View bulk submodule options + <kbd>/</kbd>: Filter the current view by text </pre> ## 원격 @@ -204,6 +212,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>n</kbd>: 새로운 Remote 추가 <kbd>d</kbd>: Remote를 삭제 <kbd>e</kbd>: Remote를 수정 + <kbd>/</kbd>: Filter the current view by text </pre> ## 원격 브랜치 @@ -216,9 +225,9 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>r</kbd>: 체크아웃된 브랜치를 이 브랜치에 리베이스 <kbd>d</kbd>: 브랜치 삭제 <kbd>u</kbd>: Set as upstream of checked-out branch - <kbd><esc></kbd>: 원격목록으로 돌아가기 <kbd>g</kbd>: View reset options <kbd><enter></kbd>: 커밋 보기 + <kbd>/</kbd>: Filter the current view by text </pre> ## 커밋 @@ -252,6 +261,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>c</kbd>: 커밋을 복사 (cherry-pick) <kbd>C</kbd>: 커밋을 범위로 복사 (cherry-pick) <kbd><enter></kbd>: View selected item's files + <kbd>/</kbd>: 검색 시작 </pre> ## 커밋 파일 @@ -266,6 +276,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <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>: 파일 트리뷰로 전환 + <kbd>/</kbd>: 검색 시작 </pre> ## 커밋메시지 @@ -284,6 +295,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>n</kbd>: 태그를 생성 <kbd>g</kbd>: View reset options <kbd><enter></kbd>: 커밋 보기 + <kbd>/</kbd>: Filter the current view by text </pre> ## 파일 @@ -310,6 +322,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>`</kbd>: 파일 트리뷰로 전환 <kbd>M</kbd>: Git mergetool를 열기 <kbd>f</kbd>: Fetch + <kbd>/</kbd>: 검색 시작 </pre> ## 확인 패널 diff --git a/docs/keybindings/Keybindings_nl.md b/docs/keybindings/Keybindings_nl.md index 223317778..feae84761 100644 --- a/docs/keybindings/Keybindings_nl.md +++ b/docs/keybindings/Keybindings_nl.md @@ -36,8 +36,8 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>,</kbd>: Vorige pagina <kbd>.</kbd>: Volgende pagina <kbd><</kbd>: Scroll naar boven - <kbd>/</kbd>: Start met zoeken <kbd>></kbd>: Scroll naar beneden + <kbd>/</kbd>: Start met zoeken <kbd>H</kbd>: Scroll left <kbd>L</kbd>: Scroll right <kbd>]</kbd>: Volgende tabblad @@ -50,7 +50,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd><c-o></kbd>: Kopieer de bestandsnaam naar het klembord <kbd>d</kbd>: Bekijk 'veranderingen ongedaan maken' opties <kbd><space></kbd>: Toggle staged - <kbd><c-b></kbd>: Filter files (staged/unstaged) + <kbd><c-b></kbd>: Filter files by status <kbd>c</kbd>: Commit veranderingen <kbd>w</kbd>: Commit veranderingen zonder pre-commit hook <kbd>A</kbd>: Wijzig laatste commit @@ -68,6 +68,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>`</kbd>: Toggle bestandsboom weergave <kbd>M</kbd>: Open external merge tool (git mergetool) <kbd>f</kbd>: Fetch + <kbd>/</kbd>: Start met zoeken </pre> ## Bevestigingspaneel @@ -98,6 +99,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>R</kbd>: Hernoem branch <kbd>u</kbd>: Set/Unset upstream <kbd><enter></kbd>: Bekijk commits + <kbd>/</kbd>: Filter the current view by text </pre> ## Commit bericht @@ -119,6 +121,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>a</kbd>: Toggle all files included in patch <kbd><enter></kbd>: Enter bestand om geselecteerde regels toe te voegen aan de patch <kbd>`</kbd>: Toggle bestandsboom weergave + <kbd>/</kbd>: Start met zoeken </pre> ## Commits @@ -152,6 +155,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>c</kbd>: Kopieer commit (cherry-pick) <kbd>C</kbd>: Kopieer commit reeks (cherry-pick) <kbd><enter></kbd>: Bekijk gecommite bestanden + <kbd>/</kbd>: Start met zoeken </pre> ## Menu @@ -159,6 +163,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <pre> <kbd><enter></kbd>: Uitvoeren <kbd><esc></kbd>: Sluiten + <kbd>/</kbd>: Filter the current view by text </pre> ## Mergen @@ -197,6 +202,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>e</kbd>: Verander bestand <kbd><space></kbd>: Voeg toe/verwijder lijn(en) in patch <kbd><esc></kbd>: Sluit lijn-bij-lijn modus + <kbd>/</kbd>: Start met zoeken </pre> ## Reflog @@ -212,6 +218,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>C</kbd>: Kopieer commit reeks (cherry-pick) <kbd><c-r></kbd>: Reset cherry-picked (gekopieerde) commits selectie <kbd><enter></kbd>: Bekijk commits + <kbd>/</kbd>: Filter the current view by text </pre> ## Remote branches @@ -224,9 +231,9 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>r</kbd>: Rebase branch <kbd>d</kbd>: Verwijder branch <kbd>u</kbd>: Stel in als upstream van uitgecheckte branch - <kbd><esc></kbd>: Ga terug naar remotes lijst <kbd>g</kbd>: Bekijk reset opties <kbd><enter></kbd>: Bekijk commits + <kbd>/</kbd>: Filter the current view by text </pre> ## Remotes @@ -236,6 +243,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>n</kbd>: Voeg een nieuwe remote toe <kbd>d</kbd>: Verwijder remote <kbd>e</kbd>: Wijzig remote + <kbd>/</kbd>: Filter the current view by text </pre> ## Staging @@ -257,6 +265,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>c</kbd>: Commit veranderingen <kbd>w</kbd>: Commit veranderingen zonder pre-commit hook <kbd>C</kbd>: Commit veranderingen met de git editor + <kbd>/</kbd>: Start met zoeken </pre> ## Stash @@ -268,6 +277,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>n</kbd>: Nieuwe branch <kbd>r</kbd>: Rename stash <kbd><enter></kbd>: Bekijk gecommite bestanden + <kbd>/</kbd>: Filter the current view by text </pre> ## Status @@ -293,6 +303,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>C</kbd>: Kopieer commit reeks (cherry-pick) <kbd><c-r></kbd>: Reset cherry-picked (gekopieerde) commits selectie <kbd><enter></kbd>: Bekijk gecommite bestanden + <kbd>/</kbd>: Start met zoeken </pre> ## Submodules @@ -306,6 +317,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>e</kbd>: Update submodule URL <kbd>i</kbd>: Initialiseer submodule <kbd>b</kbd>: Bekijk bulk submodule opties + <kbd>/</kbd>: Filter the current view by text </pre> ## Tags @@ -317,4 +329,5 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>n</kbd>: Creëer tag <kbd>g</kbd>: Bekijk reset opties <kbd><enter></kbd>: Bekijk commits + <kbd>/</kbd>: Filter the current view by text </pre> diff --git a/docs/keybindings/Keybindings_pl.md b/docs/keybindings/Keybindings_pl.md index 7d2fef98b..c619bfff8 100644 --- a/docs/keybindings/Keybindings_pl.md +++ b/docs/keybindings/Keybindings_pl.md @@ -36,8 +36,8 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>,</kbd>: Previous page <kbd>.</kbd>: Next page <kbd><</kbd>: Scroll to top - <kbd>/</kbd>: Start search <kbd>></kbd>: Scroll to bottom + <kbd>/</kbd>: Search the current view by text <kbd>H</kbd>: Scroll left <kbd>L</kbd>: Scroll right <kbd>]</kbd>: Next tab @@ -82,6 +82,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>c</kbd>: Kopiuj commit (przebieranie) <kbd>C</kbd>: Kopiuj zakres commitów (przebieranie) <kbd><enter></kbd>: Przeglądaj pliki commita + <kbd>/</kbd>: Search the current view by text </pre> ## Confirmation panel @@ -112,6 +113,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>R</kbd>: Rename branch <kbd>u</kbd>: Set/Unset upstream <kbd><enter></kbd>: View commits + <kbd>/</kbd>: Filter the current view by text </pre> ## Main panel (patch building) @@ -127,6 +129,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>e</kbd>: Edytuj plik <kbd><space></kbd>: Add/Remove line(s) to patch <kbd><esc></kbd>: Wyście z trybu "linia po linii" + <kbd>/</kbd>: Search the current view by text </pre> ## Menu @@ -134,6 +137,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <pre> <kbd><enter></kbd>: Wykonaj <kbd><esc></kbd>: Zamknij + <kbd>/</kbd>: Filter the current view by text </pre> ## Pliki @@ -142,7 +146,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd><c-o></kbd>: Copy the file name to the clipboard <kbd>d</kbd>: Pokaż opcje porzucania zmian <kbd><space></kbd>: Przełącz stan poczekalni - <kbd><c-b></kbd>: Filter files (staged/unstaged) + <kbd><c-b></kbd>: Filter files by status <kbd>c</kbd>: Zatwierdź zmiany <kbd>w</kbd>: Zatwierdź zmiany bez skryptu pre-commit <kbd>A</kbd>: Zmień ostatni commit @@ -160,6 +164,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>`</kbd>: Toggle file tree view <kbd>M</kbd>: Open external merge tool (git mergetool) <kbd>f</kbd>: Pobierz + <kbd>/</kbd>: Search the current view by text </pre> ## Pliki commita @@ -174,6 +179,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <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>/</kbd>: Search the current view by text </pre> ## Poczekalnia @@ -195,6 +201,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>c</kbd>: Zatwierdź zmiany <kbd>w</kbd>: Zatwierdź zmiany bez skryptu pre-commit <kbd>C</kbd>: Zatwierdź zmiany używając edytora + <kbd>/</kbd>: Search the current view by text </pre> ## Reflog @@ -210,6 +217,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>C</kbd>: Kopiuj zakres commitów (przebieranie) <kbd><c-r></kbd>: Reset cherry-picked (copied) commits selection <kbd><enter></kbd>: View commits + <kbd>/</kbd>: Filter the current view by text </pre> ## Remote branches @@ -222,9 +230,9 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>r</kbd>: Zmiana bazy gałęzi <kbd>d</kbd>: Usuń gałąź <kbd>u</kbd>: Set as upstream of checked-out branch - <kbd><esc></kbd>: Wróć do listy repozytoriów zdalnych <kbd>g</kbd>: Wyświetl opcje resetu <kbd><enter></kbd>: View commits + <kbd>/</kbd>: Filter the current view by text </pre> ## Remotes @@ -234,6 +242,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_ <kbd>n</kbd>: Add new remote <kbd>d</kbd>: Remove remote <kbd>e</kbd>: Edit remote + <kbd>/</kbd>: Filter the current view by text |