X-Git-Url: https://git.mxchange.org/?p=jprojects-scripts.git;a=blobdiff_plain;f=pull-stick.sh;h=edc6784f1e198a4a4a4eaa8251578c0eb6144c96;hp=f8b783453032570727ac67a0c70c9782df56af1e;hb=b07d6425644dd67af22cbf01c04dfadf5aa4a3a1;hpb=76be0190c4bd87016574c4993512a44a2582cc40

diff --git a/pull-stick.sh b/pull-stick.sh
index f8b7834..edc6784 100755
--- a/pull-stick.sh
+++ b/pull-stick.sh
@@ -17,18 +17,22 @@ for project in ${LIST}; do
 		git checkout -- .
 	fi
 
-	SKIP_TEST="${project:0:9}"
-
 	echo "$0: Pulling '${project}' ..."
-	if [ "${SKIP_TEST}" = "jratecalc" ]
+
+	git pull -S origin master
+	git pull -S upstream master
+	git pull -S transport master
+
+	if [ "$?" != "0" ]
 	then
 		git pull --all || exit 255
-	else
-		git pull transport master || exit 255
 	fi
 
-	echo "$0: Rebasing '${project}' ..."
-	git rebase origin/master || exit 255
+	if [ "$1" != "s" ]
+	then
+		echo "$0: Rebasing '${project}' ..."
+		git rebase origin/master || exit 255
+	fi
 done
 
 echo "$0: All done."