git-cvsexportcommit.html - external/gitster/git-htmldocs - Git at Google

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
  "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <meta name="generator" content="AsciiDoc 7.0.2" />
 <style type="text/css">
 /* Debug borders */
 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
 /*
  border: 1px solid red;
 */
 }

 body {
  margin: 1em 5% 1em 5%;
 }

 a { color: blue; }
 a:visited { color: fuchsia; }

 em {
  font-style: italic;
 }

 strong {
  font-weight: bold;
 }

 tt {
  color: navy;
 }

 h1, h2, h3, h4, h5, h6 {
  color: #527bbd;
  font-family: sans-serif;
  margin-top: 1.2em;
  margin-bottom: 0.5em;
  line-height: 1.3;
 }

 h1 {
  border-bottom: 2px solid silver;
 }
 h2 {
  border-bottom: 2px solid silver;
  padding-top: 0.5em;
 }

 div.sectionbody {
  font-family: serif;
  margin-left: 0;
 }

 hr {
  border: 1px solid silver;
 }

 p {
  margin-top: 0.5em;
  margin-bottom: 0.5em;
 }

 pre {
  padding: 0;
  margin: 0;
 }

 span#author {
  color: #527bbd;
  font-family: sans-serif;
  font-weight: bold;
  font-size: 1.2em;
 }
 span#email {
 }
 span#revision {
  font-family: sans-serif;
 }

 div#footer {
  font-family: sans-serif;
  font-size: small;
  border-top: 2px solid silver;
  padding-top: 0.5em;
  margin-top: 4.0em;
 }
 div#footer-text {
  float: left;
  padding-bottom: 0.5em;
 }
 div#footer-badges {
  float: right;
  padding-bottom: 0.5em;
 }

 div#preamble,
 div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
 div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
 div.admonitionblock {
  margin-right: 10%;
  margin-top: 1.5em;
  margin-bottom: 1.5em;
 }
 div.admonitionblock {
  margin-top: 2.5em;
  margin-bottom: 2.5em;
 }

 div.content { /* Block element content. */
  padding: 0;
 }

 /* Block element titles. */
 div.title, caption.title {
  font-family: sans-serif;
  font-weight: bold;
  text-align: left;
  margin-top: 1.0em;
  margin-bottom: 0.5em;
 }
 div.title + * {
  margin-top: 0;
 }

 td div.title:first-child {
  margin-top: 0.0em;
 }
 div.content div.title:first-child {
  margin-top: 0.0em;
 }
 div.content + div.title {
  margin-top: 0.0em;
 }

 div.sidebarblock > div.content {
  background: #ffffee;
  border: 1px solid silver;
  padding: 0.5em;
 }

 div.listingblock > div.content {
  border: 1px solid silver;
  background: #f4f4f4;
  padding: 0.5em;
 }

 div.quoteblock > div.content {
  padding-left: 2.0em;
 }
 div.quoteblock .attribution {
  text-align: right;
 }

 div.admonitionblock .icon {
  vertical-align: top;
  font-size: 1.1em;
  font-weight: bold;
  text-decoration: underline;
  color: #527bbd;
  padding-right: 0.5em;
 }
 div.admonitionblock td.content {
  padding-left: 0.5em;
  border-left: 2px solid silver;
 }

 div.exampleblock > div.content {
  border-left: 2px solid silver;
  padding: 0.5em;
 }

 div.verseblock div.content {
  white-space: pre;
 }

 div.imageblock div.content { padding-left: 0; }
 div.imageblock img { border: 1px solid silver; }
 span.image img { border-style: none; }

 dl {
  margin-top: 0.8em;
  margin-bottom: 0.8em;
 }
 dt {
  margin-top: 0.5em;
  margin-bottom: 0;
  font-style: italic;
 }
 dd > *:first-child {
  margin-top: 0;
 }

 ul, ol {
  list-style-position: outside;
 }
 ol.olist2 {
  list-style-type: lower-alpha;
 }

 div.tableblock > table {
  border-color: #527bbd;
  border-width: 3px;
 }
 thead {
  font-family: sans-serif;
  font-weight: bold;
 }
 tfoot {
  font-weight: bold;
 }

 div.hlist {
  margin-top: 0.8em;
  margin-bottom: 0.8em;
 }
 td.hlist1 {
  vertical-align: top;
  font-style: italic;
  padding-right: 0.8em;
 }
 td.hlist2 {
  vertical-align: top;
 }

 @media print {
  div#footer-badges { display: none; }
 }
 include::./stylesheets/xhtml11-manpage.css[]
 /* Workarounds for IE6's broken and incomplete CSS2. */

 div.sidebar-content {
  background: #ffffee;
  border: 1px solid silver;
  padding: 0.5em;
 }
 div.sidebar-title, div.image-title {
  font-family: sans-serif;
  font-weight: bold;
  margin-top: 0.0em;
  margin-bottom: 0.5em;
 }

 div.listingblock div.content {
  border: 1px solid silver;
  background: #f4f4f4;
  padding: 0.5em;
 }

 div.quoteblock-content {
  padding-left: 2.0em;
 }

 div.exampleblock-content {
  border-left: 2px solid silver;
  padding-left: 0.5em;
 }
 </style>
 <title>git-cvsexportcommit(1)</title>
 </head>
 <body>
 <div id="header">
 <h1>
 git-cvsexportcommit(1) Manual Page
 </h1>
 <h2>NAME</h2>
 <div class="sectionbody">
 <p>git-cvsexportcommit -
  Export a single commit to a CVS checkout
 </p>
 </div>
 </div>
 <h2>SYNOPSIS</h2>
 <div class="sectionbody">
 <p><em>git-cvsexportcommit</em> [-h] [-u] [-v] [-c] [-P] [-p] [-a] [-d cvsroot] [-w cvsworkdir] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID</p>
 </div>
 <h2>DESCRIPTION</h2>
 <div class="sectionbody">
 <p>Exports a commit from GIT to a CVS checkout, making it easier
 to merge patches from a git repository into a CVS repository.</p>
 <p>Specify the name of a CVS checkout using the -w switch or execute it
 from the root of the CVS working copy. In the latter case GIT_DIR must
 be defined. See examples below.</p>
 <p>It does its best to do the safe thing, it will check that the files are
 unchanged and up to date in the CVS checkout, and it will not autocommit
 by default.</p>
 <p>Supports file additions, removals, and commits that affect binary files.</p>
 <p>If the commit is a merge commit, you must tell git-cvsexportcommit what parent
 should the changeset be done against.</p>
 </div>
 <h2>OPTIONS</h2>
 <div class="sectionbody">
 <dl>
 <dt>
 -c
 </dt>
 <dd>
 <p>
  Commit automatically if the patch applied cleanly. It will not
  commit if any hunks fail to apply or there were other problems.
 </p>
 </dd>
 <dt>
 -p
 </dt>
 <dd>
 <p>
  Be pedantic (paranoid) when applying patches. Invokes patch with
  --fuzz=0
 </p>
 </dd>
 <dt>
 -a
 </dt>
 <dd>
 <p>
  Add authorship information. Adds Author line, and Committer (if
  different from Author) to the message.
 </p>
 </dd>
 <dt>
 -d
 </dt>
 <dd>
 <p>
  Set an alternative CVSROOT to use. This corresponds to the CVS
  -d parameter. Usually users will not want to set this, except
  if using CVS in an asymmetric fashion.
 </p>
 </dd>
 <dt>
 -f
 </dt>
 <dd>
 <p>
  Force the merge even if the files are not up to date.
 </p>
 </dd>
 <dt>
 -P
 </dt>
 <dd>
 <p>
  Force the parent commit, even if it is not a direct parent.
 </p>
 </dd>
 <dt>
 -m
 </dt>
 <dd>
 <p>
  Prepend the commit message with the provided prefix.
  Useful for patch series and the like.
 </p>
 </dd>
 <dt>
 -u
 </dt>
 <dd>
 <p>
  Update affected files from CVS repository before attempting export.
 </p>
 </dd>
 <dt>
 -w
 </dt>
 <dd>
 <p>
  Specify the location of the CVS checkout to use for the export. This
  option does not require GIT_DIR to be set before execution if the
  current directory is within a git repository.
 </p>
 </dd>
 <dt>
 -v
 </dt>
 <dd>
 <p>
  Verbose.
 </p>
 </dd>
 </dl>
 </div>
 <h2>EXAMPLES</h2>
 <div class="sectionbody">
 <dl>
 <dt>
 Merge one patch into CVS
 </dt>
 <dd>
 <div class="listingblock">
 <div class="content">
 <pre><tt>$ export GIT_DIR=~/project/.git
 $ cd ~/project_cvs_checkout
 $ git-cvsexportcommit -v &lt;commit-sha1&gt;
 $ cvs commit -F .msg &lt;files&gt;</tt></pre>
 </div></div>
 </dd>
 <dt>
 Merge one patch into CVS (-c and -w options). The working directory is within the Git Repo
 </dt>
 <dd>
 <div class="listingblock">
 <div class="content">
 <pre><tt> $ git-cvsexportcommit -v -c -w ~/project_cvs_checkout &lt;commit-sha1&gt;</tt></pre>
 </div></div>
 </dd>
 <dt>
 Merge pending patches into CVS automatically &#8212; only if you really know what you are doing
 </dt>
 <dd>
 <div class="listingblock">
 <div class="content">
 <pre><tt>$ export GIT_DIR=~/project/.git
 $ cd ~/project_cvs_checkout
 $ git-cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git-cvsexportcommit -c -p -v</tt></pre>
 </div></div>
 </dd>
 </dl>
 </div>
 <h2>Author</h2>
 <div class="sectionbody">
 <p>Written by Martin Langhoff &lt;martin@catalyst.net.nz&gt; and others.</p>
 </div>
 <h2>Documentation</h2>
 <div class="sectionbody">
 <p>Documentation by Martin Langhoff &lt;martin@catalyst.net.nz&gt; and others.</p>
 </div>
 <h2>GIT</h2>
 <div class="sectionbody">
 <p>Part of the <a href="git.html">git(7)</a> suite</p>
 </div>
 <div id="footer">
 <div id="footer-text">
 Last updated 07-Jan-2008 07:50:09 UTC
 </div>
 </div>
 </body>
 </html>
	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
	"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
	<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
	<head>
	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
	<meta name="generator" content="AsciiDoc 7.0.2" />
	<style type="text/css">
	/* Debug borders */
	p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
	/*
	border: 1px solid red;
	*/
	}

	body {
	margin: 1em 5% 1em 5%;
	}

	a { color: blue; }
	a:visited { color: fuchsia; }

	em {
	font-style: italic;
	}

	strong {
	font-weight: bold;
	}

	tt {
	color: navy;
	}

	h1, h2, h3, h4, h5, h6 {
	color: #527bbd;
	font-family: sans-serif;
	margin-top: 1.2em;
	margin-bottom: 0.5em;
	line-height: 1.3;
	}

	h1 {
	border-bottom: 2px solid silver;
	}
	h2 {
	border-bottom: 2px solid silver;
	padding-top: 0.5em;
	}

	div.sectionbody {
	font-family: serif;
	margin-left: 0;
	}

	hr {
	border: 1px solid silver;
	}

	p {
	margin-top: 0.5em;
	margin-bottom: 0.5em;
	}

	pre {
	padding: 0;
	margin: 0;
	}

	span#author {
	color: #527bbd;
	font-family: sans-serif;
	font-weight: bold;
	font-size: 1.2em;
	}
	span#email {
	}
	span#revision {
	font-family: sans-serif;
	}

	div#footer {
	font-family: sans-serif;
	font-size: small;
	border-top: 2px solid silver;
	padding-top: 0.5em;
	margin-top: 4.0em;
	}
	div#footer-text {
	float: left;
	padding-bottom: 0.5em;
	}
	div#footer-badges {
	float: right;
	padding-bottom: 0.5em;
	}

	div#preamble,
	div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
	div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
	div.admonitionblock {
	margin-right: 10%;
	margin-top: 1.5em;
	margin-bottom: 1.5em;
	}
	div.admonitionblock {
	margin-top: 2.5em;
	margin-bottom: 2.5em;
	}

	div.content { /* Block element content. */
	padding: 0;
	}

	/* Block element titles. */
	div.title, caption.title {
	font-family: sans-serif;
	font-weight: bold;
	text-align: left;
	margin-top: 1.0em;
	margin-bottom: 0.5em;
	}
	div.title + * {
	margin-top: 0;
	}

	td div.title:first-child {
	margin-top: 0.0em;
	}
	div.content div.title:first-child {
	margin-top: 0.0em;
	}
	div.content + div.title {
	margin-top: 0.0em;
	}

	div.sidebarblock > div.content {
	background: #ffffee;
	border: 1px solid silver;
	padding: 0.5em;
	}

	div.listingblock > div.content {
	border: 1px solid silver;
	background: #f4f4f4;
	padding: 0.5em;
	}

	div.quoteblock > div.content {
	padding-left: 2.0em;
	}
	div.quoteblock .attribution {
	text-align: right;
	}

	div.admonitionblock .icon {
	vertical-align: top;
	font-size: 1.1em;
	font-weight: bold;
	text-decoration: underline;
	color: #527bbd;
	padding-right: 0.5em;
	}
	div.admonitionblock td.content {
	padding-left: 0.5em;
	border-left: 2px solid silver;
	}

	div.exampleblock > div.content {
	border-left: 2px solid silver;
	padding: 0.5em;
	}

	div.verseblock div.content {
	white-space: pre;
	}

	div.imageblock div.content { padding-left: 0; }
	div.imageblock img { border: 1px solid silver; }
	span.image img { border-style: none; }

	dl {
	margin-top: 0.8em;
	margin-bottom: 0.8em;
	}
	dt {
	margin-top: 0.5em;
	margin-bottom: 0;
	font-style: italic;
	}
	dd > *:first-child {
	margin-top: 0;
	}

	ul, ol {
	list-style-position: outside;
	}
	ol.olist2 {
	list-style-type: lower-alpha;
	}

	div.tableblock > table {
	border-color: #527bbd;
	border-width: 3px;
	}
	thead {
	font-family: sans-serif;
	font-weight: bold;
	}
	tfoot {
	font-weight: bold;
	}

	div.hlist {
	margin-top: 0.8em;
	margin-bottom: 0.8em;
	}
	td.hlist1 {
	vertical-align: top;
	font-style: italic;
	padding-right: 0.8em;
	}
	td.hlist2 {
	vertical-align: top;
	}

	@media print {
	div#footer-badges { display: none; }
	}
	include::./stylesheets/xhtml11-manpage.css[]
	/* Workarounds for IE6's broken and incomplete CSS2. */

	div.sidebar-content {
	background: #ffffee;
	border: 1px solid silver;
	padding: 0.5em;
	}
	div.sidebar-title, div.image-title {
	font-family: sans-serif;
	font-weight: bold;
	margin-top: 0.0em;
	margin-bottom: 0.5em;
	}

	div.listingblock div.content {
	border: 1px solid silver;
	background: #f4f4f4;
	padding: 0.5em;
	}

	div.quoteblock-content {
	padding-left: 2.0em;
	}

	div.exampleblock-content {
	border-left: 2px solid silver;
	padding-left: 0.5em;
	}
	</style>
	<title>git-cvsexportcommit(1)</title>
	</head>
	<body>
	<div id="header">
	<h1>
	git-cvsexportcommit(1) Manual Page
	</h1>
	<h2>NAME</h2>
	<div class="sectionbody">
	<p>git-cvsexportcommit -
	Export a single commit to a CVS checkout
	</p>
	</div>
	</div>
	<h2>SYNOPSIS</h2>
	<div class="sectionbody">
	<p><em>git-cvsexportcommit</em> [-h] [-u] [-v] [-c] [-P] [-p] [-a] [-d cvsroot] [-w cvsworkdir] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID</p>
	</div>
	<h2>DESCRIPTION</h2>
	<div class="sectionbody">
	<p>Exports a commit from GIT to a CVS checkout, making it easier
	to merge patches from a git repository into a CVS repository.</p>
	<p>Specify the name of a CVS checkout using the -w switch or execute it
	from the root of the CVS working copy. In the latter case GIT_DIR must
	be defined. See examples below.</p>
	<p>It does its best to do the safe thing, it will check that the files are
	unchanged and up to date in the CVS checkout, and it will not autocommit
	by default.</p>
	<p>Supports file additions, removals, and commits that affect binary files.</p>
	<p>If the commit is a merge commit, you must tell git-cvsexportcommit what parent
	should the changeset be done against.</p>
	</div>
	<h2>OPTIONS</h2>
	<div class="sectionbody">
	<dl>
	<dt>
	-c
	</dt>
	<dd>
	<p>
	Commit automatically if the patch applied cleanly. It will not
	commit if any hunks fail to apply or there were other problems.
	</p>
	</dd>
	<dt>
	-p
	</dt>
	<dd>
	<p>
	Be pedantic (paranoid) when applying patches. Invokes patch with
	--fuzz=0
	</p>
	</dd>
	<dt>
	-a
	</dt>
	<dd>
	<p>
	Add authorship information. Adds Author line, and Committer (if
	different from Author) to the message.
	</p>
	</dd>
	<dt>
	-d
	</dt>
	<dd>
	<p>
	Set an alternative CVSROOT to use. This corresponds to the CVS
	-d parameter. Usually users will not want to set this, except
	if using CVS in an asymmetric fashion.
	</p>
	</dd>
	<dt>
	-f
	</dt>
	<dd>
	<p>
	Force the merge even if the files are not up to date.
	</p>
	</dd>
	<dt>
	-P
	</dt>
	<dd>
	<p>
	Force the parent commit, even if it is not a direct parent.
	</p>
	</dd>
	<dt>
	-m
	</dt>
	<dd>
	<p>
	Prepend the commit message with the provided prefix.
	Useful for patch series and the like.
	</p>
	</dd>
	<dt>
	-u
	</dt>
	<dd>
	<p>
	Update affected files from CVS repository before attempting export.
	</p>
	</dd>
	<dt>
	-w
	</dt>
	<dd>
	<p>
	Specify the location of the CVS checkout to use for the export. This
	option does not require GIT_DIR to be set before execution if the
	current directory is within a git repository.
	</p>
	</dd>
	<dt>
	-v
	</dt>
	<dd>
	<p>
	Verbose.
	</p>
	</dd>
	</dl>
	</div>
	<h2>EXAMPLES</h2>
	<div class="sectionbody">
	<dl>
	<dt>
	Merge one patch into CVS
	</dt>
	<dd>
	<div class="listingblock">
	<div class="content">
	<pre><tt>$ export GIT_DIR=~/project/.git
	$ cd ~/project_cvs_checkout
	$ git-cvsexportcommit -v <commit-sha1>
	$ cvs commit -F .msg <files></tt></pre>
	</div></div>
	</dd>
	<dt>
	Merge one patch into CVS (-c and -w options). The working directory is within the Git Repo
	</dt>
	<dd>
	<div class="listingblock">
	<div class="content">
	<pre><tt> $ git-cvsexportcommit -v -c -w ~/project_cvs_checkout <commit-sha1></tt></pre>
	</div></div>
	</dd>
	<dt>
	Merge pending patches into CVS automatically — only if you really know what you are doing
	</dt>
	<dd>
	<div class="listingblock">
	<div class="content">
	<pre><tt>$ export GIT_DIR=~/project/.git
	$ cd ~/project_cvs_checkout
	$ git-cherry cvshead myhead \| sed -n 's/^+ //p' \| xargs -l1 git-cvsexportcommit -c -p -v</tt></pre>
	</div></div>
	</dd>
	</dl>
	</div>
	<h2>Author</h2>
	<div class="sectionbody">
	<p>Written by Martin Langhoff <martin@catalyst.net.nz> and others.</p>
	</div>
	<h2>Documentation</h2>
	<div class="sectionbody">
	<p>Documentation by Martin Langhoff <martin@catalyst.net.nz> and others.</p>
	</div>
	<h2>GIT</h2>
	<div class="sectionbody">
	<p>Part of the <a href="git.html">git(7)</a> suite</p>
	</div>
	<div id="footer">
	<div id="footer-text">
	Last updated 07-Jan-2008 07:50:09 UTC
	</div>
	</div>
	</body>
	</html>