Sanchayan Maity
d8fc9facec
The conflict markers plugin is what we have been using all the time and is useful even without resorting to merge tool. Drop the DiffConflicts plugin and use vimdiff as the merge tool if at all we need to resort to a full 3 way merge view. Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
27 lines
518 B
INI
27 lines
518 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 = vimdiff
|
|
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
|