diff options
Diffstat (limited to '.config')
| -rw-r--r-- | .config/git/config | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/.config/git/config b/.config/git/config new file mode 100644 index 0000000..50006b9 --- /dev/null +++ b/.config/git/config @@ -0,0 +1,21 @@ +[user] + name = Adam + email = adam@adast.xyz + +[core] + pager = delta + +[interactive] + diffFilter = delta --color-only + +[delta] + syntax-theme = TwoDark + commit-decoration-style = yellow ol + hunk-header-decoration-style = magenta box + hunk-header-style = syntax file line-number + file-style = omit + plus-style = syntax "#003800" + minus-style = syntax "#3f0001" + +[merge] + conflictstyle = diff3 |