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

diff --git a/pull-stick.sh b/pull-stick.sh
index c655783..4eeb02e 100755
--- a/pull-stick.sh
+++ b/pull-stick.sh
@@ -29,13 +29,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