From 093db6b1dc657b60eaf5390a2d39afe0621e6c0a Mon Sep 17 00:00:00 2001
From: "Kai Tetzlaff (moka.tetzco.de)" <kai.tetzlaff@web.de>
Date: Fri, 5 Feb 2021 15:12:23 +0100
Subject: [PATCH] add --ff-only to 'git pull ...' command line

---
 vcs.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vcs.mk b/vcs.mk
index 3f65545..975210f 100644
--- a/vcs.mk
+++ b/vcs.mk
@@ -138,7 +138,7 @@ define GIT_TMPL
 			@echo +++ Updating[git]: $$(patsubst pull-%,%,$$@) $(SHQ)($2$(SHQ))
 			@echo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 			$$(pre_up_cmd-$1)
-			cd $1 && $(GIT) pull $(GITPULL_FLAGS)
+			cd $1 && $(GIT) pull --ff-only $(GITPULL_FLAGS)
 			$$(post_up_cmd-$1)
 
   endif