Allow the user to control the verbosity of merge-recursive.

diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
index 6deee94bd3fed61f1f1340c88c5fea9bfb86684e..5c402de2675024c9286e2ee72506cb1d0a56fc31 100644 (file)
--- a/Documentation/git-cvsimport.txt
+++ b/Documentation/git-cvsimport.txt
@@ -104,6 +104,14 @@ If you need to pass multiple options, separate them with a comma.
 -a::
        Import all commits, including recent ones. cvsimport by default
        skips commits that have a timestamp less than 10 minutes ago.
+
+-S <regex>::
+       Skip paths matching the regex.
+
+-L <limit>::
+       Limit the number of commits imported. Workaround for cases where
+       cvsimport leaks memory.
+
 +
 ---------
        exon=Andreas Ericsson <ae@op5.se>