From 1fb6f99ec498150f552c1c8b5440152c0c2aade7 Mon Sep 17 00:00:00 2001 From: Dan Davison Date: Tue, 12 Nov 2024 12:32:35 -0500 Subject: [PATCH] De-emphasize auto-detection of colors in README config --- README.md | 7 ++----- manual/src/configuration.md | 12 +++--------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index df603377..6feb4303 100644 --- a/README.md +++ b/README.md @@ -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 5d0c689c..9508ffd3 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 ```