X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=states%2Fgit%2Finit.sls;fp=states%2Fgit%2Finit.sls;h=7ef7a31ac2aef6e4489441930e68fc3ce407b2a3;hb=e36990df550322036934fd4f46409a231a04c2a0;hp=459943c5b9720e0c1fd9022d98a9c42fa696fac5;hpb=b7bb5705ad376f887c54474b20273855e21a8d75;p=max%2Fsaltfiles.git

diff --git a/states/git/init.sls b/states/git/init.sls
index 459943c..7ef7a31 100644
--- a/states/git/init.sls
+++ b/states/git/init.sls
@@ -29,6 +29,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.rebase': 'rebase -S',
+  'alias.merge': 'merge -S',
 }
 %}