X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/e83a8241ad527667c72cf9a391dc79c25e9492f4..af9348928c28e9c9c89a9c03ac10c3029848659c:/git/config?ds=sidebyside

diff --git a/git/config b/git/config
index 805f94a..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
@@ -26,3 +26,14 @@
 	defaultToUpstream = true
 [mergetool]
 	prompt = no
+[rebase]
+	autostash = true
+	autosquash = true
+[status]
+	submodulesummary = true
+[pull]
+	rebase = interactive
+[branch "master"]
+	rebase = preserve
+[branch "develop"]
+	rebase = preserve