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