Huh? Something old maybe ...

[jprojects-scripts.git] / pull-stick.sh

diff --git a/pull-stick.sh b/pull-stick.sh
index b417ff1faad3ede91744e4b35e9bb978612cebd1..f1f16dd37f9d3f0b5e9abfde61677d510b5d967f 100755 (executable)
--- 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