No more abort + merging upstream added (work).

[jprojects-scripts.git] / pull-stick.sh

diff --git a/pull-stick.sh b/pull-stick.sh
index c65578386902d47d67b24d42739b67b2674c6789..4eeb02ea9180aa8aa1bc7bb72b6b14c170630c5d 100755 (executable)
--- 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