X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-cvsimport.txt;h=4b62256a79034c4dcd60e2954e7f5c1b7f3caa81;hb=6ddc0964034342519a87fe013781abf31c6db6ad;hp=cd01994877240fdc725aab7050d0634e7a15db2e;hpb=dbc37438687e110697574d175e4eca5f9cbeae81;p=git.git

diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
index cd019948..4b62256a 100644
--- a/Documentation/git-cvsimport.txt
+++ b/Documentation/git-cvsimport.txt
@@ -1,6 +1,5 @@
 git-cvsimport(1)
 ================
-v0.1, July 2005
 
 NAME
 ----
@@ -11,7 +10,7 @@ SYNOPSIS
 --------
 'git-cvsimport' [ -o <branch-for-HEAD> ] [ -h ] [ -v ]
 			[ -d <CVSROOT> ] [ -p <options-for-cvsps> ]
-			[ -C <GIT_repository> ] [ -i ] [ -k ]
+			[ -C <git_repository> ] [ -i ] [ -P <file> ] [ -k ]
 			[ -s <subst> ] [ -m ] [ -M regex ] [ <CVS_module> ]
 
 
@@ -31,7 +30,7 @@ OPTIONS
 	are supported.
 
 -C <target-dir>::
-        The GIT repository to import to.  If the directory doesn't
+        The git repository to import to.  If the directory doesn't
         exist, it will be created.  Default is the current directory.
 
 -i::
@@ -51,15 +50,19 @@ OPTIONS
 	The 'HEAD' branch from CVS is imported to the 'origin' branch within
 	the git repository, as 'HEAD' already has a special meaning for git.
 	Use this option if you want to import into a different branch.
-
-	Use '-o master' for continuing an import that was initially done by
-	the old cvs2git tool.
++
+Use '-o master' for continuing an import that was initially done by
+the old cvs2git tool.
 
 -p <options-for-cvsps>::
 	Additional options for cvsps.
 	The options '-u' and '-A' are implicit and should not be used here.
++
+If you need to pass multiple options, separate them with a comma.
 
-	If you need to pass multiple options, separate them with a comma.
+-P:: <cvsps-output-file>
+	Instead of calling cvsps, read the provided cvsps output file. Useful
+	for debugging or when cvsps is being handled outside cvsimport.
 
 -m::    
 	Attempt to detect merges based on the commit message. This option