dotfiles/git/.gitconfig
Sanchayan Maity f8ce9ccb21 git: gitconfig: Remove diff3 as conflict style
diff3 as conflict style was required by vim-mergetool. It is not
required by the current plugins we are using.

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-05-05 11:26:23 +05:30

20 lines
426 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
[merge]
tool = diffconflicts
[mergetool "diffconflicts"]
cmd = nvim -c "DiffConflicts" "$MERGED" "$BASE" "$LOCAL" "$REMOTE"
trustExitCode = true
keepBackup = false