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

diff --git a/states/git/init.sls b/states/git/init.sls
index 9f64fd2..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',
@@ -15,6 +16,7 @@ include:
   'core.excludesfile': '/home/' + grains['user'] + '/.gitignore',
   'merge.tool': 'diffuse',
   'merge.ff': 'true',
+  'pull.rebase': 'false',
   'push.default': 'simple',
   'alias.lg': 'log --graph --pretty=format:\'%Cred%h%Creset %G? %ad %s %C(bold blue)<%an>%Creset %C(yellow)%d%Creset\' --date=short',
   'alias.hist': 'log --graph --full-history --all --pretty=format:\'%Cred%h%Creset %G? %ad %s %C(bold blue)<%an>%Creset %C(yellow)%d%Creset\' --date=short',
@@ -31,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',
 }
 %}