X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=states%2Fgit%2Finit.sls;h=861d6ed395f09c6b8fb72295fe9ec7489de3abc4;hb=5d7b010b61ea4d64210c7cbd913f7465f9eb4b55;hp=84d1e59cbc998ccfe58c07d0fc2aad6c0aac3c99;hpb=2727187a298efea80218472bcc6b34147231bef0;p=max%2Fsaltfiles.git

diff --git a/states/git/init.sls b/states/git/init.sls
index 84d1e59..861d6ed 100644
--- a/states/git/init.sls
+++ b/states/git/init.sls
@@ -28,13 +28,17 @@ 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',
 }
 %}
 
 {% for var,val in git_confs.items() %}
 {{ var }}:
   git.config_set:
-    - value: {{ val }}
+    - value: >-
+        {{ val }}
     - global: True
     - user: {{ grains['user'] }}
 {% endfor %}