git: replace deprecated preserve rebase strategy with merges

diff --git a/git/config b/git/config
index edd6babf7860b4de6ddb22b1fc59ceb1e0a83d86..954a76ad484406ab36a2dcecca283b43b4394158 100644 (file)
--- a/git/config
+++ b/git/config
@@ -36,9 +36,9 @@
 [pull]
        rebase = interactive
 [branch "master"]
-       rebase = preserve
+       rebase = merges
 [branch "develop"]
-       rebase = preserve
+       rebase = merges
 [commit]
        verbose = true
 [alias]