Backup UH

[dotfiles.git] / git / config

diff --git a/git/config b/git/config
index 6e0ef152045893cae3c7634c8f4a4981a6b26521..04e040515a42ff7a9d8258ad5fdc73ae6c716850 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
@@ -20,7 +20,7 @@
        smtpserver = /usr/bin/msmtp
        smtpuser = 
 [mergetool "fugitive"]
-       cmd = vim -f -c \"Gvdiff\" \"$MERGED\"
+       cmd = vim -f -c \"Gdiffsplit!\" \"$MERGED\"
 [merge]
        tool = fugitive
        defaultToUpstream = true