if [ "$?" != "0" ]
then
- git pull --all || exit 255
+ git pull --all
fi
+ echo "$0: Merging upstream into '${project}' ..."
+ git merge -S upstream/master
+
if [ "$1" != "s" ]
then
echo "$0: Rebasing '${project}' ..."
- git rebase origin/master || exit 255
+ git rebase -Sm origin/master || exit 255
fi
done