X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=states%2Fgit%2Finit.sls;h=3dfc0f51426f27d7224f962f4c683d500799fc30;hb=bac28d0ef6374e6cc88f62654564c3c6d31f9587;hp=9d03b7d686b03545c04ed876a1765219c58d836d;hpb=3aa318a7dd5bb1751e53d397b4cf602c1633604e;p=max%2Fsaltfiles.git

diff --git a/states/git/init.sls b/states/git/init.sls
index 9d03b7d..3dfc0f5 100644
--- a/states/git/init.sls
+++ b/states/git/init.sls
@@ -8,6 +8,7 @@ include:
   'color.status': 'always',
   'color.interactive': 'always',
   'color.diff': 'true',
+  'diff.external': 'difft',
   'user.name': 'Maximilian Friedersdorff',
   'user.email': 'max@friedersdorff.com',
   'user.signingkey': 'F5E7FCB3',
@@ -32,6 +33,10 @@ include:
   'alias.r': 'rebase',
   'alias.m': 'merge',
   'alias.pa': '!git remote | xargs -L1 git push --all',
+  'sendemail.smtpserver': 'mail.friedersdorff.com',
+  'sendemail.smtpuser': 'max',
+  'sendemail.smtpencryption': 'tls',
+  'sendemail.smtpserverport': '587',
 }
 %}