Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NO-JIRA: script to merge 1.x

This commit is contained in:
Clebert Suconic 2016-12-09 14:51:31 -05:00
parent ebbc91c728
commit 3758f2a0c2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/merge-PR.sh
View File

@ -39,9 +39,9 @@ git fetch $ARTEMIS_USER_REMOTE_NAME
git fetch $ARTEMIS_APACHE_REMOTE_NAME git fetch $ARTEMIS_APACHE_REMOTE_NAME
git fetch $ARTEMIS_GITHUB_REMOTE_NAME git fetch $ARTEMIS_GITHUB_REMOTE_NAME
git checkout $ARTEMIS_APACHE_REMOTE_NAME/master -B master git checkout $ARTEMIS_APACHE_REMOTE_NAME/1.x -B master
git checkout $ARTEMIS_GITHUB_REMOTE_NAME/pr/$1 -B $1 git checkout $ARTEMIS_GITHUB_REMOTE_NAME/pr/$1 -B $1
git pull --rebase $ARTEMIS_APACHE_REMOTE_NAME master git pull --rebase $ARTEMIS_APACHE_REMOTE_NAME 1.x
git checkout master git checkout 1.x
git merge --no-ff $1 -m "This closes #$*" git merge --no-ff $1 -m "This closes #$*"
git branch -D $1 git branch -D $1