X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/d8a4be5d3f2691d8948919bc1e32f58cbfaf1a2e..dcf942832c89d1a80a34bea27e362dbcdc8a6795:/git/config diff --git a/git/config b/git/config index f7e4f40..801601a 100644 --- a/git/config +++ b/git/config @@ -8,6 +8,7 @@ diff = auto [push] default = current + recurseSubmodules = check [diff] tool = vimdiff [color "diff"] @@ -16,9 +17,8 @@ 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]