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">
5 <meta http-equiv=
"Content-Type" content=
"text/html; charset=UTF-8" />
6 <meta name=
"generator" content=
"AsciiDoc 8.4.5" />
7 <title>git-cvsexportcommit(
1)
</title>
8 <style type=
"text/css">
10 p
, li
, dt
, dd
, div
, pre
, h1
, h2
, h3
, h4
, h5
, h6
{
12 border: 1px solid red;
17 margin: 1em 5% 1em 5%;
22 text-decoration: underline
;
42 h1
, h2
, h3
, h4
, h5
, h6
{
44 font-family: sans-serif
;
51 border-bottom: 2px solid silver
;
69 border: 1px solid silver
;
88 font-family: sans-serif
;
94 span#revnumber
, span#revdate
, span#revremark
{
95 font-family: sans-serif
;
99 font-family: sans-serif
;
101 border-top: 2px solid silver
;
107 padding-bottom: 0.5em;
111 padding-bottom: 0.5em;
116 margin-bottom: 1.5em;
118 div
.tableblock
, div
.imageblock
, div
.exampleblock
, div
.verseblock
,
119 div
.quoteblock
, div
.literalblock
, div
.listingblock
, div
.sidebarblock
,
120 div
.admonitionblock
{
122 margin-bottom: 1.5em;
124 div
.admonitionblock
{
126 margin-bottom: 2.5em;
129 div
.content
{ /* Block element content. */
133 /* Block element titles. */
134 div
.title
, caption
.title
{
136 font-family: sans-serif
;
140 margin-bottom: 0.5em;
146 td div
.title:first-child
{
149 div
.content div
.title:first-child
{
152 div
.content
+ div
.title
{
156 div
.sidebarblock
> div
.content
{
158 border: 1px solid silver
;
162 div
.listingblock
> div
.content
{
163 border: 1px solid silver
;
172 div
.quoteblock
> div
.attribution
{
181 div
.verseblock
> div
.content
{
184 div
.verseblock
> div
.attribution
{
188 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
189 div
.verseblock
+ div
.attribution
{
193 div
.admonitionblock
.icon
{
197 text-decoration: underline
;
199 padding-right: 0.5em;
201 div
.admonitionblock td
.content
{
203 border-left: 2px solid silver
;
206 div
.exampleblock
> div
.content
{
207 border-left: 2px solid silver
;
211 div
.imageblock div
.content
{ padding-left: 0; }
212 span
.image img
{ border-style: none
; }
213 a
.image:visited
{ color: white
; }
217 margin-bottom: 0.8em;
230 list-style-position: outside
;
233 list-style-type: decimal
;
236 list-style-type: lower-alpha
;
239 list-style-type: upper-alpha
;
242 list-style-type: lower-roman
;
245 list-style-type: upper-roman
;
248 div
.compact ul
, div
.compact ol
,
249 div
.compact p
, div
.compact p
,
250 div
.compact div
, div
.compact div
{
252 margin-bottom: 0.1em;
255 div
.tableblock
> table
{
256 border: 3px solid
#527bbd;
259 font-family: sans-serif
;
271 /* Because the table frame attribute is overriden by CSS in most browsers. */
272 div
.tableblock
> table
[frame
="void"] {
275 div
.tableblock
> table
[frame
="hsides"] {
276 border-left-style: none
;
277 border-right-style: none
;
279 div
.tableblock
> table
[frame
="vsides"] {
280 border-top-style: none
;
281 border-bottom-style: none
;
287 margin-bottom: 0.8em;
290 padding-bottom: 15px;
292 dt
.hdlist1
.strong
, td
.hdlist1
.strong
{
298 padding-right: 0.8em;
304 div
.hdlist
.compact tr
{
314 div#footer-badges
{ display: none
; }
319 font-family: sans-serif
;
323 margin-bottom: 0.1em;
326 div
.toclevel1
, div
.toclevel2
, div
.toclevel3
, div
.toclevel4
{
342 /* Overrides for manpage documents */
345 padding-bottom: 0.5em;
346 border-top: 2px solid silver
;
347 border-bottom: 2px solid silver
;
357 div#toc
{ display: none
; }
360 /* Workarounds for IE6's broken and incomplete CSS2. */
362 div
.sidebar-content
{
364 border: 1px solid silver
;
367 div
.sidebar-title
, div
.image-title
{
369 font-family: sans-serif
;
372 margin-bottom: 0.5em;
375 div
.listingblock div
.content
{
376 border: 1px solid silver
;
381 div
.quoteblock-attribution
{
386 div
.verseblock-content
{
389 div
.verseblock-attribution
{
394 div
.exampleblock-content
{
395 border-left: 2px solid silver
;
399 /* IE6 sets dynamically generated links as visited. */
400 div#toc
a:visited
{ color: blue
; }
406 git-cvsexportcommit(
1) Manual Page
409 <div class=
"sectionbody">
410 <p>git-cvsexportcommit -
411 Export a single commit to a CVS checkout
415 <h2 id=
"_synopsis">SYNOPSIS
</h2>
416 <div class=
"sectionbody">
417 <div class=
"verseblock">
418 <div class=
"verseblock-content"><em>git cvsexportcommit
</em> [-h] [-u] [-v] [-c] [-P] [-p] [-a] [-d cvsroot]
419 [-w cvsworkdir] [-W] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID
</div>
420 <div class=
"verseblock-attribution">
423 <h2 id=
"_description">DESCRIPTION
</h2>
424 <div class=
"sectionbody">
425 <div class=
"paragraph"><p>Exports a commit from GIT to a CVS checkout, making it easier
426 to merge patches from a git repository into a CVS repository.
</p></div>
427 <div class=
"paragraph"><p>Specify the name of a CVS checkout using the -w switch or execute it
428 from the root of the CVS working copy. In the latter case GIT_DIR must
429 be defined. See examples below.
</p></div>
430 <div class=
"paragraph"><p>It does its best to do the safe thing, it will check that the files are
431 unchanged and up to date in the CVS checkout, and it will not autocommit
432 by default.
</p></div>
433 <div class=
"paragraph"><p>Supports file additions, removals, and commits that affect binary files.
</p></div>
434 <div class=
"paragraph"><p>If the commit is a merge commit, you must tell
<em>git cvsexportcommit
</em> what
435 parent the changeset should be done against.
</p></div>
437 <h2 id=
"_options">OPTIONS
</h2>
438 <div class=
"sectionbody">
439 <div class=
"dlist"><dl>
445 Commit automatically if the patch applied cleanly. It will not
446 commit if any hunks fail to apply or there were other problems.
454 Be pedantic (paranoid) when applying patches. Invokes patch with
463 Add authorship information. Adds Author line, and Committer (if
464 different from Author) to the message.
472 Set an alternative CVSROOT to use. This corresponds to the CVS
473 -d parameter. Usually users will not want to set this, except
474 if using CVS in an asymmetric fashion.
482 Force the merge even if the files are not up to date.
490 Force the parent commit, even if it is not a direct parent.
498 Prepend the commit message with the provided prefix.
499 Useful for patch series and the like.
507 Update affected files from CVS repository before attempting export.
515 Reverse CVS keyword expansion (e.g. $Revision:
1.2.3.4$
516 becomes $Revision$) in working CVS checkout before applying patch.
524 Specify the location of the CVS checkout to use for the export. This
525 option does not require GIT_DIR to be set before execution if the
526 current directory is within a git repository. The default is the
527 value of
<em>cvsexportcommit.cvsdir
</em>.
535 Tell cvsexportcommit that the current working directory is not only
536 a Git checkout, but also the CVS checkout. Therefore, Git will
537 reset the working directory to the parent commit before proceeding.
550 <h2 id=
"_configuration">CONFIGURATION
</h2>
551 <div class=
"sectionbody">
552 <div class=
"dlist"><dl>
554 cvsexportcommit.cvsdir
558 The default location of the CVS checkout to use for the export.
563 <h2 id=
"_examples">EXAMPLES
</h2>
564 <div class=
"sectionbody">
565 <div class=
"dlist"><dl>
567 Merge one patch into CVS
570 <div class=
"listingblock">
571 <div class=
"content">
572 <pre><tt>$ export GIT_DIR=~/project/.git
573 $ cd ~/project_cvs_checkout
574 $ git cvsexportcommit -v
<commit-sha1
>
575 $ cvs commit -F .msg
<files
></tt></pre>
579 Merge one patch into CVS (-c and -w options). The working directory is within the Git Repo
582 <div class=
"listingblock">
583 <div class=
"content">
584 <pre><tt> $ git cvsexportcommit -v -c -w ~/project_cvs_checkout
<commit-sha1
></tt></pre>
588 Merge pending patches into CVS automatically
 — only if you really know what you are doing
591 <div class=
"listingblock">
592 <div class=
"content">
593 <pre><tt>$ export GIT_DIR=~/project/.git
594 $ cd ~/project_cvs_checkout
595 $ git cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git cvsexportcommit -c -p -v
</tt></pre>
600 <h2 id=
"_git">GIT
</h2>
601 <div class=
"sectionbody">
602 <div class=
"paragraph"><p>Part of the
<a href=
"git.html">git(
1)
</a> suite
</p></div>
605 <div id=
"footer-text">
606 Last updated
2011-
07-
23 00:
49:
30 UTC