Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id F0D74200C36 for ; Fri, 10 Mar 2017 11:50:08 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id EF6D0160B79; Fri, 10 Mar 2017 10:50:08 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 442A5160B69 for ; Fri, 10 Mar 2017 11:50:08 +0100 (CET) Received: (qmail 93754 invoked by uid 500); 10 Mar 2017 10:50:07 -0000 Mailing-List: contact dev-help@brooklyn.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.apache.org Delivered-To: mailing list dev@brooklyn.apache.org Received: (qmail 93743 invoked by uid 99); 10 Mar 2017 10:50:07 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Mar 2017 10:50:07 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 14D6BDFE1E; Fri, 10 Mar 2017 10:50:07 +0000 (UTC) From: geomacy To: dev@brooklyn.apache.org Reply-To: dev@brooklyn.apache.org Message-ID: Subject: [GitHub] brooklyn-dist pull request #87: Update merge script to support optional non-... Content-Type: text/plain Date: Fri, 10 Mar 2017 10:50:07 +0000 (UTC) archived-at: Fri, 10 Mar 2017 10:50:09 -0000 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 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. ---