From 3aa318a7dd5bb1751e53d397b4cf602c1633604e Mon Sep 17 00:00:00 2001 From: Maximilian Friedersdorff Date: Mon, 15 Jun 2020 12:04:03 +0100 Subject: [PATCH 1/1] Explicitly merge on pull --- states/git/init.sls | 1 + 1 file changed, 1 insertion(+) 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', -- 2.45.2