X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-cvsimport.txt;h=f5248c91cbb22901266bba31273a276698fe562c;hb=794f9fe7db30e2aff8f8f0543c6d18bf579cdbc2;hp=cd01994877240fdc725aab7050d0634e7a15db2e;hpb=dbc37438687e110697574d175e4eca5f9cbeae81;p=git.git diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt index cd019948..f5248c91 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 ] [ -h ] [ -v ] [ -d ] [ -p ] - [ -C ] [ -i ] [ -k ] + [ -C ] [ -i ] [ -k ] [ -s ] [ -m ] [ -M regex ] [ ] @@ -31,7 +30,7 @@ OPTIONS are supported. -C :: - 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,15 @@ 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 :: 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. -m:: Attempt to detect merges based on the commit message. This option