diff options
Diffstat (limited to 'config/git')
| -rw-r--r-- | config/git/config.darwin | 2 | ||||
| -rw-r--r-- | config/git/config.linux | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/config/git/config.darwin b/config/git/config.darwin index 9cb547f..0830442 100644 --- a/config/git/config.darwin +++ b/config/git/config.darwin @@ -13,3 +13,5 @@ defaultBranch = master [core] editor = nvim + +# vim:ft=gitconfig diff --git a/config/git/config.linux b/config/git/config.linux index 3c72be1..96319cb 100644 --- a/config/git/config.linux +++ b/config/git/config.linux @@ -8,6 +8,12 @@ rebase = false [merge] tool = vimdiff + conflictstyle = diff3 +[mergetool] + keepBackup = false + prompt = false +[mergetool "vimdiff"] + cmd = "nvim -d $MERGED $LOCAL $BASE $REMOTE -c 'wincmd J | wincmd ='" [commit] gpgsign = true [init] @@ -18,3 +24,7 @@ prompt = false [diff] tool = bat +[core] + editor = nvim + +# vim:ft=gitconfig |