git checkout -- .
fi
- SKIP_TEST="${project:0:9}"
-
echo "$0: Pulling '${project}' ..."
- if [ "${SKIP_TEST}" = "jratecalc" ]
+
+ git pull -S origin master
+ git pull -S upstream master
+ git pull -S transport master
+
+ if [ "$?" != "0" ]
then
git pull --all || exit 255
- else
- git pull transport master || exit 255
fi
- echo "$0: Rebasing '${project}' ..."
- git rebase origin/master || exit 255
+ if [ "$1" != "s" ]
+ then
+ echo "$0: Rebasing '${project}' ..."
+ git rebase origin/master || exit 255
+ fi
done
echo "$0: All done."