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

diff --git a/states/git/init.sls b/states/git/init.sls
index 84d1e59..9d03b7d 100644
--- a/states/git/init.sls
+++ b/states/git/init.sls
@@ -15,26 +15,31 @@ include:
   'core.excludesfile': '/home/' + grains['user'] + '/.gitignore',
   'merge.tool': 'diffuse',
   'merge.ff': 'true',
+  'pull.rebase': 'false',
   'push.default': 'simple',
   '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': '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',
   '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',
+  'alias.m': 'merge',
+  '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 %}