Skip to content

Commit

Permalink
De-emphasize auto-detection of colors in README config
Browse files Browse the repository at this point in the history
  • Loading branch information
dandavison committed Nov 12, 2024
1 parent 1a8d3bc commit 1fb6f99
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 14 deletions.
7 changes: 2 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 3 additions & 9 deletions manual/src/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 1fb6f99

Please sign in to comment.