From 64df8a606fed38a3f9dfe2c755c1eef9fa44e1b1 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Fri, 28 May 2021 19:44:57 +0200
Subject: [PATCH] git_commit_and_push via make

---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index b29a62bc..85bde6e5 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
-- 
GitLab