X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=pull-stick.sh;h=3406617efd9b1cb6f6a2e26782688d34a8f76fa9;hb=refs%2Fheads%2Fmaster;hp=f1f16dd37f9d3f0b5e9abfde61677d510b5d967f;hpb=1486957335dff51f3a10667cf314cafdc9f0dfc3;p=jprojects-scripts.git

diff --git a/pull-stick.sh b/pull-stick.sh
index f1f16dd..3406617 100755
--- a/pull-stick.sh
+++ b/pull-stick.sh
@@ -19,23 +19,27 @@ for project in ${LIST}; do
 	if [ "$1" = "c" ]
 	then
 		echo "$0: Checkout '${project}' ..."
-		git checkout -- .
+		git checkout -- . || exit 255
 	elif [ "$1" = "r" ]
 	then
 		echo "$0: Resetting '${project}' ..."
-		git reset --hard
+		git reset --hard || exit 255
 	fi
 
 	echo "$0: Pulling '${project}' ..."
-
-	git pull -S origin master
-	git fetch upstream
-	git fetch transport
+	if [ "$1" = "a" ]
+	then
+		git pull --all || exit 255
+	else
+		git pull -S origin master || exit 255
+		git fetch upstream || exit 255
+		git fetch transport || exit 255
+	fi
 
 	echo "$0: Merging upstream into '${project}' ..."
-	git merge -S upstream/master
+	git merge -S upstream/master || exit 255
 
-	if [ "$1" != "s" ]
+	if [ "$1" != "s" -a "$1" != "a" ]
 	then
 		echo "$0: Rebasing '${project}' ..."
 		git rebase -Sm origin/master || exit 255