From da5245071d90a22d303389cc71daee67d8a81821 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20K=C3=B6rber?= <hannes@hkoerber.de>
Date: Sat, 25 Sep 2021 19:06:16 +0200
Subject: [PATCH] git: ff-only on pull

---
 git/gitconfig.j2 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/git/gitconfig.j2 b/git/gitconfig.j2
index 27e7c5f..a717331 100644
--- a/git/gitconfig.j2
+++ b/git/gitconfig.j2
@@ -113,6 +113,7 @@
     requireForce = true
 [pull]
     rebase = true
+    ff = only
 
 [url "ssh://git@code.hkoerber.de:2222/"]
     insteadOf = https://code.hkoerber.de/