diff options
| -rwxr-xr-x | build-all-with-docker | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build-all-with-docker b/build-all-with-docker index 4c6a25dc4..f56b6570f 100755 --- a/build-all-with-docker +++ b/build-all-with-docker @@ -30,7 +30,7 @@ fi if [ "x$1" = 'x--pull' ]; then shift - if ! git pull --ff-only; then + if ! git pull --ff-only || ! git submodule foreach git pull --rebase; then if ! git pull --rebase \ && git push; then >&2 echo 'cannot push/pull' |