diff --git a/git/.config/git/config b/git/.config/git/config index 2d9f483..a92290d 100644 --- a/git/.config/git/config +++ b/git/.config/git/config @@ -4,6 +4,14 @@ signingkey = 9893DA236405AF57 [core] excludesfile = /home/coolneng/.config/git/global_gitignore + pager = delta +[interactive] + diffFilter = delta --color-only +[delta] + navigate = true + dark = true +[merge] + conflictStyle = zdiff3 [credential] helper = !pass-git-helper $@ [commit]