From: Samir Benmendil <me@rmz.io>
Date: Mon, 2 Mar 2020 00:51:20 +0000 (+0000)
Subject: git: replace deprecated preserve rebase strategy with merges
X-Git-Url: https://git.rmz.io/dotfiles.git/commitdiff_plain/738b0558f7d40dbb4b5e58303c41c6d29bcf4d12

git: replace deprecated preserve rebase strategy with merges
---

diff --git a/git/config b/git/config
index edd6bab..954a76a 100644
--- 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]