X-Git-Url: https://git.mxchange.org/?p=jprojects-scripts.git;a=blobdiff_plain;f=pull-stick.sh;h=b417ff1faad3ede91744e4b35e9bb978612cebd1;hp=c65578386902d47d67b24d42739b67b2674c6789;hb=85cb2787868b770292c35728755faa80c56ceec5;hpb=81f5f37fb2db170b2bc97b2fc17029bc68361d2f

diff --git a/pull-stick.sh b/pull-stick.sh
index c655783..b417ff1 100755
--- a/pull-stick.sh
+++ b/pull-stick.sh
@@ -11,6 +11,11 @@ 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}' ..."
@@ -29,13 +34,16 @@ for project in ${LIST}; do
 
 	if [ "$?" != "0" ]
 	then
-		git pull --all || exit 255
+		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