Autogenerated HTML docs for v1.7.3.1-45-g9855

1 files changed, 8 insertions, 6 deletions

diff --git a/git-merge.html b/git-merge.html
index a4240cc1f..d27799c52 100644
--- a/git-merge.html
+++ b/git-merge.html
@@ -393,7 +393,7 @@ inspect and further tweak the merge result before committing.</p></div>
 resolved as a fast-forward.</p></div>

 </dd>

 <dt>

---log

+--log[=&lt;n&gt;]

 </dt>

 <dt>

 --no-log

@@ -401,8 +401,8 @@ resolved as a fast-forward.</p></div>
 <dd>

 <p>

         In addition to branch names, populate the log message with

-        one-line descriptions from the actual commits that are being

-        merged.

+        one-line descriptions from at most &lt;n&gt; actual commits that are being

+        merged. See also <a href="git-fmt-merge-msg.html">git-fmt-merge-msg(1)</a>.

 </p>

 <div class="para"><p>With --no-log do not list one-line descriptions from the

 actual commits being merged.</p></div>

@@ -939,8 +939,10 @@ merge.log
 </dt>

 <dd>

 <p>

-        Whether to include summaries of merged commits in newly created

-        merge commit messages. False by default.

+        In addition to branch names, populate the log message with at

+        most the specified number of one-line descriptions from the

+        actual commits that are being merged.  Defaults to false, and

+        true is a synoym for 20.

 </p>

 </dd>

 <dt>

@@ -1066,7 +1068,7 @@ branch.&lt;name&gt;.mergeoptions
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2010-09-18 23:56:49 UTC

+Last updated 2010-09-30 00:02:58 UTC

 </div>

 </div>

 </body>