X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/2b7144b8172cd5020b60e64da9a0864e0b277909..e081ae2be04bf7224eadc202f3b9e821d65a440b:/git/config

diff --git a/git/config b/git/config
index 926e1fb..9e82d98 100644
--- 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
@@ -37,6 +39,8 @@
 	enabled = true
 [pull]
 	rebase = interactive
+[branch]
+	autoSetupMerge = inherit
 [branch "master"]
 	rebase = merges
 [branch "develop"]
@@ -54,3 +58,5 @@
 
 [includeIf "gitdir:~/src/fpp/**"]
 	path = ~/.config/git/fpp.config
+[credential]
+	helper = cache