summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Organov <osv@javad.com>2008-02-13 14:31:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-02-13 19:08:41 (GMT)
commit8608b334343fd51f13e100f8f1a7a2788c13d6c5 (patch)
treec44448372c50a1eea274b09c89d5a047cc50e73a
parent75ad235c2e2a751cd9c4c064d19b10a88ff9efcf (diff)
downloadgit-8608b334343fd51f13e100f8f1a7a2788c13d6c5.zip
git-8608b334343fd51f13e100f8f1a7a2788c13d6c5.tar.gz
git-8608b334343fd51f13e100f8f1a7a2788c13d6c5.tar.bz2
git-cvsimport.txt: fix '-M' description.
Fix '-M' description. Old one reads as if the user can somehow "see" the default regex when using -M along with -m. Signed-off-by: Sergei Organov <osv@javad.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git-cvsimport.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
index dbce503..6f91b9e 100644
--- a/Documentation/git-cvsimport.txt
+++ b/Documentation/git-cvsimport.txt
@@ -107,8 +107,8 @@ If you need to pass multiple options, separate them with a comma.
-M <regex>::
Attempt to detect merges based on the commit message with a custom
- regex. It can be used with '-m' to also see the default regexes.
- You must escape forward slashes.
+ regex. It can be used with '-m' to enable the default regexes
+ as well. You must escape forward slashes.
-S <regex>::
Skip paths matching the regex.