X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/11a0c9f9676ea9f8f0e8768b3e6cc569786320c4..e081ae2be04bf7224eadc202f3b9e821d65a440b:/git/config?ds=sidebyside

diff --git a/git/config b/git/config
index 0461dfd..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
@@ -30,12 +32,15 @@
 [rebase]
 	autostash = true
 	autosquash = true
+	stat = true
 [status]
 	submodulesummary = true
 [rerere]
 	enabled = true
 [pull]
 	rebase = interactive
+[branch]
+	autoSetupMerge = inherit
 [branch "master"]
 	rebase = merges
 [branch "develop"]
@@ -53,3 +58,5 @@
 
 [includeIf "gitdir:~/src/fpp/**"]
 	path = ~/.config/git/fpp.config
+[credential]
+	helper = cache