Sanchayan Maity
513c5f4dda
Use vimdiff3 instead of vimdiff. Might be better as mentioned below?
7c147b77d3
30 lines
541 B
INI
30 lines
541 B
INI
[user]
|
|
name = Sanchayan Maity
|
|
email = maitysanchayan@gmail.com
|
|
login = sanchayanmaity
|
|
[core]
|
|
editor = "nvim"
|
|
pager = delta --dark
|
|
excludesfile = ~/.config/git/ignore
|
|
[color]
|
|
ui = auto
|
|
[sendemail]
|
|
smtpserver = /usr/bin/msmtp
|
|
[http]
|
|
sslVerify = false
|
|
[fetch]
|
|
prune = true
|
|
[merge]
|
|
tool = vimdiff3
|
|
conflictstyle = diff3
|
|
[mergetool]
|
|
prompt = false
|
|
[mergetool "vimdiff"]
|
|
cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
|
|
trustExitCode = true
|
|
keepBackup = false
|
|
[commit]
|
|
verbose = true
|
|
[pull]
|
|
rebase = false
|