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

diff --git a/states/git/init.sls b/states/git/init.sls
index f4a119a..5130f53 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',
@@ -29,9 +30,8 @@ include:
   'alias.tag': 'tag -s',
   'alias.t': 'tag -s',
   'alias.alias': '!req=$\'\\033[0;31m=\\033[0m\'; git config --get-regexp ^alias\. | sed -e s/^alias\.// -e "s/\ /\t$req\ /"',
-  'alias.r': 'rebase',
-  'alias.m': 'merge',
   'alias.pa': '!git remote | xargs -L1 git push --all',
+  'alias.fi': 'flow feature finish --push --no-ff',
   'sendemail.smtpserver': 'mail.friedersdorff.com',
   'sendemail.smtpuser': 'max',
   'sendemail.smtpencryption': 'tls',
@@ -48,7 +48,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