ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

docs: add customization example of color-words diff style

Browse source 
The default style is compatible with various terminal emulators, but I suspect
that many people wouldn't like underlines. Let's add an example to override it.
This commit is contained in:
Yuya Nishihara 2024-06-30 15:41:44 +09:00
parent 3bca159b1a
commit 5a85254bde
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -63,6 +63,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* New diff option `jj diff --name-only` allows for easier shell scripting. * New diff option `jj diff --name-only` allows for easier shell scripting.
* In color-words diffs, hunks are now highlighted with underline. See [diff
colors and styles](docs/config.md#diff-colors-and-styles) for customization.
* `jj git push -c <arg>` can now accept revsets that resolve to multiple * `jj git push -c <arg>` can now accept revsets that resolve to multiple
revisions. This means that `jj git push -c xyz -c abc` is now equivalent to revisions. This means that `jj git push -c xyz -c abc` is now equivalent to
`jj git push -c 'all:(xyz | abc)'`. `jj git push -c 'all:(xyz | abc)'`.

12
docs/config.md
View file

@ -166,6 +166,18 @@ useful reminder to fill in things like BUG=, TESTED= etc.
ui.default-description = "\n\nTESTED=TODO" ui.default-description = "\n\nTESTED=TODO"
``` ```
### Diff colors and styles
In color-words diffs, hunks are rendered with underline. You can override the
default style with the following keys:
```toml
[colors]
# Highlight hunks with background
"diff removed token" = { bg = "#221111", underline = false }
"diff added token" = { bg = "#002200", underline = false }
```
### Diff format ### Diff format
```toml ```toml