From 7838681ef731de7f6eadd9b134a077bc7a421106 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Wed, 29 Apr 2020 11:30:20 +0100
Subject: [PATCH] git: Reject non-ff merges

---
 tag-git/gitconfig | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/tag-git/gitconfig b/tag-git/gitconfig
index c7c3187..943355b 100644
--- a/tag-git/gitconfig
+++ b/tag-git/gitconfig
@@ -99,6 +99,9 @@
 [include]
 	path = ~/.gitconfig.local
 
+[merge]
+	ff = only
+
 [rebase]
 	autosquash = true
 	autostash = true
@@ -117,10 +120,6 @@
 	ff = only
 	rebase = true
 
-[merge]
-	defaultToUpstream = true
-	ff = false
-
 [filter "lfs"]
 	process = git-lfs filter-process
 	required = true