summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Bruhat (BooK <book@cpan.org>2008-02-28 10:18:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-03-01 08:55:39 (GMT)
commit3c832a78b15f8ffcb4e6f1f6f6d8b7a607ba5d06 (patch)
tree47a8aab3f2b1c18eceb8a7b7647317858d3d12a5
parentbc434e829c6f1757d2761c50e06a28278dc2f2c7 (diff)
downloadgit-3c832a78b15f8ffcb4e6f1f6f6d8b7a607ba5d06.zip
git-3c832a78b15f8ffcb4e6f1f6f6d8b7a607ba5d06.tar.gz
git-3c832a78b15f8ffcb4e6f1f6f6d8b7a607ba5d06.tar.bz2
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>
-rw-r--r--Documentation/git-cvsimport.txt6
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.