[PATCH] 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>
---
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