[WIP] Push all of the ultrahaptics changes!

[dotfiles.git] / git / config

diff --git a/git/config b/git/config
index 21d2ea605d7bb6f3010886a1424f1375c9466c0f..f64196094ad7322379102acb2541f5bb667c7ca8 100644 (file)
--- 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
@@ -28,3 +28,12 @@
        prompt = no
 [rebase]
        autostash = true
+       autosquash = true
+[status]
+       submodulesummary = true
+[pull]
+       rebase = interactive
+[branch "master"]
+       rebase = preserve
+[branch "develop"]
+       rebase = preserve