diff --git a/git/.gitconfig b/git/.gitconfig index ae20b24..5435039 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -7,13 +7,15 @@ pager = delta --dark excludesfile = ~/.config/git/ignore [color] - ui = auto + ui = true [sendemail] smtpserver = /usr/bin/msmtp [http] sslVerify = false [fetch] prune = true +[diff] + colorMoved = default [merge] tool = vimdiff3 conflictstyle = diff3 @@ -27,3 +29,9 @@ verbose = true [pull] rebase = false +[interactive] + diffFilter = delta --color-only +[delta] + navigate = true + features = line-numbers decorations + whitespace-error-style = 22 reverse