diff options
| author | Dan Davison <dandavison7@gmail.com> | 2024-11-12 12:32:35 -0500 |
|---|---|---|
| committer | Dan Davison <dandavison7@gmail.com> | 2024-11-12 12:33:54 -0500 |
| commit | 1fb6f99ec498150f552c1c8b5440152c0c2aade7 (patch) | |
| tree | d4f827de5810a5d54af018eae0f583b6c366c8f6 | |
| parent | 1a8d3bc994d2c8c6bfcb1965aad4303e97c022f0 (diff) | |
De-emphasize auto-detection of colors in README config
| -rw-r--r-- | README.md | 7 | ||||
| -rw-r--r-- | manual/src/configuration.md | 12 |
2 files changed, 5 insertions, 14 deletions
@@ -25,11 +25,8 @@ diffFilter = delta --color-only [delta] - navigate = true # use n and N to move between diff sections - - # delta detects terminal colors automatically; set one of these to disable auto-detection - # dark = true - # light = true + navigate = true # use n and N to move between diff sections + dark = true # or light = true, or omit for auto-detection [merge] conflictstyle = zdiff3 diff --git a/manual/src/configuration.md b/manual/src/configuration.md index 5d0c689..9508ffd 100644 --- a/manual/src/configuration.md +++ b/manual/src/configuration.md @@ -14,17 +14,11 @@ The most convenient way to configure delta is with a `[delta]` section in `~/.gi diffFilter = delta --color-only [delta] - navigate = true # use n and N to move between diff sections - - # delta detects terminal colors automatically; set one of these to disable auto-detection - # dark = true - # light = true + navigate = true # use n and N to move between diff sections + dark = true # or light = true, or omit for auto-detection [merge] - conflictstyle = diff3 - -[diff] - colorMoved = default + conflictstyle = zdiff3 ``` </sub> |