X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=states%2Fgit%2Finit.sls;h=a7ef7c3bcb6c84d79e0f7db69064e9f26d612f32;hb=HEAD;hp=097f4b93cfa392a84daa77512a81c58af99e6954;hpb=21ed4ff542f29c47169d068d4a95204e4320c04b;p=max%2Fsaltfiles.git

diff --git a/states/git/init.sls b/states/git/init.sls
index 097f4b9..a7ef7c3 100644
--- a/states/git/init.sls
+++ b/states/git/init.sls
@@ -14,8 +14,9 @@ include:
   'core.editor': 'vim',
   'core.excludesfile': '/home/' + grains['user'] + '/.gitignore',
   'merge.tool': 'diffuse',
-  'merge.ff': 'true',
-  'pull.rebase': 'false',
+  'merge.ff': 'false',
+  'pull.rebase': 'true',
+  'pull.ff': 'true',
   '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',
@@ -29,9 +30,9 @@ include:
   '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',
+  'alias.fi': 'flow feature finish --push --no-ff',
+  'alias.changes': '!git log $(git tag -l --sort=taggerdate | tail -n 1)..HEAD --pretty=format:"* %s" --no-merges --reverse',
   'sendemail.smtpserver': 'mail.friedersdorff.com',
   'sendemail.smtpuser': 'max',
   'sendemail.smtpencryption': 'tls',
@@ -48,6 +49,24 @@ include:
     - user: {{ grains['user'] }}
 {% endfor %}
 
+{% if grains['host'] in ["barium", "baryte"] %}
+work_email:
+  git.config_set:
+    - name: user.email
+    - value: >-
+        maximilian.friedersdorff@envsys.co.uk
+    - global: True
+    - user: {{ grains['user'] }}
+
+work_gpg:
+  git.config_set:
+    - name: user.signingkey
+    - value: >-
+        B3030EB2
+    - global: True
+    - user: {{ grains['user'] }}
+{% endif %}
+
 global gitignore:
   file.managed:
     - name: {{ grains['homedir'] }}/.gitignore
@@ -55,3 +74,14 @@ global gitignore:
     - mode: 644
     - user: {{ grains['user'] }}
     - group: {{ grains['user'] }}
+
+git-prompt:
+  file.managed:
+    - name: {{ grains['homedir'] }}/.git-prompt.sh
+    - source: https://raw.githubusercontent.com/git/git/master/contrib/completion/git-prompt.sh
+    - mode: 644
+    - user: {{ grains['user'] }}
+    - group: {{ grains['user'] }}
+    - skip_verify: True
+
+