From 46239c0bf91e39cd12fe572066f3c0b92b9ff878 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Fri, 13 May 2016 21:21:48 +0200
Subject: [PATCH] No more abort + merging upstream added (work).

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 pull-stick.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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
 
-- 
2.30.2