X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=states%2Fgit%2Finit.sls;h=a7ef7c3bcb6c84d79e0f7db69064e9f26d612f32;hb=HEAD;hp=6090612013bc9d6bba195c00f22b4942ead16fb5;hpb=95263bf9bc976ede0db6c8fd1b3d3ce4c79bcebd;p=max%2Fsaltfiles.git

diff --git a/states/git/init.sls b/states/git/init.sls
index 6090612..a7ef7c3 100644
--- a/states/git/init.sls
+++ b/states/git/init.sls
@@ -30,9 +30,9 @@ 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',
+  'alias.changes': '!git log $(git tag -l --sort=taggerdate | tail -n 1)..HEAD --pretty=format:"* %s" --no-merges --reverse',
   'sendemail.smtpserver': 'mail.friedersdorff.com',
   'sendemail.smtpuser': 'max',
   'sendemail.smtpencryption': 'tls',
@@ -49,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