From 738b0558f7d40dbb4b5e58303c41c6d29bcf4d12 Mon Sep 17 00:00:00 2001
From: Samir Benmendil <me@rmz.io>
Date: Mon, 2 Mar 2020 00:51:20 +0000
Subject: [PATCH] git: replace deprecated preserve rebase strategy with merges

---
 git/config | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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]
-- 
2.48.1