xdg: add user-dirs.dirs

[dotfiles.git] / git / config

diff --git a/git/config b/git/config
index 06d260385da33f82bbb25e598e073ccf6dae774d..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


@@ -23,5 +23,9 @@
        cmd = vim -f -c \"Gvdiff\" \"$MERGED\"
 [merge]
        tool = fugitive
        cmd = vim -f -c \"Gvdiff\" \"$MERGED\"
 [merge]
        tool = fugitive

+       defaultToUpstream = true

 [mergetool]
        prompt = no
 [mergetool]
        prompt = no

+[rebase]
+       autostash = true
+       autosquash = true