X-Git-Url: https://git.mxchange.org/?p=jprojects-scripts.git;a=blobdiff_plain;f=pull-stick.sh;h=f1f16dd37f9d3f0b5e9abfde61677d510b5d967f;hp=3dc73ede6f77a919068729e3d2d4df8897f5e39f;hb=2d172679d4b2f11872fc8f5dad30bfd84e4d43fb;hpb=3ea09997d2be966c72d675632c45f7d03788c90b

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