git-cvsexportcommit.html

   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" />
   6 <meta name="generator" content="AsciiDoc 8.4.5" />
   7 <title>git-cvsexportcommit(1)</title>
   8 <style type="text/css">
   9 /* Debug borders */
  10 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
  11 /*
  12   border: 1px solid red;
  13 */
  14 }
  15
  16 body {
  17   margin: 1em 5% 1em 5%;
  18 }
  19
  20 a {
  21   color: blue;
  22   text-decoration: underline;
  23 }
  24 a:visited {
  25   color: fuchsia;
  26 }
  27
  28 em {
  29   font-style: italic;
  30   color: navy;
  31 }
  32
  33 strong {
  34   font-weight: bold;
  35   color: #083194;
  36 }
  37
  38 tt {
  39   color: navy;
  40 }
  41
  42 h1, 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
  50 h1, h2, h3 {
  51   border-bottom: 2px solid silver;
  52 }
  53 h2 {
  54   padding-top: 0.5em;
  55 }
  56 h3 {
  57   float: left;
  58 }
  59 h3 + * {
  60   clear: left;
  61 }
  62
  63 div.sectionbody {
  64   font-family: serif;
  65   margin-left: 0;
  66 }
  67
  68 hr {
  69   border: 1px solid silver;
  70 }
  71
  72 p {
  73   margin-top: 0.5em;
  74   margin-bottom: 0.5em;
  75 }
  76
  77 ul, ol, li > p {
  78   margin-top: 0;
  79 }
  80
  81 pre {
  82   padding: 0;
  83   margin: 0;
  84 }
  85
  86 span#author {
  87   color: #527bbd;
  88   font-family: sans-serif;
  89   font-weight: bold;
  90   font-size: 1.1em;
  91 }
  92 span#email {
  93 }
  94 span#revnumber, span#revdate, span#revremark {
  95   font-family: sans-serif;
  96 }
  97
  98 div#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 }
 105 div#footer-text {
 106   float: left;
 107   padding-bottom: 0.5em;
 108 }
 109 div#footer-badges {
 110   float: right;
 111   padding-bottom: 0.5em;
 112 }
 113
 114 div#preamble {
 115   margin-top: 1.5em;
 116   margin-bottom: 1.5em;
 117 }
 118 div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
 119 div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
 120 div.admonitionblock {
 121   margin-top: 1.5em;
 122   margin-bottom: 1.5em;
 123 }
 124 div.admonitionblock {
 125   margin-top: 2.5em;
 126   margin-bottom: 2.5em;
 127 }
 128
 129 div.content { /* Block element content. */
 130   padding: 0;
 131 }
 132
 133 /* Block element titles. */
 134 div.title, caption.title {
 135   color: #527bbd;
 136   font-family: sans-serif;
 137   font-weight: bold;
 138   text-align: left;
 139   margin-top: 1.0em;
 140   margin-bottom: 0.5em;
 141 }
 142 div.title + * {
 143   margin-top: 0;
 144 }
 145
 146 td div.title:first-child {
 147   margin-top: 0.0em;
 148 }
 149 div.content div.title:first-child {
 150   margin-top: 0.0em;
 151 }
 152 div.content + div.title {
 153   margin-top: 0.0em;
 154 }
 155
 156 div.sidebarblock > div.content {
 157   background: #ffffee;
 158   border: 1px solid silver;
 159   padding: 0.5em;
 160 }
 161
 162 div.listingblock > div.content {
 163   border: 1px solid silver;
 164   background: #f4f4f4;
 165   padding: 0.5em;
 166 }
 167
 168 div.quoteblock {
 169   padding-left: 2.0em;
 170   margin-right: 10%;
 171 }
 172 div.quoteblock > div.attribution {
 173   padding-top: 0.5em;
 174   text-align: right;
 175 }
 176
 177 div.verseblock {
 178   padding-left: 2.0em;
 179   margin-right: 10%;
 180 }
 181 div.verseblock > div.content {
 182   white-space: pre;
 183 }
 184 div.verseblock > div.attribution {
 185   padding-top: 0.75em;
 186   text-align: left;
 187 }
 188 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
 189 div.verseblock + div.attribution {
 190   text-align: left;
 191 }
 192
 193 div.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 }
 201 div.admonitionblock td.content {
 202   padding-left: 0.5em;
 203   border-left: 2px solid silver;
 204 }
 205
 206 div.exampleblock > div.content {
 207   border-left: 2px solid silver;
 208   padding: 0.5em;
 209 }
 210
 211 div.imageblock div.content { padding-left: 0; }
 212 span.image img { border-style: none; }
 213 a.image:visited { color: white; }
 214
 215 dl {
 216   margin-top: 0.8em;
 217   margin-bottom: 0.8em;
 218 }
 219 dt {
 220   margin-top: 0.5em;
 221   margin-bottom: 0;
 222   font-style: normal;
 223   color: navy;
 224 }
 225 dd > *:first-child {
 226   margin-top: 0.1em;
 227 }
 228
 229 ul, ol {
 230     list-style-position: outside;
 231 }
 232 ol.arabic {
 233   list-style-type: decimal;
 234 }
 235 ol.loweralpha {
 236   list-style-type: lower-alpha;
 237 }
 238 ol.upperalpha {
 239   list-style-type: upper-alpha;
 240 }
 241 ol.lowerroman {
 242   list-style-type: lower-roman;
 243 }
 244 ol.upperroman {
 245   list-style-type: upper-roman;
 246 }
 247
 248 div.compact ul, div.compact ol,
 249 div.compact p, div.compact p,
 250 div.compact div, div.compact div {
 251   margin-top: 0.1em;
 252   margin-bottom: 0.1em;
 253 }
 254
 255 div.tableblock > table {
 256   border: 3px solid #527bbd;
 257 }
 258 thead {
 259   font-family: sans-serif;
 260   font-weight: bold;
 261 }
 262 tfoot {
 263   font-weight: bold;
 264 }
 265 td > div.verse {
 266   white-space: pre;
 267 }
 268 p.table {
 269   margin-top: 0;
 270 }
 271 /* Because the table frame attribute is overriden by CSS in most browsers. */
 272 div.tableblock > table[frame="void"] {
 273   border-style: none;
 274 }
 275 div.tableblock > table[frame="hsides"] {
 276   border-left-style: none;
 277   border-right-style: none;
 278 }
 279 div.tableblock > table[frame="vsides"] {
 280   border-top-style: none;
 281   border-bottom-style: none;
 282 }
 283
 284
 285 div.hdlist {
 286   margin-top: 0.8em;
 287   margin-bottom: 0.8em;
 288 }
 289 div.hdlist tr {
 290   padding-bottom: 15px;
 291 }
 292 dt.hdlist1.strong, td.hdlist1.strong {
 293   font-weight: bold;
 294 }
 295 td.hdlist1 {
 296   vertical-align: top;
 297   font-style: normal;
 298   padding-right: 0.8em;
 299   color: navy;
 300 }
 301 td.hdlist2 {
 302   vertical-align: top;
 303 }
 304 div.hdlist.compact tr {
 305   margin: 0;
 306   padding-bottom: 0;
 307 }
 308
 309 .comment {
 310   background: yellow;
 311 }
 312
 313 @media print {
 314   div#footer-badges { display: none; }
 315 }
 316
 317 div#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
 326 div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
 327   margin-top: 0;
 328   margin-bottom: 0;
 329 }
 330 div.toclevel2 {
 331   margin-left: 2em;
 332   font-size: 0.9em;
 333 }
 334 div.toclevel3 {
 335   margin-left: 4em;
 336   font-size: 0.9em;
 337 }
 338 div.toclevel4 {
 339   margin-left: 6em;
 340   font-size: 0.9em;
 341 }
 342 /* Overrides for manpage documents */
 343 h1 {
 344   padding-top: 0.5em;
 345   padding-bottom: 0.5em;
 346   border-top: 2px solid silver;
 347   border-bottom: 2px solid silver;
 348 }
 349 h2 {
 350   border-style: none;
 351 }
 352 div.sectionbody {
 353   margin-left: 5%;
 354 }
 355
 356 @media print {
 357   div#toc { display: none; }
 358 }
 359
 360 /* Workarounds for IE6's broken and incomplete CSS2. */
 361
 362 div.sidebar-content {
 363   background: #ffffee;
 364   border: 1px solid silver;
 365   padding: 0.5em;
 366 }
 367 div.sidebar-title, div.image-title {
 368   color: #527bbd;
 369   font-family: sans-serif;
 370   font-weight: bold;
 371   margin-top: 0.0em;
 372   margin-bottom: 0.5em;
 373 }
 374
 375 div.listingblock div.content {
 376   border: 1px solid silver;
 377   background: #f4f4f4;
 378   padding: 0.5em;
 379 }
 380
 381 div.quoteblock-attribution {
 382   padding-top: 0.5em;
 383   text-align: right;
 384 }
 385
 386 div.verseblock-content {
 387   white-space: pre;
 388 }
 389 div.verseblock-attribution {
 390   padding-top: 0.75em;
 391   text-align: left;
 392 }
 393
 394 div.exampleblock-content {
 395   border-left: 2px solid silver;
 396   padding-left: 0.5em;
 397 }
 398
 399 /* IE6 sets dynamically generated links as visited. */
 400 div#toc a:visited { color: blue; }
 401 </style>
 402 </head>
 403 <body>
 404 <div id="header">
 405 <h1>
 406 git-cvsexportcommit(1) Manual Page
 407 </h1>
 408 <h2>NAME</h2>
 409 <div class="sectionbody">
 410 <p>git-cvsexportcommit -
 411    Export a single commit to a CVS checkout
 412 </p>
 413 </div>
 414 </div>
 415 <h2 id="_synopsis">SYNOPSIS</h2>
 416 <div class="sectionbody">
 417 <div class="paragraph"><p><em>git cvsexportcommit</em> [-h] [-u] [-v] [-c] [-P] [-p] [-a] [-d cvsroot]
 418         [-w cvsworkdir] [-W] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID</p></div>
 419 </div>
 420 <h2 id="_description">DESCRIPTION</h2>
 421 <div class="sectionbody">
 422 <div class="paragraph"><p>Exports a commit from GIT to a CVS checkout, making it easier
 423 to merge patches from a git repository into a CVS repository.</p></div>
 424 <div class="paragraph"><p>Specify the name of a CVS checkout using the -w switch or execute it
 425 from the root of the CVS working copy. In the latter case GIT_DIR must
 426 be defined. See examples below.</p></div>
 427 <div class="paragraph"><p>It does its best to do the safe thing, it will check that the files are
 428 unchanged and up to date in the CVS checkout, and it will not autocommit
 429 by default.</p></div>
 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
 432 parent the changeset should be done against.</p></div>
 433 </div>
 434 <h2 id="_options">OPTIONS</h2>
 435 <div class="sectionbody">
 436 <div class="dlist"><dl>
 437 <dt class="hdlist1">
 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>
 446 <dt class="hdlist1">
 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>
 455 <dt class="hdlist1">
 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>
 464 <dt class="hdlist1">
 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>
 474 <dt class="hdlist1">
 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>
 482 <dt class="hdlist1">
 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>
 490 <dt class="hdlist1">
 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>
 499 <dt class="hdlist1">
 500 -u
 501 </dt>
 502 <dd>
 503 <p>
 504         Update affected files from CVS repository before attempting export.
 505 </p>
 506 </dd>
 507 <dt class="hdlist1">
 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>
 516 <dt class="hdlist1">
 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
 523         current directory is within a git repository.  The default is the
 524         value of <em>cvsexportcommit.cvsdir</em>.
 525 </p>
 526 </dd>
 527 <dt class="hdlist1">
 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>
 537 <dt class="hdlist1">
 538 -v
 539 </dt>
 540 <dd>
 541 <p>
 542         Verbose.
 543 </p>
 544 </dd>
 545 </dl></div>
 546 </div>
 547 <h2 id="_configuration">CONFIGURATION</h2>
 548 <div class="sectionbody">
 549 <div class="dlist"><dl>
 550 <dt class="hdlist1">
 551 cvsexportcommit.cvsdir
 552 </dt>
 553 <dd>
 554 <p>
 555         The default location of the CVS checkout to use for the export.
 556 </p>
 557 </dd>
 558 </dl></div>
 559 </div>
 560 <h2 id="_examples">EXAMPLES</h2>
 561 <div class="sectionbody">
 562 <div class="dlist"><dl>
 563 <dt class="hdlist1">
 564 Merge 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
 571 $ git cvsexportcommit -v &lt;commit-sha1&gt;
 572 $ cvs commit -F .msg &lt;files&gt;</tt></pre>
 573 </div></div>
 574 </dd>
 575 <dt class="hdlist1">
 576 Merge 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">
 581 <pre><tt>        $ git cvsexportcommit -v -c -w ~/project_cvs_checkout &lt;commit-sha1&gt;</tt></pre>
 582 </div></div>
 583 </dd>
 584 <dt class="hdlist1">
 585 Merge pending patches into CVS automatically&#8201;&#8212;&#8201;only if you really know what you are doing
 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
 592 $ git cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git cvsexportcommit -c -p -v</tt></pre>
 593 </div></div>
 594 </dd>
 595 </dl></div>
 596 </div>
 597 <h2 id="_author">Author</h2>
 598 <div class="sectionbody">
 599 <div class="paragraph"><p>Written by Martin Langhoff &lt;<a href="mailto:martin@laptop.org">martin@laptop.org</a>&gt; and others.</p></div>
 600 </div>
 601 <h2 id="_documentation">Documentation</h2>
 602 <div class="sectionbody">
 603 <div class="paragraph"><p>Documentation by Martin Langhoff &lt;<a href="mailto:martin@laptop.org">martin@laptop.org</a>&gt; and others.</p></div>
 604 </div>
 605 <h2 id="_git">GIT</h2>
 606 <div class="sectionbody">
 607 <div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
 608 </div>
 609 <div id="footer">
 610 <div id="footer-text">
 611 Last updated 2010-11-06 00:41:57 UTC
 612 </div>
 613 </div>
 614 </body>
 615 </html>