xdg: add user-dirs.dirs

[dotfiles.git] / git / config

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


@@ -26,3 +26,6 @@
        defaultToUpstream = true
 [mergetool]
        prompt = no
        defaultToUpstream = true
 [mergetool]
        prompt = no

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