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

diff --git a/states/git/init.sls b/states/git/init.sls
index 7ef7a31..9f64fd2 100644
--- a/states/git/init.sls
+++ b/states/git/init.sls
@@ -20,8 +20,7 @@ include:
   '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',
   'alias.struct': 'log --graph --full-history --all --pretty=format:\'%ad %s %Creset %C(yellow)%d%Creset\' --date=short --simplify-by-decoration',
   'alias.co': 'checkout',
-  'alias.ci': 'commit -S',
-  'alias.commit': 'commit -S',
+  'alias.ci': 'commit',
   'alias.st': 'status',
   'alias.vh': 'verify-commit HEAD',
   'alias.vc': 'verify-commit',
@@ -29,8 +28,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.rebase': 'rebase -S',
-  'alias.merge': 'merge -S',
+  'alias.r': 'rebase',
+  'alias.m': 'merge',
+  'alias.pa': '!git remote | xargs -L1 git push --all',
 }
 %}