Autogenerated HTML docs for v1.1.6-g1506

diff --git a/git-cvsexportcommit.html b/git-cvsexportcommit.html
index ecaa05b..a860342 100644 (file)
--- a/git-cvsexportcommit.html
+++ b/git-cvsexportcommit.html
@@ -278,7 +278,8 @@ git-cvsexportcommit(1) Manual Page
 <div class="sectionbody">\r
 <p>Exports a commit from GIT to a CVS checkout, making it easier\r
 to merge patches from a git repository into a CVS repository.</p>\r
-<p>Execute it from the root of the CVS working copy. GIT_DIR must be defined.</p>\r
+<p>Execute it from the root of the CVS working copy. GIT_DIR must be defined.\r
+See examples below.</p>\r
 <p>It does its best to do the safe thing, it will check that the files are\r
 unchanged and up to date in the CVS checkout, and it will not autocommit\r
 by default.</p>\r
@@ -317,6 +318,34 @@ should the changeset be done against.</p>
 </dd>\r
 </dl>\r
 </div>\r
+<h2>EXAMPLES</h2>\r
+<div class="sectionbody">\r
+<dl>\r
+<dt>\r
+Merge one patch into CVS\r
+</dt>\r
+<dd>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>$ export GIT_DIR=~/project/.git\r
+$ cd ~/project_cvs_checkout\r
+$ git-cvsexportcommit -v &lt;commit-sha1&gt;\r
+$ cvs commit -F .mgs &lt;files&gt;</tt></pre>\r
+</div></div>\r
+</dd>\r
+<dt>\r
+Merge pending patches into CVS automatically &#8212; only if you really know what you are doing \r
+</dt>\r
+<dd>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>$ export GIT_DIR=~/project/.git\r
+$ cd ~/project_cvs_checkout\r
+$ git-cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git-cvsexportcommit -c -p -v</tt></pre>\r
+</div></div>\r
+</dd>\r
+</dl>\r
+</div>\r
 <h2>Author</h2>\r
 <div class="sectionbody">\r
 <p>Written by Martin Langhoff &lt;martin@catalyst.net.nz&gt;</p>\r
@@ -331,7 +360,7 @@ should the changeset be done against.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 06-Jan-2006 17:12:15 PDT\r
+Last updated 29-Jan-2006 23:39:07 PDT\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-cvsexportcommit.txt b/git-cvsexportcommit.txt
index 13cbf3b..d30435a 100644 (file)
--- a/git-cvsexportcommit.txt
+++ b/git-cvsexportcommit.txt
@@ -17,6 +17,7 @@ Exports a commit from GIT to a CVS checkout, making it easier
 to merge patches from a git repository into a CVS repository. 
 
 Execute it from the root of the CVS working copy. GIT_DIR must be defined. 
+See examples below.
 
 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 
@@ -41,6 +42,26 @@ OPTIONS
 -v::
        Verbose.
 
+EXAMPLES
+--------
+
+Merge one patch into CVS::
++
+------------
+$ export GIT_DIR=~/project/.git
+$ cd ~/project_cvs_checkout
+$ git-cvsexportcommit -v <commit-sha1>
+$ cvs commit -F .mgs <files> 
+------------
+
+Merge pending patches into CVS automatically -- only if you really know what you are doing ::
++
+------------
+$ export GIT_DIR=~/project/.git
+$ cd ~/project_cvs_checkout
+$ git-cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git-cvsexportcommit -c -p -v
+------------
+
 Author
 ------
 Written by Martin Langhoff <martin@catalyst.net.nz>