From 859f3b44938b9425bddcb609791606d2302f367a Mon Sep 17 00:00:00 2001
From: Junio C Hamano <junio@hera.kernel.org>
Date: Fri, 4 Aug 2006 10:04:30 +0000
Subject: [PATCH] Autogenerated HTML docs for v1.4.2-rc3-g7e18e

---
 git-rev-list.html | 12 +++++++++++-
 git-rev-list.txt  |  5 +++++
 2 files changed, 16 insertions(+), 1 deletion(-)

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