Autogenerated HTML docs for v1.4.2-rc3-g7e18e

diff --git a/git-rev-list.html b/git-rev-list.html
index 529e932898221b96bde4223647e72b2cd2b076a4..b741337eb7d8276b51557ff955dffae475fb5f1e 100644 (file)
--- a/git-rev-list.html
+++ b/git-rev-list.html
@@ -286,6 +286,7 @@ git-rev-list(1) Manual Page
              [ [--objects | --objects-edge] [ --unpacked ] ]\r
              [ --pretty | --header ]\r
              [ --bisect ]\r
+             [ --merge ]\r
              &lt;commit&gt;&#8230; [ -- &lt;paths&gt;&#8230; ]</div></div>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
@@ -460,6 +461,15 @@ $ git-rev-list A...B</tt></pre>
         before their parents).\r
 </p>\r
 </dd>\r
+<dt>\r
+--merge\r
+</dt>\r
+<dd>\r
+<p>\r
+        After a failed merge, show refs that touch files having a\r
+        conflict and don't exist on all heads to merge.\r
+</p>\r
+</dd>\r
 </dl>\r
 </div>\r
 <h2>Author</h2>\r
@@ -476,7 +486,7 @@ $ git-rev-list A...B</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:09 UTC\r
+Last updated 04-Aug-2006 10:04:25 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rev-list.txt b/git-rev-list.txt
index f60eacd93e96a080689569b1afd6736c05554ab7..dd9fff16d3067fe939642170258fffc427c77729 100644 (file)
--- a/git-rev-list.txt
+++ b/git-rev-list.txt
@@ -22,6 +22,7 @@ SYNOPSIS
             [ [\--objects | \--objects-edge] [ \--unpacked ] ]
             [ \--pretty | \--header ]
             [ \--bisect ]
+            [ \--merge ]
             <commit>... [ \-- <paths>... ]
 
 DESCRIPTION
@@ -123,6 +124,10 @@ OPTIONS
        topological order (i.e. descendant commits are shown
        before their parents).
 
+--merge::
+       After a failed merge, show refs that touch files having a
+       conflict and don't exist on all heads to merge.
+
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org>