git: use diff3 for conflictstyle

[dotfiles.git] / git / config

diff --git a/git/config b/git/config
index 266b57905f2763c2690960b4e7f9f0f46007c085..0461dfd351206251ee08cba46e03232b1eb6b07a 100644 (file)
--- 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