No more abort + merging upstream added (work).
authorRoland Haeder <roland@mxchange.org>
Fri, 13 May 2016 19:21:48 +0000 (21:21 +0200)
committerRoland Haeder <roland@mxchange.org>
Fri, 13 May 2016 19:21:48 +0000 (21:21 +0200)
Signed-off-by: Roland Haeder <roland@mxchange.org>
pull-stick.sh

index c655783..4eeb02e 100755 (executable)
@@ -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