From b66f4e808e60ef21285d429dfefb150cf20d2085 Mon Sep 17 00:00:00 2001
From: Tobias Klauser <tklauser@distanz.ch>
Date: Wed, 12 Aug 2020 19:57:00 +0200
Subject: .gitconfig: set pull.ff=only

---
 .gitconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitconfig b/.gitconfig
index 493e6b1..3ce9f8a 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -50,6 +50,9 @@
 [push]
 	default = matching
 
+[pull]
+	ff = only
+
 [merge]
 	tool = vimdiff
 
-- 
cgit v1.2.3-54-g00ecf