X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=states%2Fgit%2Finit.sls;h=955e89d35df930f739855f4503bd490630c8d906;hb=8da7d0dd600e54078fdaa9226963a5aaaf85113e;hp=91c9baebbb82e81dccefbd13784d690c0344179a;hpb=2f7cd5306fd779e6194554c4137ac18b3efe6632;p=max%2Fsaltfiles.git

diff --git a/states/git/init.sls b/states/git/init.sls
index 91c9bae..955e89d 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',
@@ -48,7 +49,7 @@ include:
     - user: {{ grains['user'] }}
 {% endfor %}
 
-{% if grains['host'] in ["barium"] %}
+{% if grains['host'] in ["barium", "baryte"] %}
 work_email:
   git.config_set:
     - name: user.email
@@ -73,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
+
+