brooklyn-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From geomacy <...@git.apache.org>
Subject [GitHub] brooklyn-dist pull request #87: Update merge script to support optional non-...
Date Fri, 10 Mar 2017 10:50:07 GMT
GitHub user geomacy opened a pull request:

    https://github.com/apache/brooklyn-dist/pull/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.


You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/geomacy/brooklyn-dist am-update

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/brooklyn-dist/pull/87.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #87
    
----
commit 0014be9f5aa3c092a1b34e10625961a92030e073
Author: Geoff Macartney <geoff.macartney@cloudsoftcorp.com>
Date:   2017-03-10T10:48:21Z

    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.

----


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message