From 6c70b4c4ef483662a2417f2709e98dd2c68765ee Mon Sep 17 00:00:00 2001 From: Justin Su Date: Sun, 13 Jul 2025 06:36:05 -0400 Subject: [PATCH 1/2] Update docs to make 3 basic configs match --- manual/src/get-started.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/manual/src/get-started.md b/manual/src/get-started.md index 50d07dec6..32890081a 100644 --- a/manual/src/get-started.md +++ b/manual/src/get-started.md @@ -10,11 +10,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 From 576ac278ae54be01a4679a2aae01ce12af765c6b Mon Sep 17 00:00:00 2001 From: Justin Su Date: Tue, 15 Jul 2025 09:40:03 -0400 Subject: [PATCH 2/2] Add `delta.dark = true` to `git config` example --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 6feb4303d..b04c84a7c 100644 --- a/README.md +++ b/README.md @@ -38,6 +38,7 @@ Or run: git config --global core.pager delta git config --global interactive.diffFilter 'delta --color-only' git config --global delta.navigate true +git config --global delta.dark true # or delta.light true, or omit for auto-detection git config --global merge.conflictStyle zdiff3 ```