X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=pull-stick.sh;h=f1f16dd37f9d3f0b5e9abfde61677d510b5d967f;hb=2d172679d4b2f11872fc8f5dad30bfd84e4d43fb;hp=4eeb02ea9180aa8aa1bc7bb72b6b14c170630c5d;hpb=46239c0bf91e39cd12fe572066f3c0b92b9ff878;p=jprojects-scripts.git

diff --git a/pull-stick.sh b/pull-stick.sh
index 4eeb02e..f1f16dd 100755
--- a/pull-stick.sh
+++ b/pull-stick.sh
@@ -11,6 +11,11 @@ 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}' ..."
@@ -24,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