brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From geom...@apache.org
Subject [2/2] brooklyn-dist git commit: Closes #87
Date Fri, 10 Mar 2017 14:31:42 GMT
Closes #87

Update merge script to support optional non-master branch.

For convenience merging commits into branches apart from master.

Usage:

    am 588 0.10.x

will merge 588 from the 0.10.x branch of ${PR_REMOTE}.

The script does not check out the branch!  It requires you to check it out
and verifies that it is on the right branch.  Leaving it like this to enforce
a certain manualness to the procedure, for safety's sake.


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/bd2e5917
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/bd2e5917
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/bd2e5917

Branch: refs/heads/master
Commit: bd2e591747b64ecc8e53c5d8706a767f265a9661
Parents: 56994e2 571fb22
Author: Geoff Macartney <geoff.macartney@cloudsoftcorp.com>
Authored: Fri Mar 10 14:31:26 2017 +0000
Committer: Geoff Macartney <geoff.macartney@cloudsoftcorp.com>
Committed: Fri Mar 10 14:31:26 2017 +0000

----------------------------------------------------------------------
 scripts/am | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------



Mime
View raw message