summaryrefslogtreecommitdiff
path: root/update-submodule
diff options
context:
space:
mode:
Diffstat (limited to 'update-submodule')
-rwxr-xr-xupdate-submodule2
1 files changed, 1 insertions, 1 deletions
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