X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=states%2Fgit%2Finit.sls;h=9d03b7d686b03545c04ed876a1765219c58d836d;hb=b88e9af24d4f2ce36f4a9dc3b7c18d0eb60c432f;hp=4d80ea07115339265a2c8d3ba358555ffb2fd208;hpb=638ac7a7b1c8a23c46a0c21bc6285e1d7d61be95;p=max%2Fsaltfiles.git

diff --git a/states/git/init.sls b/states/git/init.sls
index 4d80ea0..9d03b7d 100644
--- a/states/git/init.sls
+++ b/states/git/init.sls
@@ -2,7 +2,7 @@ include:
   - git.{{ grains['os'] | lower }}
 
 
-{% set git_vars = {
+{% set git_confs = {
   'color.ui': 'true',
   'color.branch': 'always',
   'color.status': 'always',
@@ -15,20 +15,39 @@ include:
   'core.excludesfile': '/home/' + grains['user'] + '/.gitignore',
   'merge.tool': 'diffuse',
   'merge.ff': 'true',
+  'pull.rebase': 'false',
   '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.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_vars.items() %}
+{% for var,val in git_confs.items() %}
 {{ var }}:
   git.config_set:
-    - value: {{ val }}
+    - value: >-
+        {{ val }}
     - global: True
     - user: {{ grains['user'] }}
 {% endfor %}
+
+global gitignore:
+  file.managed:
+    - name: {{ grains['homedir'] }}/.gitignore
+    - source: {{ grains['stateroot'] }}/git/files/gitignore
+    - mode: 644
+    - user: {{ grains['user'] }}
+    - group: {{ grains['user'] }}