X-Git-Url: https://git.mxchange.org/?p=jprojects-scripts.git;a=blobdiff_plain;f=pull-stick.sh;h=4eeb02ea9180aa8aa1bc7bb72b6b14c170630c5d;hp=a0bd4e9dc328812291792f1b098fc44cd92eb020;hb=54bf60147edfe0b67fc6e3f8218759cb3f58319a;hpb=9445d791f3cef181208471b2bd8fc743e41037f6

diff --git a/pull-stick.sh b/pull-stick.sh
index a0bd4e9..4eeb02e 100755
--- a/pull-stick.sh
+++ b/pull-stick.sh
@@ -15,26 +15,30 @@ for project in ${LIST}; do
 	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: 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