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