X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/3910639f1a69138a73e072da946e056e31de76ef..refs/heads/ultrahaptics:/git/config

diff --git a/git/config b/git/config
index 0e41b1f..f641960 100644
--- a/git/config
+++ b/git/config
@@ -1,6 +1,6 @@
 [user]
 	name = Samir Benmendil
-	email = me@rmz.io
+	email = samir.benmendil@ultrahaptics.com
 [color]
 	branch = auto
 	status = auto
@@ -31,3 +31,9 @@
 	autosquash = true
 [status]
 	submodulesummary = true
+[pull]
+	rebase = interactive
+[branch "master"]
+	rebase = preserve
+[branch "develop"]
+	rebase = preserve