projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge-recursive: conflicting rename case.
[git.git]
/
Documentation
/
git-cvsimport.txt
diff --git
a/Documentation/git-cvsimport.txt
b/Documentation/git-cvsimport.txt
index
f5248c9
..
f89b251
100644
(file)
--- a/
Documentation/git-cvsimport.txt
+++ b/
Documentation/git-cvsimport.txt
@@
-10,7
+10,7
@@
SYNOPSIS
--------
'git-cvsimport' [ -o <branch-for-HEAD> ] [ -h ] [ -v ]
[ -d <CVSROOT> ] [ -p <options-for-cvsps> ]
--------
'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> ]
[ -s <subst> ] [ -m ] [ -M regex ] [ <CVS_module> ]
@@
-35,7
+35,7
@@
OPTIONS
-i::
Import-only: don't perform a checkout after importing. This option
-i::
Import-only: don't perform a checkout after importing. This option
- ensures the working directory and
cache
remain untouched and will
+ ensures the working directory and
index
remain untouched and will
not create them if they do not exist.
-k::
not create them if they do not exist.
-k::
@@
-60,6
+60,10
@@
the old cvs2git tool.
+
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
will enable default regexes that try to capture the name source
-m::
Attempt to detect merges based on the commit message. This option
will enable default regexes that try to capture the name source