X-Git-Url: https://git.mxchange.org/?p=jprojects-scripts.git;a=blobdiff_plain;f=pull-stick.sh;h=f1f16dd37f9d3f0b5e9abfde61677d510b5d967f;hp=b417ff1faad3ede91744e4b35e9bb978612cebd1;hb=4d9dc9a4e25cfe372b6d853b31bf1afffa33dc2b;hpb=85cb2787868b770292c35728755faa80c56ceec5 diff --git a/pull-stick.sh b/pull-stick.sh index b417ff1..f1f16dd 100755 --- a/pull-stick.sh +++ b/pull-stick.sh @@ -29,13 +29,8 @@ for project in ${LIST}; do echo "$0: Pulling '${project}' ..." git pull -S origin master - git pull -S upstream master - git pull -S transport master - - if [ "$?" != "0" ] - then - git pull --all - fi + git fetch upstream + git fetch transport echo "$0: Merging upstream into '${project}' ..." git merge -S upstream/master