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