diff --git a/Makefile b/Makefile
index b29a62bc4cbfc733b9d8270e335aa0ef81797789..85bde6e5b7b3cb21dd8ae23f57ddb43f258683d4 100644
--- a/Makefile
+++ b/Makefile
@@ -120,6 +120,7 @@ vcs_checkout:
 	git pull
 
 vcs_setup:
+	git config pull.rebase false
 	git submodule init
 	git submodule update
 	git config --global diff.submodule log