Implement remaining git config options

[max/saltfiles.git] / states / git / init.sls

diff --git a/states/git/init.sls b/states/git/init.sls
index b1dc69ef37472ad6401a8f4de487db703c027e27..4d80ea07115339265a2c8d3ba358555ffb2fd208 100644 (file)
--- a/states/git/init.sls
+++ b/states/git/init.sls
@@ -3,8 +3,25 @@ include:
 
 
 {% set git_vars = {
+  'color.ui': 'true',
+  'color.branch': 'always',
+  'color.status': 'always',
+  'color.interactive': 'always',
+  'color.diff': 'true',
   'user.name': 'Maximilian Friedersdorff',
-  'user.email': 'max@friedersdorff.com'
+  'user.email': 'max@friedersdorff.com',
+  'user.signingkey': 'F5E7FCB3',
+  'core.editor': 'vim',
+  'core.excludesfile': '/home/' + grains['user'] + '/.gitignore',
+  'merge.tool': 'diffuse',
+  'merge.ff': 'true',
+  '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.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.co': 'checkout',
+  'alias.ci': 'commit',
+  'alias.st': 'status',
 }
 %}