Google Git
Sign in
chromium / external / gitster / git-htmldocs / 85c44a9175871f71ce4f18363a471d0eca43fb08 / . / git-cvsexportcommit.html
blob: cb47ac4cc392c85d582abb0e7e378b5988a53573 [file] [log] [blame]
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
4<head>
5<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]6<meta name="generator" content="AsciiDoc 8.2.5" />
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]7<style type="text/css">
8/* Debug borders */
9p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
10/*
11 border: 1px solid red;
12*/
13}
14
15body {
16 margin: 1em 5% 1em 5%;
17}
18
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]19a {
20 color: blue;
21 text-decoration: underline;
22}
23a:visited {
24 color: fuchsia;
25}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]26
27em {
28 font-style: italic;
29}
30
31strong {
32 font-weight: bold;
33}
34
35tt {
36 color: navy;
37}
38
39h1, h2, h3, h4, h5, h6 {
40 color: #527bbd;
41 font-family: sans-serif;
42 margin-top: 1.2em;
43 margin-bottom: 0.5em;
44 line-height: 1.3;
45}
46
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]47h1, h2, h3 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]48 border-bottom: 2px solid silver;
49}
50h2 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]51 padding-top: 0.5em;
52}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]53h3 {
54 float: left;
55}
56h3 + * {
57 clear: left;
58}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]59
60div.sectionbody {
61 font-family: serif;
62 margin-left: 0;
63}
64
65hr {
66 border: 1px solid silver;
67}
68
69p {
70 margin-top: 0.5em;
71 margin-bottom: 0.5em;
72}
73
74pre {
75 padding: 0;
76 margin: 0;
77}
78
79span#author {
80 color: #527bbd;
81 font-family: sans-serif;
82 font-weight: bold;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]83 font-size: 1.1em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]84}
85span#email {
86}
87span#revision {
88 font-family: sans-serif;
89}
90
91div#footer {
92 font-family: sans-serif;
93 font-size: small;
94 border-top: 2px solid silver;
95 padding-top: 0.5em;
96 margin-top: 4.0em;
97}
98div#footer-text {
99 float: left;
100 padding-bottom: 0.5em;
101}
102div#footer-badges {
103 float: right;
104 padding-bottom: 0.5em;
105}
106
107div#preamble,
108div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
109div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
110div.admonitionblock {
111 margin-right: 10%;
112 margin-top: 1.5em;
113 margin-bottom: 1.5em;
114}
115div.admonitionblock {
116 margin-top: 2.5em;
117 margin-bottom: 2.5em;
118}
119
120div.content { /* Block element content. */
121 padding: 0;
122}
123
124/* Block element titles. */
125div.title, caption.title {
126 font-family: sans-serif;
127 font-weight: bold;
128 text-align: left;
129 margin-top: 1.0em;
130 margin-bottom: 0.5em;
131}
132div.title + * {
133 margin-top: 0;
134}
135
136td div.title:first-child {
137 margin-top: 0.0em;
138}
139div.content div.title:first-child {
140 margin-top: 0.0em;
141}
142div.content + div.title {
143 margin-top: 0.0em;
144}
145
146div.sidebarblock > div.content {
147 background: #ffffee;
148 border: 1px solid silver;
149 padding: 0.5em;
150}
151
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]152div.listingblock {
153 margin-right: 0%;
154}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]155div.listingblock > div.content {
156 border: 1px solid silver;
157 background: #f4f4f4;
158 padding: 0.5em;
159}
160
161div.quoteblock > div.content {
162 padding-left: 2.0em;
163}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]164
165div.attribution {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]166 text-align: right;
167}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]168div.verseblock + div.attribution {
169 text-align: left;
170}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]171
172div.admonitionblock .icon {
173 vertical-align: top;
174 font-size: 1.1em;
175 font-weight: bold;
176 text-decoration: underline;
177 color: #527bbd;
178 padding-right: 0.5em;
179}
180div.admonitionblock td.content {
181 padding-left: 0.5em;
182 border-left: 2px solid silver;
183}
184
185div.exampleblock > div.content {
186 border-left: 2px solid silver;
187 padding: 0.5em;
188}
189
190div.verseblock div.content {
191 white-space: pre;
192}
193
194div.imageblock div.content { padding-left: 0; }
195div.imageblock img { border: 1px solid silver; }
196span.image img { border-style: none; }
197
198dl {
199 margin-top: 0.8em;
200 margin-bottom: 0.8em;
201}
202dt {
203 margin-top: 0.5em;
204 margin-bottom: 0;
205 font-style: italic;
206}
207dd > *:first-child {
208 margin-top: 0;
209}
210
211ul, ol {
212 list-style-position: outside;
213}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]214div.olist2 ol {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]215 list-style-type: lower-alpha;
216}
217
218div.tableblock > table {
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]219 border: 3px solid #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]220}
221thead {
222 font-family: sans-serif;
223 font-weight: bold;
224}
225tfoot {
226 font-weight: bold;
227}
228
229div.hlist {
230 margin-top: 0.8em;
231 margin-bottom: 0.8em;
232}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]233div.hlist td {
234 padding-bottom: 5px;
235}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]236td.hlist1 {
237 vertical-align: top;
238 font-style: italic;
239 padding-right: 0.8em;
240}
241td.hlist2 {
242 vertical-align: top;
243}
244
245@media print {
246 div#footer-badges { display: none; }
247}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]248
249div#toctitle {
250 color: #527bbd;
251 font-family: sans-serif;
252 font-size: 1.1em;
253 font-weight: bold;
254 margin-top: 1.0em;
255 margin-bottom: 0.1em;
256}
257
258div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
259 margin-top: 0;
260 margin-bottom: 0;
261}
262div.toclevel2 {
263 margin-left: 2em;
264 font-size: 0.9em;
265}
266div.toclevel3 {
267 margin-left: 4em;
268 font-size: 0.9em;
269}
270div.toclevel4 {
271 margin-left: 6em;
272 font-size: 0.9em;
273}
274include1::./stylesheets/xhtml11-manpage.css[]
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]275/* Workarounds for IE6's broken and incomplete CSS2. */
276
277div.sidebar-content {
278 background: #ffffee;
279 border: 1px solid silver;
280 padding: 0.5em;
281}
282div.sidebar-title, div.image-title {
283 font-family: sans-serif;
284 font-weight: bold;
285 margin-top: 0.0em;
286 margin-bottom: 0.5em;
287}
288
289div.listingblock div.content {
290 border: 1px solid silver;
291 background: #f4f4f4;
292 padding: 0.5em;
293}
294
295div.quoteblock-content {
296 padding-left: 2.0em;
297}
298
299div.exampleblock-content {
300 border-left: 2px solid silver;
301 padding-left: 0.5em;
302}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]303
304/* IE6 sets dynamically generated links as visited. */
305div#toc a:visited { color: blue; }
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]306</style>
307<title>git-cvsexportcommit(1)</title>
308</head>
309<body>
310<div id="header">
311<h1>
312git-cvsexportcommit(1) Manual Page
313</h1>
314<h2>NAME</h2>
315<div class="sectionbody">
316<p>git-cvsexportcommit -
Junio C Hamano7c73c662007-01-19 00:37:50[diff] [blame]317 Export a single commit to a CVS checkout
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]318</p>
319</div>
320</div>
321<h2>SYNOPSIS</h2>
322<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]323<div class="para"><p><em>git cvsexportcommit</em> [-h] [-u] [-v] [-c] [-P] [-p] [-a] [-d cvsroot]
324 [-w cvsworkdir] [-W] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]325</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]326<h2 id="_description">DESCRIPTION</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]327<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]328<div class="para"><p>Exports a commit from GIT to a CVS checkout, making it easier
329to merge patches from a git repository into a CVS repository.</p></div>
330<div class="para"><p>Specify the name of a CVS checkout using the -w switch or execute it
Junio C Hamano8c5802d2007-11-15 00:13:36[diff] [blame]331from the root of the CVS working copy. In the latter case GIT_DIR must
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]332be defined. See examples below.</p></div>
333<div class="para"><p>It does its best to do the safe thing, it will check that the files are
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]334unchanged and up to date in the CVS checkout, and it will not autocommit
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]335by default.</p></div>
336<div class="para"><p>Supports file additions, removals, and commits that affect binary files.</p></div>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]337<div class="para"><p>If the commit is a merge commit, you must tell <em>git cvsexportcommit</em> what
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]338parent the changeset should be done against.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]339</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]340<h2 id="_options">OPTIONS</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]341<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]342<div class="vlist"><dl>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]343<dt>
344-c
345</dt>
346<dd>
347<p>
348 Commit automatically if the patch applied cleanly. It will not
349 commit if any hunks fail to apply or there were other problems.
350</p>
351</dd>
352<dt>
353-p
354</dt>
355<dd>
356<p>
357 Be pedantic (paranoid) when applying patches. Invokes patch with
358 --fuzz=0
359</p>
360</dd>
361<dt>
Junio C Hamano75cc4c92006-07-24 08:25:03[diff] [blame]362-a
363</dt>
364<dd>
365<p>
366 Add authorship information. Adds Author line, and Committer (if
367 different from Author) to the message.
368</p>
369</dd>
370<dt>
Junio C Hamano118d2772007-02-21 20:24:10[diff] [blame]371-d
372</dt>
373<dd>
374<p>
375 Set an alternative CVSROOT to use. This corresponds to the CVS
376 -d parameter. Usually users will not want to set this, except
377 if using CVS in an asymmetric fashion.
378</p>
379</dd>
380<dt>
Junio C Hamano0fd4dbd2006-05-14 09:22:52[diff] [blame]381-f
382</dt>
383<dd>
384<p>
385 Force the merge even if the files are not up to date.
386</p>
387</dd>
388<dt>
Junio C Hamano42f855f2007-02-06 00:09:38[diff] [blame]389-P
390</dt>
391<dd>
392<p>
393 Force the parent commit, even if it is not a direct parent.
394</p>
395</dd>
396<dt>
Junio C Hamano0fd4dbd2006-05-14 09:22:52[diff] [blame]397-m
398</dt>
399<dd>
400<p>
401 Prepend the commit message with the provided prefix.
402 Useful for patch series and the like.
403</p>
404</dd>
405<dt>
Junio C Hamano591dc6a2007-05-29 09:18:19[diff] [blame]406-u
407</dt>
408<dd>
409<p>
Junio C Hamanoa6387422007-08-25 03:54:27[diff] [blame]410 Update affected files from CVS repository before attempting export.
Junio C Hamano591dc6a2007-05-29 09:18:19[diff] [blame]411</p>
412</dd>
413<dt>
Junio C Hamanof43de602009-06-18 20:54:10[diff] [blame]414-k
415</dt>
416<dd>
417<p>
418 Reverse CVS keyword expansion (e.g. $Revision: 1.2.3.4$
419 becomes $Revision$) in working CVS checkout before applying patch.
420</p>
421</dd>
422<dt>
Junio C Hamano8c5802d2007-11-15 00:13:36[diff] [blame]423-w
424</dt>
425<dd>
426<p>
427 Specify the location of the CVS checkout to use for the export. This
428 option does not require GIT_DIR to be set before execution if the
Junio C Hamanofeeb1be2008-05-22 00:53:35[diff] [blame]429 current directory is within a git repository. The default is the
430 value of <em>cvsexportcommit.cvsdir</em>.
Junio C Hamano8c5802d2007-11-15 00:13:36[diff] [blame]431</p>
432</dd>
433<dt>
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]434-W
435</dt>
436<dd>
437<p>
438 Tell cvsexportcommit that the current working directory is not only
439 a Git checkout, but also the CVS checkout. Therefore, Git will
440 reset the working directory to the parent commit before proceeding.
441</p>
442</dd>
443<dt>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]444-v
445</dt>
446<dd>
447<p>
448 Verbose.
449</p>
450</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]451</dl></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]452</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]453<h2 id="_configuration">CONFIGURATION</h2>
Junio C Hamanofeeb1be2008-05-22 00:53:35[diff] [blame]454<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]455<div class="vlist"><dl>
Junio C Hamanofeeb1be2008-05-22 00:53:35[diff] [blame]456<dt>
457cvsexportcommit.cvsdir
458</dt>
459<dd>
460<p>
461 The default location of the CVS checkout to use for the export.
462</p>
463</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]464</dl></div>
Junio C Hamanofeeb1be2008-05-22 00:53:35[diff] [blame]465</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]466<h2 id="_examples">EXAMPLES</h2>
Junio C Hamano2e552442006-01-30 07:39:30[diff] [blame]467<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]468<div class="vlist"><dl>
Junio C Hamano2e552442006-01-30 07:39:30[diff] [blame]469<dt>
470Merge one patch into CVS
471</dt>
472<dd>
473<div class="listingblock">
474<div class="content">
475<pre><tt>$ export GIT_DIR=~/project/.git
476$ cd ~/project_cvs_checkout
Junio C Hamanofce7c7e2008-07-02 03:06:38[diff] [blame]477$ git cvsexportcommit -v &lt;commit-sha1&gt;
Junio C Hamano1974bf22007-10-31 05:57:20[diff] [blame]478$ cvs commit -F .msg &lt;files&gt;</tt></pre>
Junio C Hamano2e552442006-01-30 07:39:30[diff] [blame]479</div></div>
480</dd>
481<dt>
Junio C Hamano8c5802d2007-11-15 00:13:36[diff] [blame]482Merge one patch into CVS (-c and -w options). The working directory is within the Git Repo
483</dt>
484<dd>
485<div class="listingblock">
486<div class="content">
Junio C Hamanofce7c7e2008-07-02 03:06:38[diff] [blame]487<pre><tt> $ git cvsexportcommit -v -c -w ~/project_cvs_checkout &lt;commit-sha1&gt;</tt></pre>
Junio C Hamano8c5802d2007-11-15 00:13:36[diff] [blame]488</div></div>
489</dd>
490<dt>
Junio C Hamano6926bef2007-06-16 09:54:05[diff] [blame]491Merge pending patches into CVS automatically &#8212; only if you really know what you are doing
Junio C Hamano2e552442006-01-30 07:39:30[diff] [blame]492</dt>
493<dd>
494<div class="listingblock">
495<div class="content">
496<pre><tt>$ export GIT_DIR=~/project/.git
497$ cd ~/project_cvs_checkout
Junio C Hamanofce7c7e2008-07-02 03:06:38[diff] [blame]498$ git cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git cvsexportcommit -c -p -v</tt></pre>
Junio C Hamano2e552442006-01-30 07:39:30[diff] [blame]499</div></div>
500</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]501</dl></div>
Junio C Hamano2e552442006-01-30 07:39:30[diff] [blame]502</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]503<h2 id="_author">Author</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]504<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]505<div class="para"><p>Written by Martin Langhoff &lt;martin@catalyst.net.nz&gt; and others.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]506</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]507<h2 id="_documentation">Documentation</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]508<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]509<div class="para"><p>Documentation by Martin Langhoff &lt;martin@catalyst.net.nz&gt; and others.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]510</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]511<h2 id="_git">GIT</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]512<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]513<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]514</div>
515<div id="footer">
516<div id="footer-text">
Junio C Hamanodca34822010-02-13 01:02:52[diff] [blame]517Last updated 2010-02-13 00:59:38 UTC
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]518</div>
519</div>
520</body>
521</html>