docs: update windows docs to mention minus, update minus docs

Quick fix to #3850.
This commit is contained in:
Ilya Grigoriev 2024-06-09 10:18:20 -07:00
parent c71eb73047
commit 2d0b715ad0
2 changed files with 12 additions and 7 deletions

View file

@ -359,10 +359,13 @@ a `$`):
`less -FRX` is the default pager in the absence of any other setting, except `less -FRX` is the default pager in the absence of any other setting, except
on Windows where it is `:builtin`. on Windows where it is `:builtin`.
The special value `:builtin` enables usage of the The special value `:builtin` enables usage of the [integrated pager called
[integrated pager](https://github.com/arijit79/minus/). It is likely if you `minus`](https://github.com/AMythicDev/minus/). See the [docs for the `minus`
are using a standard Linux distro, your system has `$PAGER` set already pager](https://docs.rs/minus/latest/minus/#default-keybindings) for the key
and that will be preferred over the built-in. To use the built-in: bindings and some more details.
If you are using a standard Linux distro, your system likely already has
`$PAGER` set and that will be preferred over the built-in. To use the built-in:
``` ```
jj config set --user ui.pager :builtin jj config set --user ui.pager :builtin

View file

@ -33,10 +33,12 @@ especially IDEs, preserve LF line endings.
## Pagination ## Pagination
[Pagination is disabled by default on Windows][issue-2040] because Windows On Windows, `jj` will use its integrated pager called `minus` by default, unless
doesn't ship with a usable pager. the environment variable `%PAGER%` or the config `ui.pager` is explicitly set.
See the [pager section of the config docs](config.md#pager) for more details.
If you have Git installed, you can use Git's pager and re-enable pagination: If the built-in pager doesn't meet your needs and you have Git installed, you
can switch to using Git's pager as follows:
```powershell ```powershell
PS> jj config set --user ui.pager '["C:\\Program Files\\Git\\usr\\bin\\less.exe", "-FRX"]' PS> jj config set --user ui.pager '["C:\\Program Files\\Git\\usr\\bin\\less.exe", "-FRX"]'