dotfiles/git/.gitconfig
Sanchayan Maity 7738d0c621 git: Use vim-mergetool for merge conflicts
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-02-16 17:54:11 +05:30

19 lines
394 B
INI

[user]
name = Sanchayan Maity
email = maitysanchayan@gmail.com
login = sanchayanmaity
[core]
editor = "nvim"
pager = delta --dark
[color]
ui = auto
[sendemail]
smtpserver = /usr/bin/msmtp
[http]
sslVerify = false
[merge]
tool = vim_mergetool
conflictstyle=diff3
[mergetool "vim_mergetool"]
cmd = nvim -f -c "MergetoolStart" "$MERGED" "$BASE" "$LOCAL" "$REMOTE"
trustExitCode = true