cd "${JPROJECTS_HOME}/${project}" || exit 255
+ if [ -n "$2" ]
+ then
+ git branch -D "$2"
+ fi
+
if [ "$1" = "c" ]
then
echo "$0: Checkout '${project}' ..."
echo "$0: Pulling '${project}' ..."
git pull -S origin master
- git pull -S upstream master
- git pull -S transport master
-
- if [ "$?" != "0" ]
- then
- git pull --all
- fi
+ git fetch upstream
+ git fetch transport
echo "$0: Merging upstream into '${project}' ..."
git merge -S upstream/master