X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-cvsimport-script.txt;h=d01a15d8a3a60b58aaa5d084b07bfe5809956e54;hb=52be5fcd29e074cb549b9a92ff8caceb736e4851;hp=4eb0f432469797809a2c25171b53a17a5be5725a;hpb=bbca20accefe8329f976371d0d8c111c965cdf1a;p=git.git

diff --git a/Documentation/git-cvsimport-script.txt b/Documentation/git-cvsimport-script.txt
index 4eb0f432..d01a15d8 100644
--- a/Documentation/git-cvsimport-script.txt
+++ b/Documentation/git-cvsimport-script.txt
@@ -11,7 +11,8 @@ SYNOPSIS
 --------
 'git-cvsimport-script' [ -o <branch-for-HEAD> ] [ -h ] [ -v ]
 			[ -d <CVSROOT> ] [ -p <options-for-cvsps> ]
-			[ -C <GIT_repository> ] [ <CVS_module> ]
+			[ -C <GIT_repository> ] [ -i ] [ -k ]
+			[ -s <subst> ] [ -m ] [ -M regex ] [ <CVS_module> ]
 
 
 DESCRIPTION
@@ -29,6 +30,20 @@ OPTIONS
 	currently, only the :local:, :ext: and :pserver: access methods 
 	are supported.
 
+-C <target-dir>::
+        The GIT repository to import to.  If the directory doesn't
+        exist, it will be created.  Default is the current directory.
+
+-i::
+	Import-only: don't perform a checkout after importing.  This option
+	ensures the working directory and cache remain untouched and will
+	not create them if they do not exist.
+
+-k::
+	Kill keywords: will extract files with -kk from the CVS archive
+	to avoid noisy changesets. Highly recommended, but off by default
+	to preserve compatibility with early imported trees. 
+
 -o <branch-for-HEAD>::
 	The 'HEAD' branch from CVS is imported to the 'origin' branch within
 	the git repository, as 'HEAD' already has a special meaning for git.
@@ -39,10 +54,20 @@ OPTIONS
 
 -p <options-for-cvsps>::
 	Additional options for cvsps.
-	The options '-x' and '-A' are implicit and should not be used here.
+	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.
 
+-m::    
+	Attempt to detect merges based on the commit message. This option
+	will enable default regexes that try to capture the name source 
+	branch name from the commit message. 
+
+-M <regex>::
+	Attempt to detect merges based on the commit message with a custom
+	regex. It can be used with -m to also see the default regexes. 
+	You must escape forward slashes. 
+
 -v::
 	Verbosity: let 'cvsimport' report what it is doing.
 
@@ -52,6 +77,12 @@ OPTIONS
 -h::
 	Print a short usage message and exit.
 
+-z <fuzz>::
+        Pass the timestamp fuzz factor to cvsps.
+
+-s <subst>::
+	Substitute the character "/" in branch names with <subst>
+
 OUTPUT
 ------
 If '-v' is specified, the script reports what it is doing.