X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/947105c36b4dd765db4164183bbb99ecc4160d0b..e081ae2be04bf7224eadc202f3b9e821d65a440b:/git/config

diff --git a/git/config b/git/config
index 6e0ef15..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
@@ -20,25 +22,29 @@
 	smtpserver = /usr/bin/msmtp
 	smtpuser = 
 [mergetool "fugitive"]
-	cmd = vim -f -c \"Gvdiff\" \"$MERGED\"
+	cmd = vim -f -c \"Gdiffsplit!\" \"$MERGED\"
 [merge]
 	tool = fugitive
 	defaultToUpstream = true
+	conflictstyle = diff3
 [mergetool]
 	prompt = no
 [rebase]
 	autostash = true
 	autosquash = true
+	stat = true
 [status]
 	submodulesummary = true
 [rerere]
 	enabled = true
 [pull]
 	rebase = interactive
+[branch]
+	autoSetupMerge = inherit
 [branch "master"]
-	rebase = preserve
+	rebase = merges
 [branch "develop"]
-	rebase = preserve
+	rebase = merges
 [commit]
 	verbose = true
 [alias]
@@ -49,3 +55,8 @@
 	smudge = git-lfs smudge -- %f
 	process = git-lfs filter-process
 	required = true
+
+[includeIf "gitdir:~/src/fpp/**"]
+	path = ~/.config/git/fpp.config
+[credential]
+	helper = cache