X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=pull-stick.sh;h=edc6784f1e198a4a4a4eaa8251578c0eb6144c96;hb=10eace81387f9ad0afefe02545fb3d35ab7de89c;hp=bca96943000365aec93aa476fb188e2b134ebbba;hpb=b4766b712c1c0d5b464de63811f51dbfa549f588;p=jprojects-scripts.git

diff --git a/pull-stick.sh b/pull-stick.sh
index bca9694..edc6784 100755
--- a/pull-stick.sh
+++ b/pull-stick.sh
@@ -6,7 +6,7 @@ for project in ${LIST}; do
 	if [ ! -d "${JPROJECTS_HOME}/${project}" ]
 	then
 		echo "$0: Project '${project}' does not exist."
-		continue;
+		continue
 	fi
 
 	cd "${JPROJECTS_HOME}/${project}" || exit 255
@@ -18,7 +18,22 @@ for project in ${LIST}; do
 	fi
 
 	echo "$0: Pulling '${project}' ..."
-	git pull transport master || exit 255
-	echo "$0: Rebasing '${project}' ..."
-	git rebase origin/master || exit 255
+
+	git pull -S origin master
+	git pull -S upstream master
+	git pull -S transport master
+
+	if [ "$?" != "0" ]
+	then
+		git pull --all || exit 255
+	fi
+
+	if [ "$1" != "s" ]
+	then
+		echo "$0: Rebasing '${project}' ..."
+		git rebase origin/master || exit 255
+	fi
 done
+
+echo "$0: All done."
+exit 0