From: Roland Häder Date: Wed, 5 Jul 2017 20:39:50 +0000 (+0200) Subject: Huh? Something old maybe ... X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1486957335dff51f3a10667cf314cafdc9f0dfc3;p=jprojects-scripts.git Huh? Something old maybe ... Signed-off-by: Roland Häder --- 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