Skip to content

Commit

Permalink
cvsimport: document that -M can be used multiple times
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Philippe Bruhat (BooK authored and Junio C Hamano committed Mar 1, 2008
1 parent bc434e8 commit 3c832a7
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion Documentation/git-cvsimport.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 3c832a7

Please sign in to comment.