[PATCH] Docs for git-build-rev-cache.

diff --git a/Documentation/git-cvsimport-script.txt b/Documentation/git-cvsimport-script.txt
index ae46b2f0722387ce7cb4b30e5867b11c7bd0de72..9d8acfcb130324e5a4a31a54585a92b194107c9c 100644 (file)
--- a/Documentation/git-cvsimport-script.txt
+++ b/Documentation/git-cvsimport-script.txt
@@ -12,7 +12,7 @@ SYNOPSIS
 'git-cvsimport-script' [ -o <branch-for-HEAD> ] [ -h ] [ -v ]
                        [ -d <CVSROOT> ] [ -p <options-for-cvsps> ]
                        [ -C <GIT_repository> ] [ -i ] [ -k ]
-                       [ -s <subst> ] [ <CVS_module> ]
+                       [ -s <subst> ] [ -m ] [ -M regex ] [ <CVS_module> ]
 
 
 DESCRIPTION
@@ -44,6 +44,9 @@ OPTIONS
        to avoid noisy changesets. Highly recommended, but off by default
        to preserve compatibility with early imported trees. 
 
+-u::
+       Convert underscores in tag and branch names to dots.
+
 -o <branch-for-HEAD>::
        The 'HEAD' branch from CVS is imported to the 'origin' branch within
        the git repository, as 'HEAD' already has a special meaning for git.
@@ -58,6 +61,16 @@ OPTIONS
 
        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 
+       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 also see the default regexes. 
+       You must escape forward slashes. 
+
 -v::
        Verbosity: let 'cvsimport' report what it is doing.