xdg: add user-dirs.dirs

[dotfiles.git] / git / config

diff --git a/git/config b/git/config
index bfbfc4c93ba4862057d6766642f54e8bcd8758da..f3865cfbb01047d16baf99edafd4f7df1cd5b9c3 100644 (file)
--- a/git/config
+++ b/git/config
@@ -1,6 +1,6 @@
 [user]
        name = Samir Benmendil
 [user]
        name = Samir Benmendil

-       email = samir.benmendil@gmail.com
+       email = me@rmz.io

 [color]
        branch = auto
        status = auto
 [color]
        branch = auto
        status = auto


@@ -19,3 +19,13 @@
        smtpserver = smtp.gmail.com
        smtpuser = samir.benmendil@gmail.com
        smtpserverport = 587
        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