X-Git-Url: https://git.mxchange.org/?p=jprojects-scripts.git;a=blobdiff_plain;f=pull-stick.sh;h=f1f16dd37f9d3f0b5e9abfde61677d510b5d967f;hp=4eeb02ea9180aa8aa1bc7bb72b6b14c170630c5d;hb=HEAD;hpb=14aa21d6bf00d1ba91cf1a8f9bed4c5395839f8c

diff --git a/pull-stick.sh b/pull-stick.sh
index 4eeb02e..3406617 100755
--- a/pull-stick.sh
+++ b/pull-stick.sh
@@ -11,31 +11,35 @@ for project in ${LIST}; do
 
 	cd "${JPROJECTS_HOME}/${project}" || exit 255
 
+	if [ -n "$2" ]
+	then
+		git branch -D "$2"
+	fi
+
 	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 pull -S upstream master
-	git pull -S transport master
-
-	if [ "$?" != "0" ]
+	if [ "$1" = "a" ]
 	then
-		git pull --all
+		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