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-cvsexportcommit(1)</title>
\r
264 git-cvsexportcommit(1) Manual Page
\r
267 <div class="sectionbody">
\r
268 <p>git-cvsexportcommit -
\r
269 Export a commit to a CVS checkout
\r
274 <div class="sectionbody">
\r
275 <p><em>git-cvsexportcommmit</em> [-h] [-v] [-c] [-p] [PARENTCOMMIT] COMMITID</p>
\r
277 <h2>DESCRIPTION</h2>
\r
278 <div class="sectionbody">
\r
279 <p>Exports a commit from GIT to a CVS checkout, making it easier
\r
280 to merge patches from a git repository into a CVS repository.</p>
\r
281 <p>Execute it from the root of the CVS working copy. GIT_DIR must be defined.
\r
282 See examples below.</p>
\r
283 <p>It does its best to do the safe thing, it will check that the files are
\r
284 unchanged and up to date in the CVS checkout, and it will not autocommit
\r
286 <p>Supports file additions, removals, and commits that affect binary files.</p>
\r
287 <p>If the commit is a merge commit, you must tell git-cvsapplycommit what parent
\r
288 should the changeset be done against.</p>
\r
291 <div class="sectionbody">
\r
298 Commit automatically if the patch applied cleanly. It will not
\r
299 commit if any hunks fail to apply or there were other problems.
\r
307 Be pedantic (paranoid) when applying patches. Invokes patch with
\r
322 <div class="sectionbody">
\r
325 Merge one patch into CVS
\r
328 <div class="listingblock">
\r
329 <div class="content">
\r
330 <pre><tt>$ export GIT_DIR=~/project/.git
\r
331 $ cd ~/project_cvs_checkout
\r
332 $ git-cvsexportcommit -v <commit-sha1>
\r
333 $ cvs commit -F .mgs <files></tt></pre>
\r
337 Merge pending patches into CVS automatically — only if you really know what you are doing
\r
340 <div class="listingblock">
\r
341 <div class="content">
\r
342 <pre><tt>$ export GIT_DIR=~/project/.git
\r
343 $ cd ~/project_cvs_checkout
\r
344 $ git-cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git-cvsexportcommit -c -p -v</tt></pre>
\r
350 <div class="sectionbody">
\r
351 <p>Written by Martin Langhoff <martin@catalyst.net.nz></p>
\r
353 <h2>Documentation</h2>
\r
354 <div class="sectionbody">
\r
355 <p>Documentation by Martin Langhoff <martin@catalyst.net.nz></p>
\r
358 <div class="sectionbody">
\r
359 <p>Part of the <a href="git.html">git(7)</a> suite</p>
\r
362 <div id="footer-text">
\r
363 Last updated 29-Jan-2006 23:39:07 PDT
\r