Autogenerated HTML docs for v1.5.0-rc0-g4a4d

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

diff --git a/git-merge.txt b/git-merge.txt
index e2954aa76eef46101f38683eb346bd31bf711a40..0f79665ea6e6bf1ffd4ff67f7aee2fcbddec0555 100644 (file)
--- 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[]