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 3d1e0df74dcd6697767e7c98978a629ad4e44cd0..861d6ed395f09c6b8fb72295fe9ec7489de3abc4 100644 (file)
--- a/states/git/init.sls
+++ b/states/git/init.sls
@@ -16,19 +16,29 @@ 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',
+  'alias.ci': 'commit -S',
+  'alias.commit': 'commit -S',
   'alias.st': 'status',
+  'alias.vh': 'verify-commit HEAD',
+  'alias.vc': 'verify-commit',
+  '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 %}