Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8AD1817CCA for ; Mon, 1 Jun 2015 12:35:54 +0000 (UTC) Received: (qmail 48230 invoked by uid 500); 1 Jun 2015 12:35:54 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 48157 invoked by uid 500); 1 Jun 2015 12:35:54 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 48135 invoked by uid 99); 1 Jun 2015 12:35:54 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Jun 2015 12:35:54 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id D6A19CA61C for ; Mon, 1 Jun 2015 12:35:53 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.79 X-Spam-Level: X-Spam-Status: No, score=0.79 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id ZAyt3xdO4CRU for ; Mon, 1 Jun 2015 12:35:38 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 399AE47C07 for ; Mon, 1 Jun 2015 12:35:38 +0000 (UTC) Received: (qmail 46402 invoked by uid 99); 1 Jun 2015 12:35:37 -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; Mon, 01 Jun 2015 12:35:37 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 71985E0520; Mon, 1 Jun 2015 12:35:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Mon, 01 Jun 2015 12:36:23 -0000 Message-Id: In-Reply-To: <6bbf9626ffb4404eb0f409b97c3ce3f6@git.apache.org> References: <6bbf9626ffb4404eb0f409b97c3ce3f6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [48/50] [abbrv] incubator-ignite git commit: # ignite-sprint-5: more help info at git-format-patch.sh # ignite-sprint-5: more help info at git-format-patch.sh Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/52d64bb3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/52d64bb3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/52d64bb3 Branch: refs/heads/ignite-648 Commit: 52d64bb3bf13b531458889d4ea5d8650ca1789b7 Parents: 2859671 Author: ashutak Authored: Mon Jun 1 12:16:07 2015 +0300 Committer: ashutak Committed: Mon Jun 1 12:16:07 2015 +0300 ---------------------------------------------------------------------- scripts/git-format-patch.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52d64bb3/scripts/git-format-patch.sh ---------------------------------------------------------------------- diff --git a/scripts/git-format-patch.sh b/scripts/git-format-patch.sh index 970347f..5aa2075 100755 --- a/scripts/git-format-patch.sh +++ b/scripts/git-format-patch.sh @@ -20,9 +20,13 @@ # Git patch-file maker. # echo 'Usage: scripts/git-format-patch.sh [-ih|--ignitehome ] [-idb|--ignitedefbranch ] [-ph|--patchhome ]' +echo 'It is a script to create patch between current and default branches. The script is safe and do not broke or lose your changes.' echo "It should be called from IGNITE_HOME directory." -echo "Patch will be created at PATCHES_HOME between Master branch (IGNITE_DEFAULT_BRANCH) and Current branch." +echo "Patch will be created at PATCHES_HOME (= IGNITE_HOME, by default) between Master branch (IGNITE_DEFAULT_BRANCH) and Current branch." echo "Note: you can use ${IGNITE_HOME}/scripts/git-patch-prop-local.sh to set your own local properties (to rewrite settings at git-patch-prop-local.sh). " +echo 'Examples:' +echo '- Basic (with all defaults and properties from git-patch-prop.sh): ./scripts/git-format-patch.sh' +echo '- Rewrite some defaults (see Usage): ./scripts/git-format-patch.sh -ph /home/user_name/patches' echo # @@ -51,17 +55,17 @@ do IGNITE_HOME="$2" shift ;; - + -idb|--ignitedefbranch) IGNITE_DEFAULT_BRANCH="$2" shift ;; - + -ph|--patchhome) PATCHES_HOME="$2" shift ;; - + *) echo "Unknown parameter: ${key}" ;; @@ -84,4 +88,4 @@ echo requireCleanWorkTree ${IGNITE_HOME} -formatPatch ${IGNITE_HOME} ${IGNITE_DEFAULT_BRANCH} ${IGNITE_CURRENT_BRANCH} .patch \ No newline at end of file +formatPatch ${IGNITE_HOME} ${IGNITE_DEFAULT_BRANCH} ${IGNITE_CURRENT_BRANCH} .patch