X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/46a46afa1578c50fe87ba41ea92badddca83ec56..cbfa57a03cbbefbc6bf682757e27615aa7e633e4:/git/config

diff --git a/git/config b/git/config
index a759c2e..9e82d98 100644
--- a/git/config
+++ b/git/config
@@ -39,6 +39,8 @@
 	enabled = true
 [pull]
 	rebase = interactive
+[branch]
+	autoSetupMerge = inherit
 [branch "master"]
 	rebase = merges
 [branch "develop"]
@@ -56,3 +58,5 @@
 
 [includeIf "gitdir:~/src/fpp/**"]
 	path = ~/.config/git/fpp.config
+[credential]
+	helper = cache