Autogenerated HTML docs for v1.7.2.3-313-gcd15

1 files changed, 15 insertions, 3 deletions

diff --git a/git-fmt-merge-msg.html b/git-fmt-merge-msg.html
index 158c66149..db2930887 100644
--- a/git-fmt-merge-msg.html
+++ b/git-fmt-merge-msg.html
@@ -321,8 +321,8 @@ git-fmt-merge-msg(1) Manual Page
 <h2>SYNOPSIS</h2>

 <div class="sectionbody">

 <div class="verseblock">

-<div class="content"><em>git fmt-merge-msg</em> [--log | --no-log] &lt;$GIT_DIR/FETCH_HEAD

-<em>git fmt-merge-msg</em> [--log | --no-log] -F &lt;file&gt;</div></div>

+<div class="content"><em>git fmt-merge-msg</em> [-m &lt;message&gt;] [--log | --no-log] &lt;$GIT_DIR/FETCH_HEAD

+<em>git fmt-merge-msg</em> [-m &lt;message&gt;] [--log | --no-log] -F &lt;file&gt;</div></div>

 </div>

 <h2 id="_description">DESCRIPTION</h2>

 <div class="sectionbody">

@@ -367,6 +367,18 @@ automatically invoking <em>git merge</em>.</p></div>
 </p>

 </dd>

 <dt>

+-m &lt;message&gt;

+</dt>

+<dt>

+--message &lt;message&gt;

+</dt>

+<dd>

+<p>

+        Use &lt;message&gt; instead of the branch names for the first line

+        of the log message.  For use with <tt>--log</tt>.

+</p>

+</dd>

+<dt>

 -F &lt;file&gt;

 </dt>

 <dt>

@@ -421,7 +433,7 @@ merge.summary
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2010-07-21 21:55:23 UTC

+Last updated 2010-09-03 21:30:17 UTC

 </div>

 </div>

 </body>