From d8da74ca810b2053679670a36de2246f3b42d823 Mon Sep 17 00:00:00 2001
From: Johannes Ranke <jranke@uni-bremen.de>
Date: Wed, 28 Apr 2021 10:37:29 +0200
Subject: Only fast-forward on pulls, don't merge

---
 gitconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gitconfig b/gitconfig
index 58271a2..f0deaf4 100644
--- a/gitconfig
+++ b/gitconfig
@@ -19,3 +19,5 @@
 	helper = cache
 [init]
 	defaultBranch = main
+[pull]
+	ff = only
-- 
cgit v1.2.1