Buncha changes

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

diff --git a/states/git/init.sls b/states/git/init.sls
index 2bfd1ca05979d1745fdf8f5dd2bde91ced6ddfe5..6090612013bc9d6bba195c00f22b4942ead16fb5 100644 (file)
--- a/states/git/init.sls
+++ b/states/git/init.sls
@@ -15,7 +15,8 @@ include:
   'core.excludesfile': '/home/' + grains['user'] + '/.gitignore',
   'merge.tool': 'diffuse',
   'merge.ff': 'false',
-  'pull.rebase': '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',