X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=states%2Fgit%2Finit.sls;h=955e89d35df930f739855f4503bd490630c8d906;hb=14b17e2dbceee21e5a73882c9207003a87324d8b;hp=2bfd1ca05979d1745fdf8f5dd2bde91ced6ddfe5;hpb=6349a7075431ab971686f9bc79f3e70acd7d3cb7;p=max%2Fsaltfiles.git

diff --git a/states/git/init.sls b/states/git/init.sls
index 2bfd1ca..955e89d 100644
--- a/states/git/init.sls
+++ b/states/git/init.sls
@@ -15,7 +15,8 @@ include:
   'core.excludesfile': '/home/' + grains['user'] + '/.gitignore',
   'merge.tool': 'diffuse',
   'merge.ff': 'false',
-  'pull.rebase': 'false',
+  'pull.rebase': 'true',
+  'pull.ff': 'true',
   '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',
@@ -48,7 +49,7 @@ include:
     - user: {{ grains['user'] }}
 {% endfor %}
 
-{% if grains['host'] in ["barium"] %}
+{% if grains['host'] in ["barium", "baryte"] %}
 work_email:
   git.config_set:
     - name: user.email