Autogenerated HTML docs for v1.5.2-136-g322bc

1 files changed, 11 insertions, 2 deletions

diff --git a/git-merge.html b/git-merge.html
index f41972ebb..f056cefc6 100644
--- a/git-merge.html
+++ b/git-merge.html
@@ -273,7 +273,7 @@ git-merge(1) Manual Page
 <h2>SYNOPSIS</h2>

 <div class="sectionbody">

 <div class="verseblock">

-<div class="content"><em>git-merge</em> [-n] [--no-commit] [--squash] [-s &lt;strategy&gt;]&#8230;

+<div class="content"><em>git-merge</em> [-n] [--summary] [--no-commit] [--squash] [-s &lt;strategy&gt;]&#8230;

         [-m &lt;msg&gt;] &lt;remote&gt; &lt;remote&gt;&#8230;</div></div>

 </div>

 <h2>DESCRIPTION</h2>

@@ -285,6 +285,15 @@ which drives multiple merge strategy scripts.</p>
 <div class="sectionbody">

 <dl>

 <dt>

+--summary

+</dt>

+<dd>

+<p>

+        Show a diffstat at the end of the merge. The diffstat is also

+        controlled by the configuration option merge.diffstat.

+</p>

+</dd>

+<dt>

 -n, --no-summary

 </dt>

 <dd>

@@ -570,7 +579,7 @@ Resolve the conflicts.  <tt>git-diff</tt> would report only the
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 04-Apr-2007 18:33:52 UTC

+Last updated 29-May-2007 09:17:39 UTC

 </div>

 </div>

 </body>