From bfeb24a1464ec2045b08294372e1d222056c20cb Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Fri, 26 Mar 2021 19:36:50 +0100
Subject: update-submodule: git pull --rebase statt git pull --ff-only

---
 update-submodule | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'update-submodule')

diff --git a/update-submodule b/update-submodule
index 326cbe3c6..17fd1339e 100755
--- a/update-submodule
+++ b/update-submodule
@@ -29,6 +29,6 @@ if [ -d "${submoduleDir}" ]; then
 else
   upstream="${pkgSrcDir}/${path}"
 fi
-git -C "${upstream}" pull -q --ff-only
+git -C "${upstream}" pull -q --rebase
 git -C "${upstream}" archive "${commit}" \
 | tar -C "${path}" -x
-- 
cgit v1.2.3-70-g09d2