aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Lichtenheld <frank@lichtenheld.de>2007-04-06 23:52:40 +0200
committerJunio C Hamano <junkio@cox.net>2007-04-06 16:46:06 -0700
commit407049c59e0ac58076664981fde61e606a70686b (patch)
tree8e8b184196c86fb6d33baf2728366c7a6a30dda5
parentedbe4466746e577418b48922003a2c8a9cb55bee (diff)
downloadgit-407049c59e0ac58076664981fde61e606a70686b.tar.gz
git-407049c59e0ac58076664981fde61e606a70686b.tar.xz
cvsimport: Improve documentation of CVSROOT and CVS module determination
Document the fact that git-cvsimport tries to find out CVSROOT from CVS/Root and $ENV{CVSROOT} and CVS_module from CVS/Repository. Also use ` ` syntax for all filenames for consistency. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--Documentation/git-cvsimport.txt8
1 files changed, 6 insertions, 2 deletions
diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
index 8374d9047..6a0821a37 100644
--- a/Documentation/git-cvsimport.txt
+++ b/Documentation/git-cvsimport.txt
@@ -35,7 +35,9 @@ OPTIONS
-d <CVSROOT>::
The root of the CVS archive. May be local (a simple path) or remote;
currently, only the :local:, :ext: and :pserver: access methods
- are supported.
+ are supported. If not given, git-cvsimport will try to read it
+ from `CVS/Root`. If no such file exists, it checks for the
+ `CVSROOT` environment variable.
-C <target-dir>::
The git repository to import to. If the directory doesn't
@@ -87,6 +89,8 @@ If you need to pass multiple options, separate them with a comma.
<CVS_module>::
The CVS module you want to import. Relative to <CVSROOT>.
+ If not given, git-cvsimport tries to read it from
+ `CVS/Repository`.
-h::
Print a short usage message and exit.
@@ -124,7 +128,7 @@ 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.
+