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

diff --git a/git/config b/git/config
index af16e93..04367fe 100644
--- a/git/config
+++ b/git/config
@@ -33,12 +33,15 @@
 	autostash = true
 	autosquash = true
 	stat = true
+	updateRefs = true
 [status]
 	submodulesummary = true
 [rerere]
 	enabled = true
 [pull]
 	rebase = interactive
+[branch]
+	autoSetupMerge = inherit
 [branch "master"]
 	rebase = merges
 [branch "develop"]
@@ -54,5 +57,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