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

diff --git a/git/config b/git/config
index 06d2603..f641960 100644
--- a/git/config
+++ b/git/config
@@ -1,6 +1,6 @@
 [user]
 	name = Samir Benmendil
-	email = samir.benmendil@gmail.com
+	email = samir.benmendil@ultrahaptics.com
 [color]
 	branch = auto
 	status = auto
@@ -23,5 +23,17 @@
 	cmd = vim -f -c \"Gvdiff\" \"$MERGED\"
 [merge]
 	tool = fugitive
+	defaultToUpstream = true
 [mergetool]
 	prompt = no
+[rebase]
+	autostash = true
+	autosquash = true
+[status]
+	submodulesummary = true
+[pull]
+	rebase = interactive
+[branch "master"]
+	rebase = preserve
+[branch "develop"]
+	rebase = preserve