$ cat merge-from-release.sh
BASE_DIR=/repo3

if [[ `pwd` != $BASE_DIR ]]; then
    echo Stopped. Not in $BASE_DIR dir.
exit
fi

cd $BASE_DIR
rm -rf $BASE_DIR/coup
git clone coup@gitlab.coup.net:maldives/coup.git

cd $BASE_DIR/coup
git remote add release coup@gitlab.coup.net:release/coup.git
git fetch release

git checkout -b rel-master release/master
git pull

git checkout master
git pull
git merge rel-master

git checkout -b develop origin/develop
git pull
git merge -m "Merge branch 'master' into develop" master

git push
Valid XHTML 1.0! Valid CSS! powered by MoniWiki
last modified 2014-10-10 13:03:35
Processing time 0.0045 sec