X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/cd05f3598b8356f5b83251135666d37dadcdc750..11a0c9f9676ea9f8f0e8768b3e6cc569786320c4:/git/config

diff --git a/git/config b/git/config
index 266b579..0461dfd 100644
--- a/git/config
+++ b/git/config
@@ -24,6 +24,7 @@
 [merge]
 	tool = fugitive
 	defaultToUpstream = true
+	conflictstyle = diff3
 [mergetool]
 	prompt = no
 [rebase]
@@ -36,9 +37,9 @@
 [pull]
 	rebase = interactive
 [branch "master"]
-	rebase = preserve
+	rebase = merges
 [branch "develop"]
-	rebase = preserve
+	rebase = merges
 [commit]
 	verbose = true
 [alias]
@@ -49,3 +50,6 @@
 	smudge = git-lfs smudge -- %f
 	process = git-lfs filter-process
 	required = true
+
+[includeIf "gitdir:~/src/fpp/**"]
+	path = ~/.config/git/fpp.config