From 6349a7075431ab971686f9bc79f3e70acd7d3cb7 Mon Sep 17 00:00:00 2001 From: Maximilian Friedersdorff Date: Tue, 11 Oct 2022 09:13:07 +0100 Subject: [PATCH] Don't ff merges --- states/git/init.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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', -- 2.46.2