Sanchayan Maity
dfe44fb14c
While we dropped diffconflicts earlier and switch to vanilla vimdiff, two way merges are definitely better than three way merges. 3 way merge as in gina or vimdiff is extremely confusing except for may be the simplest of merge conflicts. conflict-marker and diffconflicts should let us handle all cases.
44 lines
804 B
INI
44 lines
804 B
INI
[user]
|
|
name = Sanchayan Maity
|
|
email = maitysanchayan@gmail.com
|
|
login = sanchayanmaity
|
|
[core]
|
|
editor = "nvim"
|
|
pager = delta --dark
|
|
excludesfile = ~/.config/git/ignore
|
|
[color]
|
|
ui = true
|
|
[sendemail]
|
|
smtpserver = /usr/bin/msmtp
|
|
[http]
|
|
sslVerify = false
|
|
[fetch]
|
|
prune = true
|
|
pruneTags = true
|
|
[diff]
|
|
colorMoved = default
|
|
[merge]
|
|
tool = diffconflicts
|
|
conflictstyle = diff3
|
|
ff = only
|
|
[mergetool]
|
|
prompt = false
|
|
keepBackup = false
|
|
[mergetool "diffconflicts"]
|
|
cmd = 'nvim -c DiffConflicts "$MERGED" "$BASE" "$LOCAL" "$REMOTE"'
|
|
trustExitCode = true
|
|
[rebase]
|
|
autoStash = true
|
|
[commit]
|
|
verbose = true
|
|
[pull]
|
|
rebase = false
|
|
[push]
|
|
followTags = true
|
|
[interactive]
|
|
diffFilter = delta --color-only
|
|
[delta]
|
|
navigate = true
|
|
features = line-numbers decorations
|
|
whitespace-error-style = 22 reverse
|