From: Sergei Organov <osv@javad.com>
Date: Wed, 13 Feb 2008 14:31:17 +0000 (+0300)
Subject: git-cvsimport.txt: fix '-M' description.
X-Git-Tag: v1.5.4.2~26
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8608b334343fd51f13e100f8f1a7a2788c13d6c5;p=git.git

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>
---

diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
index dbce50369..6f91b9ea2 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.