X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=states%2Fgit%2Finit.sls;h=955e89d35df930f739855f4503bd490630c8d906;hb=25b1d3e8eaae5e7e0f830304659baf1b571a47b0;hp=f4a119af1e93741c5b61cb4c39643aa42983c898;hpb=73ca00607698df08e68a808e3a1addeb3c569a1d;p=max%2Fsaltfiles.git

diff --git a/states/git/init.sls b/states/git/init.sls
index f4a119a..955e89d 100644
--- a/states/git/init.sls
+++ b/states/git/init.sls
@@ -14,8 +14,9 @@ include:
   'core.editor': 'vim',
   'core.excludesfile': '/home/' + grains['user'] + '/.gitignore',
   'merge.tool': 'diffuse',
-  'merge.ff': 'true',
-  'pull.rebase': 'false',
+  'merge.ff': '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