summaryrefslogtreecommitdiffstats
path: root/git-cvsimport.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-02-14 00:51:31 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-02-14 00:51:31 +0000
commitefe3c63508ebb6a41a953ab6b4b03b7a631fa544 (patch)
tree967f56c657e168accd43f35adb9aa1cd6a165919 /git-cvsimport.txt
parent9c33415fc305e37bd5a1f399bae1c3b9e2559571 (diff)
downloadgit-htmldocs-efe3c63508ebb6a41a953ab6b4b03b7a631fa544.tar.gz
Autogenerated HTML docs for v1.5.4.1-122-gaa8d
Diffstat (limited to 'git-cvsimport.txt')
-rw-r--r--git-cvsimport.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-cvsimport.txt b/git-cvsimport.txt
index dbce50369..6f91b9ea2 100644
--- a/git-cvsimport.txt
+++ b/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.