X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=states%2Fgit%2Finit.sls;h=097f4b93cfa392a84daa77512a81c58af99e6954;hb=21ed4ff542f29c47169d068d4a95204e4320c04b;hp=a4fe62e273d7b70ac5721a4197ee3ef55ac730f9;hpb=a04280dc5fddb6b5f4c3f0d4889b56f11e1f18b4;p=max%2Fsaltfiles.git

diff --git a/states/git/init.sls b/states/git/init.sls
index a4fe62e..097f4b9 100644
--- a/states/git/init.sls
+++ b/states/git/init.sls
@@ -8,7 +8,6 @@ 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',
@@ -33,6 +32,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',
 }
 %}