summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Martin Langhoff <martin@catalyst.net.nz>2005-11-02 13:48:47 +1300
committerLibravatar Junio C Hamano <junkio@cox.net>2005-11-01 16:57:38 -0800
commit211dcac6430cdf77fcf2a968ffaf9313b5c059b0 (patch)
tree27b0709baf49484aca7cd33d270f9e3323cc34b8 /Documentation
parentcvsimport: catch error condition where cvs host disappears (diff)
downloadtgif-211dcac6430cdf77fcf2a968ffaf9313b5c059b0.tar.xz
cvsimport: introduce -P <cvsps-output-file> option
-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. Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-cvsimport.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
index f5248c91cb..a2f97b392a 100644
--- a/Documentation/git-cvsimport.txt
+++ b/Documentation/git-cvsimport.txt
@@ -60,6 +60,10 @@ the old cvs2git tool.
+
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
will enable default regexes that try to capture the name source