]> git.ipfire.org Git - thirdparty/git.git/blame - Documentation/git-cvsimport.txt
[PATCH] Random documentation fixes
[thirdparty/git.git] / Documentation / git-cvsimport.txt
CommitLineData
215a7ad1
JH
1git-cvsimport(1)
2================
f2114060
MU
3v0.1, July 2005
4
5NAME
6----
215a7ad1 7git-cvsimport - Import a CVS repository into git
f2114060
MU
8
9
10SYNOPSIS
11--------
215a7ad1 12'git-cvsimport' [ -o <branch-for-HEAD> ] [ -h ] [ -v ]
f2114060 13 [ -d <CVSROOT> ] [ -p <options-for-cvsps> ]
fbfd60d6 14 [ -C <GIT_repository> ] [ -i ] [ -k ]
db4b6582 15 [ -s <subst> ] [ -m ] [ -M regex ] [ <CVS_module> ]
f2114060
MU
16
17
18DESCRIPTION
19-----------
20Imports a CVS repository into git. It will either create a new
21repository, or incrementally import into an existing one.
22
1cd3674a 23Splitting the CVS log into patch sets is done by 'cvsps'.
f2114060
MU
24At least version 2.1 is required.
25
26OPTIONS
27-------
28-d <CVSROOT>::
29 The root of the CVS archive. May be local (a simple path) or remote;
34155390
SV
30 currently, only the :local:, :ext: and :pserver: access methods
31 are supported.
f2114060 32
b0921331
DK
33-C <target-dir>::
34 The GIT repository to import to. If the directory doesn't
35 exist, it will be created. Default is the current directory.
36
c1c774e7
SV
37-i::
38 Import-only: don't perform a checkout after importing. This option
39 ensures the working directory and cache remain untouched and will
40 not create them if they do not exist.
41
abe05822
ML
42-k::
43 Kill keywords: will extract files with -kk from the CVS archive
44 to avoid noisy changesets. Highly recommended, but off by default
45 to preserve compatibility with early imported trees.
46
0d821d4d
PA
47-u::
48 Convert underscores in tag and branch names to dots.
49
f2114060
MU
50-o <branch-for-HEAD>::
51 The 'HEAD' branch from CVS is imported to the 'origin' branch within
52 the git repository, as 'HEAD' already has a special meaning for git.
53 Use this option if you want to import into a different branch.
df8baa42
JF
54+
55Use '-o master' for continuing an import that was initially done by
56the old cvs2git tool.
f2114060
MU
57
58-p <options-for-cvsps>::
59 Additional options for cvsps.
b0921331 60 The options '-u' and '-A' are implicit and should not be used here.
df8baa42
JF
61+
62If you need to pass multiple options, separate them with a comma.
f2114060 63
db4b6582
ML
64-m::
65 Attempt to detect merges based on the commit message. This option
66 will enable default regexes that try to capture the name source
67 branch name from the commit message.
68
69-M <regex>::
70 Attempt to detect merges based on the commit message with a custom
71 regex. It can be used with -m to also see the default regexes.
72 You must escape forward slashes.
73
f2114060
MU
74-v::
75 Verbosity: let 'cvsimport' report what it is doing.
76
77<CVS_module>::
78 The CVS module you want to import. Relative to <CVSROOT>.
79
f2114060
MU
80-h::
81 Print a short usage message and exit.
82
b0921331
DK
83-z <fuzz>::
84 Pass the timestamp fuzz factor to cvsps.
85
fbfd60d6
JS
86-s <subst>::
87 Substitute the character "/" in branch names with <subst>
88
f2114060
MU
89OUTPUT
90------
91If '-v' is specified, the script reports what it is doing.
92
93Otherwise, success is indicated the Unix way, i.e. by simply exiting with
94a zero exit status.
95
96
97Author
98------
99Written by Matthias Urlichs <smurf@smurf.noris.de>, with help from
100various participants of the git-list <git@vger.kernel.org>.
101
102Documentation
103--------------
104Documentation by Matthias Urlichs <smurf@smurf.noris.de>.
105
106GIT
107---
a7154e91 108Part of the gitlink:git[7] suite
f2114060 109