'core.editor': 'vim',
'core.excludesfile': '/home/' + grains['user'] + '/.gitignore',
'merge.tool': 'diffuse',
- 'merge.ff': 'true',
+ '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',
'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',
+ 'sendemail.smtpserver': 'mail.friedersdorff.com',
+ 'sendemail.smtpuser': 'max',
+ 'sendemail.smtpencryption': 'tls',
+ 'sendemail.smtpserverport': '587',
}
%}
- 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
- 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
+
+