summaryrefslogtreecommitdiffstats
path: root/git-cvsimport.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-02-05 21:13:21 -0800
committerJunio C Hamano <gitster@pobox.com>2013-02-05 21:13:21 -0800
commit076ffcc834f02a4f11d7f4fe8825be3b065020ff (patch)
tree6f5fa28df80c60c9b0a1dfab028d3db33ae22fa0 /git-cvsimport.txt
parent3f2ed6f9b744f05cf2ad32b0c0c80aa149d9fdcb (diff)
downloadgit-htmldocs-076ffcc834f02a4f11d7f4fe8825be3b065020ff.tar.gz
Autogenerated HTML docs for v1.8.1.2-545-g2f19ad
Diffstat (limited to 'git-cvsimport.txt')
-rw-r--r--git-cvsimport.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/git-cvsimport.txt b/git-cvsimport.txt
index f059ea94d..d1bcda28f 100644
--- a/git-cvsimport.txt
+++ b/git-cvsimport.txt
@@ -24,7 +24,7 @@ performing a one-shot import of a CVS repository consider using
link:http://cvs2svn.tigris.org/cvs2git.html[cvs2git] or
link:https://github.com/BartMassey/parsecvs[parsecvs].
-Imports a CVS repository into git. It will either create a new
+Imports a CVS repository into Git. It will either create a new
repository, or incrementally import into an existing one.
Splitting the CVS log into patch sets is done by 'cvsps'.
@@ -65,18 +65,18 @@ OPTIONS
`CVS/Repository`.
-C <target-dir>::
- 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.
-r <remote>::
- The git remote to import this CVS repository into.
+ The Git remote to import this CVS repository into.
Moves all CVS branches into remotes/<remote>/<branch>
akin to the way 'git clone' uses 'origin' by default.
-o <branch-for-HEAD>::
When no remote is specified (via -r) the 'HEAD' branch
- from CVS is imported to the 'origin' branch within the git
- repository, as 'HEAD' already has a special meaning for git.
+ from CVS is imported to the 'origin' branch within the Git
+ repository, as 'HEAD' already has a special meaning for Git.
When a remote is specified the 'HEAD' branch is named
remotes/<remote>/master mirroring 'git clone' behaviour.
Use this option if you want to import into a different