X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=states%2Fgit%2Finit.sls;h=2bfd1ca05979d1745fdf8f5dd2bde91ced6ddfe5;hb=6349a7075431ab971686f9bc79f3e70acd7d3cb7;hp=f4a119af1e93741c5b61cb4c39643aa42983c898;hpb=73ca00607698df08e68a808e3a1addeb3c569a1d;p=max%2Fsaltfiles.git

diff --git a/states/git/init.sls b/states/git/init.sls
index f4a119a..2bfd1ca 100644
--- a/states/git/init.sls
+++ b/states/git/init.sls
@@ -14,7 +14,7 @@ include:
   'core.editor': 'vim',
   'core.excludesfile': '/home/' + grains['user'] + '/.gitignore',
   'merge.tool': 'diffuse',
-  'merge.ff': 'true',
+  'merge.ff': 'false',
   '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',