cvsimport: document that -M can be used multiple times

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

Signed-off-by: Philippe Bruhat (BooK) <book@cpan.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Philippe Bruhat (BooK 2008-02-28 11:18:23 +01:00 committed by Junio C Hamano
parent bc434e829c
commit 3c832a78b1

View File

@ -102,13 +102,17 @@ If you need to pass multiple options, separate them with a comma.
-m:: -m::
Attempt to detect merges based on the commit message. This option 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. branch name from the commit message.
-M <regex>:: -M <regex>::
Attempt to detect merges based on the commit message with a custom Attempt to detect merges based on the commit message with a custom
regex. It can be used with '-m' to enable the default regexes regex. It can be used with '-m' to enable the default regexes
as well. You must escape forward slashes. 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>:: -S <regex>::
Skip paths matching the regex. Skip paths matching the regex.