X-Git-Url: https://git.mxchange.org/?p=jprojects-scripts.git;a=blobdiff_plain;f=pull-stick.sh;h=b417ff1faad3ede91744e4b35e9bb978612cebd1;hp=1c20816f8ee1f2e16f7d4bca3c46a1df56d15437;hb=5814e3e15103d8a8a7cdb87647b97e977831d602;hpb=9e61088d479be705e137be2ead2ab106252f2e82

diff --git a/pull-stick.sh b/pull-stick.sh
index 1c20816..b417ff1 100755
--- a/pull-stick.sh
+++ b/pull-stick.sh
@@ -11,28 +11,40 @@ 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 -- .
+	elif [ "$1" = "r" ]
+	then
+		echo "$0: Resetting '${project}' ..."
+		git reset --hard
 	fi
 
-	SKIP_TEST="${project:0:9}"
-
 	echo "$0: Pulling '${project}' ..."
-	if [ "${SKIP_TEST}" = "jratecalc" ]
+
+	git pull -S origin master
+	git pull -S upstream master
+	git pull -S transport master
+
+	if [ "$?" != "0" ]
 	then
-		git pull --all || exit 255
-	else
-		git pull transport master
-		if [ "$?" != "0" ]
-		then
-			git pull --all || exit 255
-		fi
+		git pull --all
 	fi
 
-	echo "$0: Rebasing '${project}' ..."
-	git rebase origin/master || exit 255
+	echo "$0: Merging upstream into '${project}' ..."
+	git merge -S upstream/master
+
+	if [ "$1" != "s" ]
+	then
+		echo "$0: Rebasing '${project}' ..."
+		git rebase -Sm origin/master || exit 255
+	fi
 done
 
 echo "$0: All done."