diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-10-03 16:32:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-10-03 16:32:57 -0700 |
| commit | 17222001273b817aa9655744a0033619134b1a2c (patch) | |
| tree | 94edd5c69bf891215941f9b55ee573513ddf5c89 /Documentation/git-cvsimport.txt | |
| parent | Post 0.99.8 master branch (diff) | |
| parent | git-pull: do not barf on -a flag meant for git-fetch. (diff) | |
| download | tgif-17222001273b817aa9655744a0033619134b1a2c.tar.xz | |
Merge branch 'fixes'
Diffstat (limited to 'Documentation/git-cvsimport.txt')
| -rw-r--r-- | Documentation/git-cvsimport.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt index cd01994877..b5753a46dc 100644 --- a/Documentation/git-cvsimport.txt +++ b/Documentation/git-cvsimport.txt @@ -51,15 +51,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 <options-for-cvsps>:: 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 |