* [PATCH] cvsimport: document that -M can be used multiple times
@ 2008-02-21 14:41 Philippe Bruhat (BooK)
2008-02-21 22:52 ` Junio C Hamano
0 siblings, 1 reply; 5+ messages in thread
From: Philippe Bruhat (BooK) @ 2008-02-21 14:41 UTC (permalink / raw)
To: git; +Cc: gitster, Philippe Bruhat (BooK)
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
@@ -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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] cvsimport: document that -M can be used multiple times
2008-02-21 14:41 [PATCH] cvsimport: document that -M can be used multiple times Philippe Bruhat (BooK)
@ 2008-02-21 22:52 ` Junio C Hamano
2008-02-21 23:13 ` Philippe Bruhat (BooK)
0 siblings, 1 reply; 5+ messages in thread
From: Junio C Hamano @ 2008-02-21 22:52 UTC (permalink / raw)
To: Philippe Bruhat (BooK); +Cc: git, gitster
"Philippe Bruhat (BooK)" <book@cpan.org> writes:
> 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?
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] cvsimport: document that -M can be used multiple times
2008-02-21 22:52 ` Junio C Hamano
@ 2008-02-21 23:13 ` Philippe Bruhat (BooK)
0 siblings, 0 replies; 5+ messages in thread
From: Philippe Bruhat (BooK) @ 2008-02-21 23:13 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
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))
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] cvsimport: document that -M can be used multiple times
@ 2008-02-22 7:19 Philippe Bruhat (BooK)
0 siblings, 0 replies; 5+ messages in thread
From: Philippe Bruhat (BooK) @ 2008-02-22 7:19 UTC (permalink / raw)
To: git; +Cc: gitster, Philippe Bruhat (BooK)
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] cvsimport: document that -M can be used multiple times
2008-02-28 10:18 ` [PATCH] cvsimport: allow for multiple -M options Philippe Bruhat (BooK)
@ 2008-02-28 10:18 ` Philippe Bruhat (BooK)
0 siblings, 0 replies; 5+ messages in thread
From: Philippe Bruhat (BooK) @ 2008-02-28 10:18 UTC (permalink / raw)
To: git; +Cc: gitster, Philippe Bruhat (BooK
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2008-02-28 10:20 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-02-21 14:41 [PATCH] cvsimport: document that -M can be used multiple times Philippe Bruhat (BooK)
2008-02-21 22:52 ` Junio C Hamano
2008-02-21 23:13 ` Philippe Bruhat (BooK)
-- strict thread matches above, loose matches on Subject: below --
2008-02-22 7:19 Philippe Bruhat (BooK)
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 ` [PATCH] cvsimport: document that -M can be used multiple times Philippe Bruhat (BooK)
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 NNTP newsgroup(s).