sanchayanmaity
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git: Use neovim as our diff tool and pager

This commit is contained in:
Sanchayan Maity 2021-12-14 11:56:14 +05:30
parent f839a3bfff
commit 168e03563d
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
git/.gitconfig
View File

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