From f9bba1b3efafd65ab4d6122bbe6050c6e17b02ca Mon Sep 17 00:00:00 2001 From: Anthony Perkins Date: Thu, 9 May 2024 11:21:08 +0100 Subject: [PATCH] Force ff-only for merge --- roles/home-cli/files/gitconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/home-cli/files/gitconfig b/roles/home-cli/files/gitconfig index 4dd5ff9..366c8d9 100644 --- a/roles/home-cli/files/gitconfig +++ b/roles/home-cli/files/gitconfig @@ -4,6 +4,8 @@ [pull] ff = only rebase = false +[merge] + ff = only [push] default = simple [color]