summaryrefslogtreecommitdiffstats
path: root/.config/git/config
blob: 6f7086d53592df4fc9047e6b755dd155ee9cf841 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
[core]
    pager = delta

[interactive]
    diffFilter = delta --color-only

[delta]
    navigate = true  # use n and N to move between diff sections
    dark = true      # or light = true, or omit for auto-detection
    side-by-side = true

[merge]
    conflictstyle = zdiff3
[init]
    defaultBranch = master