X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=states%2Fgit%2Finit.sls;h=9fc3c9c1fd7a3856768e29c0cb11e30b980644a9;hb=735c5d5e3a1aab82d77d9461157ecff74dde67a0;hp=4e2764a97c52869c9e1fc8aec031003d29bd22f2;hpb=2e0416f4fef277be2daded25c84d58ac4027a64d;p=max%2Fsaltfiles.git

diff --git a/states/git/init.sls b/states/git/init.sls
index 4e2764a..9fc3c9c 100644
--- a/states/git/init.sls
+++ b/states/git/init.sls
@@ -16,9 +16,9 @@ include:
   'merge.tool': 'diffuse',
   'merge.ff': 'true',
   'push.default': 'simple',
-  'alias.lg': 'lg = log --graph --pretty=format:\'%Cred%h%Creset %G? %ad %s %C(bold blue)<%an>%Creset %C(yellow)%d%Creset\' --date=short',
+  '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',
-  'alias.struct': 'struct = log --graph --full-history --all --pretty=format:\'%ad %s %Creset %C(yellow)%d%Creset\' --date=short --simplify-by-decoration',
+  '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',
@@ -28,13 +28,18 @@ include:
   'alias.vt': 'tag -v',
   '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 -S',
+  'alias.m': 'merge -S',
+  'alias.pa': '!git remote | xargs -L1 git push --all',
 }
 %}
 
 {% for var,val in git_confs.items() %}
 {{ var }}:
   git.config_set:
-    - value: {{ val }}
+    - value: >-
+        {{ val }}
     - global: True
     - user: {{ grains['user'] }}
 {% endfor %}