X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/ef9d007193c7684ca2a7d2606c19a2f62d9b0ba0..738b0558f7d40dbb4b5e58303c41c6d29bcf4d12:/git/config

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]