[WIP] Push all of the ultrahaptics changes!

[dotfiles.git] / git / config

diff --git a/git/config b/git/config
index bfbfc4c93ba4862057d6766642f54e8bcd8758da..f64196094ad7322379102acb2541f5bb667c7ca8 100644 (file)
--- 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
@@ -19,3 +19,21 @@
        smtpserver = smtp.gmail.com
        smtpuser = samir.benmendil@gmail.com
        smtpserverport = 587
+[mergetool "fugitive"]
+       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