Commit 8089c878 authored by Daniel STAN's avatar Daniel STAN

check_repos: pull with ff only

parent 45ea176d
......@@ -46,9 +46,9 @@ try_ff () {
if git status | grep -E "^(# )?Your branch is behind.*can be fast-forwarded.$" -q; then
echo "Fast forward..."
if [ $hasmodules -eq 0 ]; then
git pull --recurse-submodules origin master || exit 12
git pull --ff-only --recurse-submodules origin master || exit 12
else
git pull || exit 12
git pull --ff-only || exit 12
fi
else
echo "Nothing to fast forward"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment