git: Use neovim as our diff tool and pager
This commit is contained in:
parent
f839a3bfff
commit
168e03563d
1 changed files with 5 additions and 8 deletions
|
@ -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]
|
||||
|
|
Loading…
Reference in a new issue