threads / patch / 12241

patchcvsimport: document that -M can be used multiple times

Subject: [PATCH] cvsimport: document that -M can be used multiple times

## tl;dr

3 messages between Feb 21, 2008 and Feb 21, 2008. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Philippe Bruhat (BooK)· Feb 21, 2008, 14:41 UTC · lore

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

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

Show changes to Documentation/git-cvsimport.txt +6 −1

diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
index 6f91b9e..5e0a314 100644
--- a/Documentation/git-cvsimport.txt
+++ b/Documentation/git-cvsimport.txt
@@ -102,7 +102,7 @@ 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>::
@@ -110,6 +110,11 @@ If you need to pass multiple options, separate them with a comma.
 	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.1

Junio C Hamano· Feb 21, 2008, 22:52 UTC · re: Philippe Bruhat (BooK) · lore

Re: [PATCH] cvsimport: document that -M can be used multiple times

"Philippe Bruhat (BooK)" <book@cpan.org> writes:

Show 23 quoted lines

> Also document the capture behaviour (source branch name in $1)
>
> Signed-off-by: Philippe Bruhat (BooK) <book@cpan.org>
> ---
>  Documentation/git-cvsimport.txt |    7 ++++++-
>  1 files changed, 6 insertions(+), 1 deletions(-)
>
> diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
> index 6f91b9e..5e0a314 100644
> --- a/Documentation/git-cvsimport.txt
> +++ b/Documentation/git-cvsimport.txt
> ...
> @@ -110,6 +110,11 @@ If you need to pass multiple options, separate them with a comma.
>  	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.

Hmmm. Have you tried formatting this to see it produces a sensible result?

Philippe Bruhat (BooK)· Feb 21, 2008, 23:13 UTC · re: Junio C Hamano · lore

Re: [PATCH] cvsimport: document that -M can be used multiple times

On Thu, Feb 21, 2008 at 02:52:35PM -0800, Junio C Hamano wrote:

> 
> Hmmm.  Have you tried formatting this to see it produces a
> sensible result?

Er, no. I'll check and send a new patch if necessary.

-- 
 Philippe Bruhat (BooK)

 The surest path to chaos is too much organization.
                                                 (Moral from Groo #4 (Image))