X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/738b0558f7d40dbb4b5e58303c41c6d29bcf4d12..e3bc42d5aa2868d51a8024aec1ecce46ea2fb8f2:/git/config?ds=inline

diff --git a/git/config b/git/config
index 954a76a..8f78436 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
@@ -24,11 +26,13 @@
 [merge]
 	tool = fugitive
 	defaultToUpstream = true
+	conflictstyle = diff3
 [mergetool]
 	prompt = no
 [rebase]
 	autostash = true
 	autosquash = true
+	stat = true
 [status]
 	submodulesummary = true
 [rerere]
@@ -52,3 +56,5 @@
 
 [includeIf "gitdir:~/src/fpp/**"]
 	path = ~/.config/git/fpp.config
+[credential]
+	helper = cache