summaryrefslogtreecommitdiffstats
path: root/git-cvsimport.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-03-03 02:01:16 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-03-03 02:01:16 +0000
commit4f1d8c48d0527535cace5f7f7b25e546a7ba7dab (patch)
tree1770764183352dbfe1003de1f6bfb304db4a55cb /git-cvsimport.txt
parent69a98586dace45994f1eeeee63cf19d056bfc561 (diff)
downloadgit-htmldocs-4f1d8c48d0527535cace5f7f7b25e546a7ba7dab.tar.gz
Autogenerated HTML docs for v1.5.4.3-422-g34cd6
Diffstat (limited to 'git-cvsimport.txt')
-rw-r--r--git-cvsimport.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/git-cvsimport.txt b/git-cvsimport.txt
index 6f91b9ea2..58eefd42e 100644
--- a/git-cvsimport.txt
+++ b/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.