X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/cd05f3598b8356f5b83251135666d37dadcdc750..c089750bf7a4524584f74246b52de9485f63f95b:/git/config?ds=sidebyside

diff --git a/git/config b/git/config
index 266b579..926e1fb 100644
--- a/git/config
+++ b/git/config
@@ -24,11 +24,13 @@
 [merge]
 	tool = fugitive
 	defaultToUpstream = true
+	conflictstyle = diff3
 [mergetool]
 	prompt = no
 [rebase]
 	autostash = true
 	autosquash = true
+	stat = true
 [status]
 	submodulesummary = true
 [rerere]
@@ -36,9 +38,9 @@
 [pull]
 	rebase = interactive
 [branch "master"]
-	rebase = preserve
+	rebase = merges
 [branch "develop"]
-	rebase = preserve
+	rebase = merges
 [commit]
 	verbose = true
 [alias]
@@ -49,3 +51,6 @@
 	smudge = git-lfs smudge -- %f
 	process = git-lfs filter-process
 	required = true
+
+[includeIf "gitdir:~/src/fpp/**"]
+	path = ~/.config/git/fpp.config