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