cd "${JPROJECTS_HOME}/${project}" || exit 255
+ if [ -n "$2" ]
+ then
+ git branch -D "$2"
+ fi
+
if [ "$1" = "c" ]
then
echo "$0: Checkout '${project}' ..."
git checkout -- .
+ elif [ "$1" = "r" ]
+ then
+ echo "$0: Resetting '${project}' ..."
+ git reset --hard
fi
echo "$0: Pulling '${project}' ..."
- git pull transport master
+ git pull -S origin master
+ git pull -S upstream master
+ git pull -S transport master
+
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