From 46ffb6008b1415d78e345359dfc5aef8791a1e9a Mon Sep 17 00:00:00 2001
From: Franziska Kunsmann <hi@kunsmann.eu>
Date: Sun, 21 Jun 2020 13:22:31 +0200
Subject: [PATCH] git pull only ff

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

diff --git a/.gitconfig b/.gitconfig
index b42a074..1b3286a 100755
--- a/.gitconfig
+++ b/.gitconfig
@@ -15,3 +15,5 @@
   branch = false
   config = false
   stash = false
+[pull]
+	ff = only