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>
Philippe Bruhat (BooK committed
Feb 28, 2008 at 11:18 UTC
3c832a78b15f8ffcb4e6f1f6f6d8b7a607ba5d06
1 file changed
+5
-1
Documentation/git-cvsimport.txt
+5
-1
@@ -102,13 +102,17 @@ If you need to pass multiple options, separate them with a comma.
102
103
-m::
104
Attempt to detect merges based on the commit message. This option
105
- will enable default regexes that try to capture the name source
105
+ will enable default regexes that try to capture the source
106
branch name from the commit message.
107
108
-M <regex>::
109
Attempt to detect merges based on the commit message with a custom
110
regex. It can be used with '-m' to enable the default regexes
111
as well. You must escape forward slashes.
112
++
113
+The regex must capture the source branch name in $1.
114
++
115
+This option can be used several times to provide several detection regexes.
116
117
-S <regex>::
118
Skip paths matching the regex.