vim: add ultisnips for rospy and roscfg

[dotfiles.git] / git / config

diff --git a/git/config b/git/config
index 06d260385da33f82bbb25e598e073ccf6dae774d..805f94a5ee33253f89132afed474b5a228b06d75 100644 (file)
--- a/git/config
+++ b/git/config
@@ -1,6 +1,6 @@
 [user]
        name = Samir Benmendil
-       email = samir.benmendil@gmail.com
+       email = me@rmz.io
 [color]
        branch = auto
        status = auto
@@ -23,5 +23,6 @@
        cmd = vim -f -c \"Gvdiff\" \"$MERGED\"
 [merge]
        tool = fugitive
+       defaultToUpstream = true
 [mergetool]
        prompt = no