nvim: don't quit nvim from dashboard

[dotfiles.git] / git / config

diff --git a/git/config b/git/config
index af16e937188de5daaa693c794629faf51a7dfa5c..406c28c44e829b16ff2e32e110f73a5d5ef7db63 100644 (file)
--- a/git/config
+++ b/git/config
@@ -22,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
@@ -33,12 +33,17 @@
        autostash = true
        autosquash = true
        stat = true
+       updateRefs = true
+       rescheduleFailedExec = true
 [status]
        submodulesummary = true
 [rerere]
        enabled = true
 [pull]
        rebase = interactive
+[branch]
+       autoSetupMerge = inherit
+       sort = -committerdate
 [branch "master"]
        rebase = merges
 [branch "develop"]
@@ -54,5 +59,7 @@
        process = git-lfs filter-process
        required = true
 
-[includeIf "gitdir:~/src/wio/**"]
-       path = ~/.config/git/wio.config
+[includeIf "gitdir:~/src/fpp/**"]
+       path = ~/.config/git/fpp.config
+[credential]
+       helper = cache