From 898190a99fe782fbd5f4096818ddbcba6ac4436f Mon Sep 17 00:00:00 2001
From: Joe Groocock <me@frebib.net>
Date: Tue, 23 Nov 2021 11:16:08 +0000
Subject: [PATCH] git: Use fast-forward-only merge by default

Merge commits are nasty, so make sure they're only created explicitly
and never by default.

Signed-off-by: Joe Groocock <me@frebib.net>
---
 git/config | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/git/config b/git/config
index cd745f1..9cffbd0 100644
--- a/git/config
+++ b/git/config
@@ -19,6 +19,8 @@
 [pull]
 	rebase = true
 	prune = true
+[merge]
+	ff = only
 [rebase]
 	autoStash = true
 [log]