From 638ac7a7b1c8a23c46a0c21bc6285e1d7d61be95 Mon Sep 17 00:00:00 2001 From: Maximilian Friedersdorff Date: Tue, 4 Jun 2019 09:51:55 +0100 Subject: [PATCH] Implement remaining git config options --- states/git/init.sls | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/states/git/init.sls b/states/git/init.sls index b1dc69e..4d80ea0 100644 --- 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', } %} -- 2.46.2