X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=pull-stick.sh;h=f1f16dd37f9d3f0b5e9abfde61677d510b5d967f;hb=1df1deea0ecb7848238af169364c13f4317bef47;hp=cd5cd1c8dddab252b4c164cbd09ae185829f4de4;hpb=201b1dfb80b932f7d3ecc511b45b7426b7df297a;p=jprojects-scripts.git

diff --git a/pull-stick.sh b/pull-stick.sh
index cd5cd1c..f1f16dd 100755
--- a/pull-stick.sh
+++ b/pull-stick.sh
@@ -11,24 +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
 
 	echo "$0: Pulling '${project}' ..."
 
-	git pull transport master
-	if [ "$?" != "0" ]
-	then
-		git pull --all || exit 255
-	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