Skip to content

Commit

Permalink
Use same example config in manual as README
Browse files Browse the repository at this point in the history
Fixes #1878
  • Loading branch information
dandavison committed Oct 14, 2024
1 parent 5b042fc commit 2225990
Showing 1 changed file with 12 additions and 14 deletions.
26 changes: 12 additions & 14 deletions manual/src/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,20 @@ The most convenient way to configure delta is with a `[delta]` section in `~/.gi
pager = delta

[interactive]
diffFilter = delta --color-only --features=interactive
diffFilter = delta --color-only

[delta]
features = decorations

[delta "interactive"]
keep-plus-minus-markers = false

[delta "decorations"]
commit-decoration-style = blue ol
commit-style = raw
file-style = omit
hunk-header-decoration-style = blue box
hunk-header-file-style = red
hunk-header-line-number-style = "#067a00"
hunk-header-style = file line-number syntax
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

[merge]
conflictstyle = diff3

[diff]
colorMoved = default
```

</sub>
Expand Down

0 comments on commit 2225990

Please sign in to comment.