git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Philippe Bruhat (BooK)" <book@cpan.org>
To: git@vger.kernel.org
Cc: gitster@pobox.com, "Philippe Bruhat (BooK" <book@cpan.org>
Subject: [PATCH] cvsimport: document that -M can be used multiple times
Date: Thu, 28 Feb 2008 11:18:23 +0100	[thread overview]
Message-ID: <1204193904-3652-4-git-send-email-book@cpan.org> (raw)
In-Reply-To: <1204193904-3652-3-git-send-email-book@cpan.org>

From: Philippe Bruhat (BooK <book@cpan.org>

Also document the capture behaviour (source branch name in $1)

Signed-off-by: Philippe Bruhat (BooK) <book@cpan.org>
---
 Documentation/git-cvsimport.txt |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
index 6f91b9e..58eefd4 100644
--- a/Documentation/git-cvsimport.txt
+++ b/Documentation/git-cvsimport.txt
@@ -102,13 +102,17 @@ If you need to pass multiple options, separate them with a comma.
 
 -m::
 	Attempt to detect merges based on the commit message. This option
-	will enable default regexes that try to capture the name source
+	will enable default regexes that try to capture the source
 	branch name from the commit message.
 
 -M <regex>::
 	Attempt to detect merges based on the commit message with a custom
 	regex. It can be used with '-m' to enable the default regexes
 	as well. You must escape forward slashes.
++
+The regex must capture the source branch name in $1.
++
+This option can be used several times to provide several detection regexes.
 
 -S <regex>::
 	Skip paths matching the regex.
-- 
1.5.4.2.187.gfc276

  reply	other threads:[~2008-02-28 10:20 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-28 10:18 Multiple -M options for git-cvsimport Philippe Bruhat (BooK)
2008-02-28 10:18 ` [PATCH] cvsimport: have default merge regex allow for dashes in the branch name Philippe Bruhat (BooK)
2008-02-28 10:18   ` [PATCH] cvsimport: allow for multiple -M options Philippe Bruhat (BooK)
2008-02-28 10:18     ` Philippe Bruhat (BooK) [this message]
2008-02-28 10:18       ` [PATCH] cvsimport: configure Getopt::Long to bundle options Philippe Bruhat (BooK)
2008-02-28 20:07 ` Multiple -M options for git-cvsimport Junio C Hamano
2008-02-29 10:02   ` Philippe Bruhat (BooK)
2008-03-01  5:59     ` Junio C Hamano
2008-03-01 20:24       ` Junio C Hamano
  -- strict thread matches above, loose matches on Subject: below --
2008-02-22  7:19 [PATCH] cvsimport: document that -M can be used multiple times Philippe Bruhat (BooK)
2008-02-21 14:41 Philippe Bruhat (BooK)
2008-02-21 22:52 ` Junio C Hamano
2008-02-21 23:13   ` Philippe Bruhat (BooK)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1204193904-3652-4-git-send-email-book@cpan.org \
    --to=book@cpan.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).