Explicitly merge on pull

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