summaryrefslogtreecommitdiff
path: root/Documentation/git-cvsimport.txt
diff options
context:
space:
mode:
authorLibravatar J. Bruce Fields <bfields@citi.umich.edu>2007-01-14 19:27:28 -0500
committerLibravatar J. Bruce Fields <bfields@citi.umich.edu>2007-01-14 19:27:28 -0500
commit67583917e9a2a85605c1123a62c8883593e7e889 (patch)
tree06f61d2f28e321063b8e1e206a0e418bc1ba0486 /Documentation/git-cvsimport.txt
parentuser-manual: reindent (diff)
parentMerge branch 'jc/int' (diff)
downloadtgif-67583917e9a2a85605c1123a62c8883593e7e889.tar.xz
Merge branch 'master' of git://git.kernel.org/pub/scm/git/git
Diffstat (limited to 'Documentation/git-cvsimport.txt')
-rw-r--r--Documentation/git-cvsimport.txt15
1 files changed, 14 insertions, 1 deletions
diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
index d21d66bfeb..5c402de267 100644
--- a/Documentation/git-cvsimport.txt
+++ b/Documentation/git-cvsimport.txt
@@ -90,7 +90,8 @@ If you need to pass multiple options, separate them with a comma.
Print a short usage message and exit.
-z <fuzz>::
- Pass the timestamp fuzz factor to cvsps.
+ Pass the timestamp fuzz factor to cvsps, in seconds. If unset,
+ cvsps defaults to 300s.
-s <subst>::
Substitute the character "/" in branch names with <subst>
@@ -99,6 +100,18 @@ If you need to pass multiple options, separate them with a comma.
CVS by default uses the unix username when writing its
commit logs. Using this option and an author-conv-file
in this format
+
+-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>