From: Junio C Hamano <junio@hera.kernel.org>
Date: Sun, 14 May 2006 09:22:52 +0000 (+0000)
Subject: Autogenerated HTML docs for v1.3.2-g5f7f2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0fd4dbd5f31a6526f88cc4613296a5603a193929;p=git.git

Autogenerated HTML docs for v1.3.2-g5f7f2
---

diff --git a/git-cvsexportcommit.html b/git-cvsexportcommit.html
index a860342be..70e37cde2 100644
--- a/git-cvsexportcommit.html
+++ b/git-cvsexportcommit.html
@@ -3,7 +3,7 @@
 <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.1" />
+<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 {
@@ -272,7 +272,7 @@ git-cvsexportcommit(1) Manual Page
 </div>
 <h2>SYNOPSIS</h2>
 <div class="sectionbody">
-<p><em>git-cvsexportcommmit</em> [-h] [-v] [-c] [-p] [PARENTCOMMIT] COMMITID</p>
+<p><em>git-cvsexportcommmit</em> [-h] [-v] [-c] [-p] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID</p>
 </div>
 <h2>DESCRIPTION</h2>
 <div class="sectionbody">
@@ -309,6 +309,23 @@ should the changeset be done against.</p>
 </p>
 </dd>
 <dt>
+-f
+</dt>
+<dd>
+<p>
+        Force the merge even if the files are not up to date.
+</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>
 -v
 </dt>
 <dd>
@@ -360,7 +377,7 @@ $ git-cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git-cvsexportcommit
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 29-Jan-2006 23:39:07 PDT
+Last updated 14-May-2006 09:22:47 UTC
 </div>
 </div>
 </body>
diff --git a/git-cvsexportcommit.txt b/git-cvsexportcommit.txt
index d30435a9e..56bd3e517 100644
--- a/git-cvsexportcommit.txt
+++ b/git-cvsexportcommit.txt
@@ -8,7 +8,7 @@ git-cvsexportcommit - Export a commit to a CVS checkout
 
 SYNOPSIS
 --------
-'git-cvsexportcommmit' [-h] [-v] [-c] [-p] [PARENTCOMMIT] COMMITID
+'git-cvsexportcommmit' [-h] [-v] [-c] [-p] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID
 
 
 DESCRIPTION
@@ -39,6 +39,13 @@ OPTIONS
 	Be pedantic (paranoid) when applying patches. Invokes patch with 
 	--fuzz=0
 
+-f::
+	Force the merge even if the files are not up to date.
+
+-m::
+	Prepend the commit message with the provided prefix. 
+	Useful for patch series and the like.
+
 -v::
 	Verbose.
 
