diff --git a/git/.gitconfig b/git/.gitconfig index d510cbe..417a2af 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -4,10 +4,11 @@ login = sanchayanmaity [core] editor = "nvim" - pager = delta --dark + pager = nvim -R excludesfile = ~/.config/git/ignore [color] ui = true + pager = no [sendemail] smtpserver = /usr/bin/msmtp [http] @@ -16,7 +17,9 @@ prune = true pruneTags = true [diff] - colorMoved = default + tool = nvimdiff +[difftool "nvimdiff"] + cmd = nvim -R -d "$LOCAL" "$REMOTE" [merge] tool = diffconflicts conflictstyle = diff3 @@ -36,12 +39,6 @@ rebase = false [push] default = nothing -[interactive] - diffFilter = delta --color-only -[delta] - navigate = true - features = line-numbers decorations - whitespace-error-style = 22 reverse [advice] addEmptyPathspec = false [init]