From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Mon, 15 Jun 2020 11:04:03 +0000 (+0100)
Subject: Explicitly merge on pull
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=3aa318a7dd5bb1751e53d397b4cf602c1633604e;hp=380c2791e2b37cc5003acc8825aea8dc3a710aa5;p=max%2Fsaltfiles.git

Explicitly merge on pull
---

diff --git a/states/git/init.sls b/states/git/init.sls
index 9f64fd2..9d03b7d 100644
--- 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',