Signed-off-by: Roland Häder <roland@mxchange.org>
fi
echo "$0: Pulling '${project}' ..."
-
- git pull -S origin master
- git fetch upstream
- git fetch transport
+ if [ "$1" = "a" ]
+ then
+ git pull --all
+ else
+ git pull -S origin master
+ git fetch upstream
+ git fetch transport
+ fi
echo "$0: Merging upstream into '${project}' ..."
git merge -S upstream/master
- if [ "$1" != "s" ]
+ if [ "$1" != "s" -a "$1" != "a" ]
then
echo "$0: Rebasing '${project}' ..."
git rebase -Sm origin/master || exit 255