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

diff --git a/pull-stick.sh b/pull-stick.sh
index c655783..3406617 100755
--- a/pull-stick.sh
+++ b/pull-stick.sh
@@ -11,31 +11,38 @@ 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 || exit 255
+	else
+		git pull -S origin master || exit 255
+		git fetch upstream || exit 255
+		git fetch transport || exit 255
 	fi
 
-	if [ "$1" != "s" ]
+	echo "$0: Merging upstream into '${project}' ..."
+	git merge -S upstream/master || exit 255
+
+	if [ "$1" != "s" -a "$1" != "a" ]
 	then
 		echo "$0: Rebasing '${project}' ..."
-		git rebase origin/master || exit 255
+		git rebase -Sm origin/master || exit 255
 	fi
 done