From 1d91291dcafaaad1d69301bde7a21de525d5c229 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gregor=20B=C3=BCckendorf?= <gregor.bueckendorf@cbc.de>
Date: Wed, 20 Jan 2021 09:52:03 +0100
Subject: [PATCH] fix(gitconfig): specify pull preferences

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

diff --git a/.gitconfig b/.gitconfig
index e70db12..2a7f661 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -10,6 +10,8 @@
     pull = true
 [push]
     default = simple
+[pull]
+    ff = only
 [core]
     excludesfile = ~/.gitignore
     autocrlf = input