From: Junio C Hamano Date: Mon, 8 Jan 2007 11:18:48 +0000 (+0000) Subject: Autogenerated HTML docs for v1.4.4.4-g4083 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d1204f020484ddc38d217617b12df424f17f8383;p=git.git Autogenerated HTML docs for v1.4.4.4-g4083 --- diff --git a/git-cvsimport.html b/git-cvsimport.html index 182f6db7a..4e4f8cb87 100644 --- a/git-cvsimport.html +++ b/git-cvsimport.html @@ -419,7 +419,8 @@ the old cvs2git tool.

- Pass the timestamp fuzz factor to cvsps. + Pass the timestamp fuzz factor to cvsps, in seconds. If unset, + cvsps defaults to 300s.

@@ -439,23 +440,53 @@ the old cvs2git tool.

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>
         spawn=Simon Pawn <spawn@frog-pond.org>
-

git-cvsimport will make it appear as those authors had +

+ +git-cvsimport will make it appear as those authors had their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly all along.

-

For convenience, this data is saved to $GIT_DIR/cvs-authors +

+ +For convenience, this data is saved to $GIT_DIR/cvs-authors each time the -A option is provided and read from that same file each time git-cvsimport is run.

-

It is not recommended to use this feature if you intend to +

+ +It is not recommended to use this feature if you intend to export changes back to CVS again later with git-cvsexportcommit(1).

- -

OUTPUT

@@ -478,7 +509,7 @@ various participants of the git-list <git@vger.kernel.org>.

diff --git a/git-cvsimport.txt b/git-cvsimport.txt index d21d66bfe..5c402de26 100644 --- a/git-cvsimport.txt +++ b/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 :: - Pass the timestamp fuzz factor to cvsps. + Pass the timestamp fuzz factor to cvsps, in seconds. If unset, + cvsps defaults to 300s. -s :: Substitute the character "/" in branch names with @@ -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 :: + Skip paths matching the regex. + +-L :: + Limit the number of commits imported. Workaround for cases where + cvsimport leaks memory. + + --------- exon=Andreas Ericsson