git: use nvim for fugitive mergetool

[dotfiles.git] / git / config

diff --git a/git/config b/git/config
index 926e1fb44a884abd7ad5eef19b2825c4d0869d82..1c55d715640918954a5d9907aaae1b277a37fa11 100644 (file)
--- a/git/config
+++ b/git/config
@@ -11,6 +11,8 @@
        recurseSubmodules = check
 [diff]
        tool = vimdiff
+[diff "gpg"]
+       textconv = gpg --quiet --decrypt --use-agent
 [color "diff"]
        new = cyan bold
        old = red bold
@@ -20,7 +22,7 @@
        smtpserver = /usr/bin/msmtp
        smtpuser = 
 [mergetool "fugitive"]
-       cmd = vim -f -c \"Gdiffsplit!\" \"$MERGED\"
+       cmd = nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
 [merge]
        tool = fugitive
        defaultToUpstream = true
@@ -31,12 +33,16 @@
        autostash = true
        autosquash = true
        stat = true
+       updateRefs = true
 [status]
        submodulesummary = true
 [rerere]
        enabled = true
 [pull]
        rebase = interactive
+[branch]
+       autoSetupMerge = inherit
+       sort = -committerdate
 [branch "master"]
        rebase = merges
 [branch "develop"]
@@ -54,3 +60,5 @@
 
 [includeIf "gitdir:~/src/fpp/**"]
        path = ~/.config/git/fpp.config
+[credential]
+       helper = cache