X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/0cb9c5b0aaa4f2fb22eb202050fdcc451c8a760c..a59aa3f7d15dae57e2d066e47af3556c46d9dac4:/git/config

diff --git a/git/config b/git/config
index af16e93..406c28c 100644
--- 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