From 4bce8201c271a01132635ffcb13ebea09c616709 Mon Sep 17 00:00:00 2001
From: Grégoire Duchêne <gduchene@awhk.org>
Date: Sun, 21 Jun 2020 17:31:21 +0100
Subject: git: Only allow fast-forward merges when pulling

---
 git/config | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'git')

diff --git a/git/config b/git/config
index ff07707..3209ba3 100644
--- a/git/config
+++ b/git/config
@@ -11,5 +11,8 @@
 [diff]
   algorithm = histogram
 
+[pull]
+  ff = only
+
 [user]
   name = Grégoire Duchêne
-- 
cgit v1.2.3-70-g09d2