1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
\r
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
\r
3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
\r
5 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
\r
6 <meta name="generator" content="AsciiDoc 7.0.1" />
\r
7 <style type="text/css">
\r
9 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
\r
11 border: 1px solid red;
\r
16 margin: 1em 5% 1em 5%;
\r
20 a:visited { color: fuchsia; }
\r
34 h1, h2, h3, h4, h5, h6 {
\r
36 font-family: sans-serif;
\r
38 margin-bottom: 0.5em;
\r
43 border-bottom: 2px solid silver;
\r
46 border-bottom: 2px solid silver;
\r
56 border: 1px solid silver;
\r
61 margin-bottom: 0.5em;
\r
71 font-family: sans-serif;
\r
78 font-family: sans-serif;
\r
82 font-family: sans-serif;
\r
84 border-top: 2px solid silver;
\r
90 padding-bottom: 0.5em;
\r
94 padding-bottom: 0.5em;
\r
98 div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
\r
99 div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
\r
100 div.admonitionblock {
\r
103 margin-bottom: 1.5em;
\r
105 div.admonitionblock {
\r
107 margin-bottom: 2.5em;
\r
110 div.content { /* Block element content. */
\r
114 /* Block element titles. */
\r
115 div.title, caption.title {
\r
116 font-family: sans-serif;
\r
120 margin-bottom: 0.5em;
\r
126 td div.title:first-child {
\r
129 div.content div.title:first-child {
\r
132 div.content + div.title {
\r
136 div.sidebarblock > div.content {
\r
137 background: #ffffee;
\r
138 border: 1px solid silver;
\r
142 div.listingblock > div.content {
\r
143 border: 1px solid silver;
\r
144 background: #f4f4f4;
\r
148 div.quoteblock > div.content {
\r
149 padding-left: 2.0em;
\r
151 div.quoteblock .attribution {
\r
155 div.admonitionblock .icon {
\r
156 vertical-align: top;
\r
159 text-decoration: underline;
\r
161 padding-right: 0.5em;
\r
163 div.admonitionblock td.content {
\r
164 padding-left: 0.5em;
\r
165 border-left: 2px solid silver;
\r
168 div.exampleblock > div.content {
\r
169 border-left: 2px solid silver;
\r
173 div.verseblock div.content {
\r
177 div.imageblock div.content { padding-left: 0; }
\r
178 div.imageblock img { border: 1px solid silver; }
\r
179 span.image img { border-style: none; }
\r
183 margin-bottom: 0.8em;
\r
188 font-style: italic;
\r
190 dd > *:first-child {
\r
195 list-style-position: outside;
\r
198 list-style-type: lower-alpha;
\r
201 div.tableblock > table {
\r
202 border-color: #527bbd;
\r
206 font-family: sans-serif;
\r
215 margin-bottom: 0.8em;
\r
218 vertical-align: top;
\r
219 font-style: italic;
\r
220 padding-right: 0.8em;
\r
223 vertical-align: top;
\r
227 div#footer-badges { display: none; }
\r
229 include::./stylesheets/xhtml11-manpage.css[]
\r
230 /* Workarounds for IE6's broken and incomplete CSS2. */
\r
232 div.sidebar-content {
\r
233 background: #ffffee;
\r
234 border: 1px solid silver;
\r
237 div.sidebar-title, div.image-title {
\r
238 font-family: sans-serif;
\r
241 margin-bottom: 0.5em;
\r
244 div.listingblock div.content {
\r
245 border: 1px solid silver;
\r
246 background: #f4f4f4;
\r
250 div.quoteblock-content {
\r
251 padding-left: 2.0em;
\r
254 div.exampleblock-content {
\r
255 border-left: 2px solid silver;
\r
256 padding-left: 0.5em;
\r
259 <title>git-cvsimport(1)</title>
\r
264 git-cvsimport(1) Manual Page
\r
267 <div class="sectionbody">
\r
269 Import a CVS repository into git
\r
274 <div class="sectionbody">
\r
275 <div class="verseblock">
\r
276 <div class="content"><em>git-cvsimport</em> [-o <branch-for-HEAD>] [-h] [-v] [-d <CVSROOT>] [-s <subst>]
\r
277 [-p <options-for-cvsps>] [-C <git_repository>] [-i] [-P <file>]
\r
278 [-m] [-M regex] [<CVS_module>]</div></div>
\r
280 <h2>DESCRIPTION</h2>
\r
281 <div class="sectionbody">
\r
282 <p>Imports a CVS repository into git. It will either create a new
\r
283 repository, or incrementally import into an existing one.</p>
\r
284 <p>Splitting the CVS log into patch sets is done by <em>cvsps</em>.
\r
285 At least version 2.1 is required.</p>
\r
288 <div class="sectionbody">
\r
295 The root of the CVS archive. May be local (a simple path) or remote;
\r
296 currently, only the :local:, :ext: and :pserver: access methods
\r
301 -C <target-dir>
\r
305 The git repository to import to. If the directory doesn't
\r
306 exist, it will be created. Default is the current directory.
\r
314 Import-only: don't perform a checkout after importing. This option
\r
315 ensures the working directory and index remain untouched and will
\r
316 not create them if they do not exist.
\r
324 Kill keywords: will extract files with -kk from the CVS archive
\r
325 to avoid noisy changesets. Highly recommended, but off by default
\r
326 to preserve compatibility with early imported trees.
\r
334 Convert underscores in tag and branch names to dots.
\r
338 -o <branch-for-HEAD>
\r
342 The <em>HEAD</em> branch from CVS is imported to the <em>origin</em> branch within
\r
343 the git repository, as <em>HEAD</em> already has a special meaning for git.
\r
344 Use this option if you want to import into a different branch.
\r
346 <p>Use <em>-o master</em> for continuing an import that was initially done by
\r
347 the old cvs2git tool.</p>
\r
350 -p <options-for-cvsps>
\r
354 Additional options for cvsps.
\r
355 The options <em>-u</em> and <em>-A</em> are implicit and should not be used here.
\r
357 <p>If you need to pass multiple options, separate them with a comma.</p>
\r
360 -P <cvsps-output-file>
\r
364 Instead of calling cvsps, read the provided cvsps output file. Useful
\r
365 for debugging or when cvsps is being handled outside cvsimport.
\r
373 Attempt to detect merges based on the commit message. This option
\r
374 will enable default regexes that try to capture the name source
\r
375 branch name from the commit message.
\r
383 Attempt to detect merges based on the commit message with a custom
\r
384 regex. It can be used with -m to also see the default regexes.
\r
385 You must escape forward slashes.
\r
393 Verbosity: let <em>cvsimport</em> report what it is doing.
\r
401 The CVS module you want to import. Relative to <CVSROOT>.
\r
409 Print a short usage message and exit.
\r
417 Pass the timestamp fuzz factor to cvsps.
\r
425 Substitute the character "/" in branch names with <subst>
\r
429 -A <author-conv-file>
\r
433 CVS by default uses the unix username when writing its
\r
434 commit logs. Using this option and an author-conv-file
\r
437 <div class="literalblock">
\r
438 <div class="content">
\r
439 <pre><tt>exon=Andreas Ericsson <ae@op5.se>
\r
440 spawn=Simon Pawn <spawn@frog-pond.org></tt></pre>
\r
442 <div class="literalblock">
\r
443 <div class="content">
\r
444 <pre><tt>git-cvsimport will make it appear as those authors had
\r
445 their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly
\r
446 all along.</tt></pre>
\r
448 <div class="literalblock">
\r
449 <div class="content">
\r
450 <pre><tt>For convenience, this data is saved to $GIT_DIR/cvs-authors
\r
451 each time the -A option is provided and read from that same
\r
452 file each time git-cvsimport is run.</tt></pre>
\r
454 <div class="literalblock">
\r
455 <div class="content">
\r
456 <pre><tt>It is not recommended to use this feature if you intend to
\r
457 export changes back to CVS again later with
\r
458 git-link[1]::git-cvsexportcommit.</tt></pre>
\r
464 <div class="sectionbody">
\r
465 <p>If <em>-v</em> is specified, the script reports what it is doing.</p>
\r
466 <p>Otherwise, success is indicated the Unix way, i.e. by simply exiting with
\r
467 a zero exit status.</p>
\r
470 <div class="sectionbody">
\r
471 <p>Written by Matthias Urlichs <smurf@smurf.noris.de>, with help from
\r
472 various participants of the git-list <git@vger.kernel.org>.</p>
\r
474 <h2>Documentation</h2>
\r
475 <div class="sectionbody">
\r
476 <p>Documentation by Matthias Urlichs <smurf@smurf.noris.de>.</p>
\r
479 <div class="sectionbody">
\r
480 <p>Part of the <a href="git.html">git(7)</a> suite</p>
\r
483 <div id="footer-text">
\r
484 Last updated 16-Jan-2006 00:23:09 PDT
\r