- 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
+ fi
+
+ echo "$0: Merging upstream into '${project}' ..."
+ git merge -S upstream/master
+
+ if [ "$1" != "s" ]
+ then
+ echo "$0: Rebasing '${project}' ..."
+ git rebase -Sm origin/master || exit 255
+ fi