X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=states%2Fgit%2Finit.sls;fp=states%2Fgit%2Finit.sls;h=5130f53716fa1eb9f23d2ecb24d1061195ac201c;hb=18a730c774d610e8d725b637fd71bd77ada7053a;hp=955e89d35df930f739855f4503bd490630c8d906;hpb=457b37064ac9d841fab69a08b58bf73e130fee39;p=max%2Fsaltfiles.git

diff --git a/states/git/init.sls b/states/git/init.sls
index 955e89d..5130f53 100644
--- a/states/git/init.sls
+++ b/states/git/init.sls
@@ -30,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',