systemd: 4min timeout for mbsync

[dotfiles.git] / git / config

diff --git a/git/config b/git/config
index 0e41b1f17baae3a86ce3a919f3cbcf026e74fa2b..801601a0c7538f05491da58ab96979ecb3ba429a 100644 (file)
--- a/git/config
+++ b/git/config
@@ -7,7 +7,8 @@
        ui = auto
        diff = auto
 [push]
        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]


@@ -31,3 +31,13 @@
        autosquash = true
 [status]
        submodulesummary = true
        autosquash = true
 [status]
        submodulesummary = true

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