X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-cvsimport.txt;h=4b62256a79034c4dcd60e2954e7f5c1b7f3caa81;hb=50496b2170cbe87b4c13f89f274aa2f181522bb9;hp=f5248c91cbb22901266bba31273a276698fe562c;hpb=1301c6eb412e7c5511b952a12e42c70ad56f028b;p=git.git diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt index f5248c91..4b62256a 100644 --- a/Documentation/git-cvsimport.txt +++ b/Documentation/git-cvsimport.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- 'git-cvsimport' [ -o ] [ -h ] [ -v ] [ -d ] [ -p ] - [ -C ] [ -i ] [ -k ] + [ -C ] [ -i ] [ -P ] [ -k ] [ -s ] [ -m ] [ -M regex ] [ ] @@ -60,6 +60,10 @@ the old cvs2git tool. + If you need to pass multiple options, separate them with a comma. +-P:: + 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