X-Git-Url: https://git.mxchange.org/?p=jprojects-scripts.git;a=blobdiff_plain;f=pull-stick.sh;h=f1f16dd37f9d3f0b5e9abfde61677d510b5d967f;hp=a0bd4e9dc328812291792f1b098fc44cd92eb020;hb=e35a5223fb72ee334cbae06ac2cd0024579621ab;hpb=ea4b3dec8482c503ee8edeaaeac0b15209a07bb5

diff --git a/pull-stick.sh b/pull-stick.sh
index a0bd4e9..f1f16dd 100755
--- a/pull-stick.sh
+++ b/pull-stick.sh
@@ -11,30 +11,34 @@ 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" ]
-	then
-		git pull --all || exit 255
-	else
-		git pull transport master
-		if [ "$?" != "0" ]
-		then
-			git pull --all || exit 255
-		fi
-	fi
+
+	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
 		echo "$0: Rebasing '${project}' ..."
-		git rebase origin/master || exit 255
+		git rebase -Sm origin/master || exit 255
 	fi
 done