Skip to content

Commit d2beaa1

Browse files
committed
update diff viewer docs
1 parent 6527dea commit d2beaa1

4 files changed

Lines changed: 18 additions & 8 deletions

File tree

src/content/docs/customization/lua-scripting.mdx

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -429,15 +429,17 @@ Also available as a top-level global — `ui.cancel()` and `jjui.ui.cancel()` ar
429429

430430
Also available as a top-level global — `diff.show(content)` and `jjui.diff.show(content)` are the same.
431431

432-
| Function |
433-
|----------|
434-
| `jjui.diff.scroll_up()` / `jjui.diff.scroll_down()` |
435-
| `jjui.diff.page_up()` / `jjui.diff.page_down()` |
436-
| `jjui.diff.half_page_up()` / `jjui.diff.half_page_down()` |
437-
| `jjui.diff.move_top()` / `jjui.diff.move_bottom()` |
438-
| `jjui.diff.left()` / `jjui.diff.right()` |
432+
| Function | Notes |
433+
|----------|-------|
434+
| `jjui.diff.scroll_up()` / `jjui.diff.scroll_down()` | |
435+
| `jjui.diff.page_up()` / `jjui.diff.page_down()` | |
436+
| `jjui.diff.half_page_up()` / `jjui.diff.half_page_down()` | |
437+
| `jjui.diff.move_top()` / `jjui.diff.move_bottom()` | |
438+
| `jjui.diff.left()` / `jjui.diff.right()` | |
439439
| `jjui.diff.show(content)` | Required string (positional) — display content in the diff view |
440-
| `jjui.diff.toggle_wrap()` |
440+
| `jjui.diff.toggle_wrap()` | |
441+
| `jjui.diff.target_picker()` | Choose a changed file when the diff retains its command arguments |
442+
| `jjui.diff.prev_file()` / `jjui.diff.next_file()` | Move between changed files when the diff retains its command arguments |
441443

442444
### jjui.undo.* / jjui.redo.*
443445

src/content/docs/diff-viewer.mdx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,9 @@ While choosing the range:
3939
| `G` | Jump to bottom |
4040
| `h` / `l` or left / right | Scroll horizontally |
4141
| `w` | Toggle line wrapping |
42+
| `ctrl+t` | Choose one changed file, or `(all files)` to restore the full diff |
43+
| `[` / `]` | Show the previous / next changed file |
4244

4345
When line wrapping is enabled, long lines wrap within the viewport and horizontal scrolling is disabled.
46+
47+
The `[` and `]` shortcuts wrap at either end of the changed-file list. File selection and navigation are available for revision, Details, Diff Range, and Evolog diffs. Oplog diffs and static content opened through `diff.show()` do not retain the command arguments needed to load individual files.

src/content/docs/git.mdx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,14 @@ Commands shown vary based on the selected remote and any highlighted/selected re
2727
| `p` | `git push --remote <remote>` — push tracking bookmarks in the current revset |
2828
| `a` | `git push --all --deleted --remote <remote>` |
2929
| `c` | `git push --change <change_id> --remote <remote>` |
30+
| `b` | `git push --bookmark <bookmark>... --remote <remote>` — push eligible bookmarks on the selected revisions |
3031
| `d` | `git push --deleted --remote <remote>` |
3132
| `t` | `git push --tracked --remote <remote>` |
3233

3334
Per-bookmark push commands are also generated automatically for each bookmark on the selected revisions.
3435

36+
To push bookmarks from multiple revisions in one command, select the revisions, open the Git menu with `g`, press `p` to filter push commands, then press `b`. Eligible bookmarks are non-conflicted local bookmarks that are either new or tracked on the selected remote. Duplicate names are collapsed; remote-only bookmarks, bookmarks tracked on another remote, and bookmarks present on the selected remote but not tracked there are skipped.
37+
3538
## Fetch commands
3639

3740
| Key | Command |

src/content/docs/revisions/index.mdx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ The highlighted revision is the default source for all operations. `space` selec
2020

2121
- Select multiple revisions then press `r` → all selected become the rebase source.
2222
- Select multiple revisions then press `a` → abandon applies to all of them.
23+
- Select revisions with bookmarks then press `g`, `p`, `b` → push only their eligible bookmarks.
2324
- `esc` clears the current selection.
2425

2526
### Mouse selection

0 commit comments

Comments
 (0)