Add aliases for merging and rebasing (m and r)

[max/saltfiles.git] / states / git / init.sls

diff --git a/states/git/init.sls b/states/git/init.sls
index 84d1e59cbc998ccfe58c07d0fc2aad6c0aac3c99..861d6ed395f09c6b8fb72295fe9ec7489de3abc4 100644 (file)
--- 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 %}