systemd: 4min timeout for mbsync

[dotfiles.git] / git / config

diff --git a/git/config b/git/config
index 911ad2cb09b8360af159ec06d02c041714ab9f17..801601a0c7538f05491da58ab96979ecb3ba429a 100644 (file)
--- a/git/config
+++ b/git/config
@@ -1,13 +1,14 @@
 [user]
        name = Samir Benmendil
 [user]
        name = Samir Benmendil

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

 [color]
        branch = auto
        status = auto
        ui = auto
        diff = auto
 [push]
 [color]
        branch = auto
        status = auto
        ui = auto
        diff = auto
 [push]

-       default = simple
+       default = current
+       recurseSubmodules = check

 [diff]
        tool = vimdiff
 [color "diff"]
 [diff]
        tool = vimdiff
 [color "diff"]


@@ -16,9 +17,8 @@
        meta = green
 [sendemail]
        smtpencryption = tls
        meta = green
 [sendemail]
        smtpencryption = tls

-       smtpserver = smtp.gmail.com
-       smtpuser = samir.benmendil@gmail.com
-       smtpserverport = 587
+       smtpserver = /usr/bin/msmtp
+       smtpuser = 

 [mergetool "fugitive"]
        cmd = vim -f -c \"Gvdiff\" \"$MERGED\"
 [merge]
 [mergetool "fugitive"]
        cmd = vim -f -c \"Gvdiff\" \"$MERGED\"
 [merge]


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

+[rebase]
+       autostash = true
+       autosquash = true
+[status]
+       submodulesummary = true
+[rerere]
+       enabled = true
+[pull]
+       rebase = interactive
+[branch "master"]
+       rebase = preserve
+[branch "develop"]
+       rebase = preserve
+[commit]
+       verbose = true