if [ ! -d "${JPROJECTS_HOME}/${project}" ]
then
echo "$0: Project '${project}' does not exist."
- continue;
+ continue
fi
cd "${JPROJECTS_HOME}/${project}" || exit 255
fi
echo "$0: Pulling '${project}' ..."
- git pull transport master || exit 255
- echo "$0: Rebasing '${project}' ..."
- git rebase origin/master || exit 255
+
+ git pull -S origin master
+ git pull -S upstream master
+ git pull -S transport master
+
+ if [ "$?" != "0" ]
+ then
+ git pull --all || exit 255
+ fi
+
+ if [ "$1" != "s" ]
+ then
+ echo "$0: Rebasing '${project}' ..."
+ git rebase origin/master || exit 255
+ fi
done
+
+echo "$0: All done."
+exit 0