X-Git-Url: https://git.mxchange.org/?p=jprojects-scripts.git;a=blobdiff_plain;f=pull-stick.sh;fp=pull-stick.sh;h=3170929fd0df7443eb23b6cb24d317cad6fcd94e;hp=f1f16dd37f9d3f0b5e9abfde61677d510b5d967f;hb=eb5095b909c3771e9c7dd2054d51276c38795707;hpb=2a1781bff2b9c9563302d1775862294ead6d0964 diff --git a/pull-stick.sh b/pull-stick.sh index f1f16dd..3170929 100755 --- a/pull-stick.sh +++ b/pull-stick.sh @@ -27,15 +27,19 @@ for project in ${LIST}; do 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