From 1486957335dff51f3a10667cf314cafdc9f0dfc3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 5 Jul 2017 22:39:50 +0200 Subject: [PATCH] Huh? Something old maybe ... MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- pull-stick.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) 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 -- 2.39.5