activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject activemq-artemis git commit: NO-JIRA fixing merge script on 1.x
Date Fri, 24 Feb 2017 21:06:02 GMT
Repository: activemq-artemis
Updated Branches:
  refs/heads/1.x 2f68737b3 -> 19b3ad9da


NO-JIRA fixing merge script on 1.x


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/19b3ad9d
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/19b3ad9d
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/19b3ad9d

Branch: refs/heads/1.x
Commit: 19b3ad9da5f215ae732d488ed709053f3a4f3ec4
Parents: 2f68737
Author: Clebert Suconic <clebertsuconic@apache.org>
Authored: Fri Feb 24 16:05:55 2017 -0500
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Fri Feb 24 16:05:55 2017 -0500

----------------------------------------------------------------------
 scripts/merge-PR.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/19b3ad9d/scripts/merge-PR.sh
----------------------------------------------------------------------
diff --git a/scripts/merge-PR.sh b/scripts/merge-PR.sh
index 99623bd..df4470f 100755
--- a/scripts/merge-PR.sh
+++ b/scripts/merge-PR.sh
@@ -39,7 +39,7 @@ git fetch $ARTEMIS_USER_REMOTE_NAME
 git fetch $ARTEMIS_APACHE_REMOTE_NAME
 git fetch $ARTEMIS_GITHUB_REMOTE_NAME
 
-git checkout $ARTEMIS_APACHE_REMOTE_NAME/1.x -B master
+git checkout $ARTEMIS_APACHE_REMOTE_NAME/1.x -B 1.x
 git checkout $ARTEMIS_GITHUB_REMOTE_NAME/pr/$1 -B $1
 git pull --rebase $ARTEMIS_APACHE_REMOTE_NAME 1.x
 git checkout 1.x


Mime
View raw message