From: Junio C Hamano <junio@hera.kernel.org>
Date: Thu, 28 Dec 2006 11:17:35 +0000 (+0000)
Subject: Autogenerated HTML docs for v1.5.0-rc0-g4a4d
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fd3af275b864434dc6ad944e0100c285bc3bff2f;p=git.git

Autogenerated HTML docs for v1.5.0-rc0-g4a4d
---

diff --git a/git-merge.html b/git-merge.html
index c0bab8440..55511d493 100644
--- a/git-merge.html
+++ b/git-merge.html
@@ -274,7 +274,6 @@ git-merge(1) Manual Page
 <div class="sectionbody">
 <div class="verseblock">
 <div class="content"><em>git-merge</em> [-n] [--no-commit] [--squash] [-s &lt;strategy&gt;]&#8230;
-        [--reflog-action=&lt;action&gt;]
         -m=&lt;msg&gt; &lt;remote&gt; &lt;remote&gt;&#8230;</div></div>
 </div>
 <h2>DESCRIPTION</h2>
@@ -358,16 +357,6 @@ which drives multiple merge strategy scripts.</p>
         obviously means you are trying an Octopus.
 </p>
 </dd>
-<dt>
---reflog-action=&lt;action&gt;
-</dt>
-<dd>
-<p>
-        This is used internally when <tt>git-pull</tt> calls this command
-        to record that the merge was created by <tt>pull</tt> command
-        in the <tt>ref-log</tt> entry that results from the merge.
-</p>
-</dd>
 </dl>
 </div>
 <h2>MERGE STRATEGIES</h2>
@@ -581,7 +570,7 @@ Resolve the conflicts.  <tt>git-diff</tt> would report only the
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 27-Nov-2006 20:03:14 UTC
+Last updated 28-Dec-2006 11:17:25 UTC
 </div>
 </div>
 </body>
diff --git a/git-merge.txt b/git-merge.txt
index e2954aa76..0f79665ea 100644
--- a/git-merge.txt
+++ b/git-merge.txt
@@ -10,7 +10,6 @@ SYNOPSIS
 --------
 [verse]
 'git-merge' [-n] [--no-commit] [--squash] [-s <strategy>]...
-	[--reflog-action=<action>]
 	-m=<msg> <remote> <remote>...
 
 DESCRIPTION
@@ -37,11 +36,6 @@ include::merge-options.txt[]
 	least one <remote>.  Specifying more than one <remote>
 	obviously means you are trying an Octopus.
 
---reflog-action=<action>::
-	This is used internally when `git-pull` calls this command
-	to record that the merge was created by `pull` command
-	in the `ref-log` entry that results from the merge.
-
 include::merge-strategies.txt[]