Autogenerated HTML docs for v1.8.4.1-559-gdb9bdf

1 files changed, 13 insertions, 2 deletions

diff --git a/git-merge.html b/git-merge.html
index 9f5509b7f..819a58537 100644
--- a/git-merge.html
+++ b/git-merge.html
@@ -747,7 +747,7 @@ git-merge(1) Manual Page
 <div class="sectionbody">

 <div class="verseblock">

 <pre class="content"><em>git merge</em> [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]

-        [-s &lt;strategy&gt;] [-X &lt;strategy-option&gt;]

+        [-s &lt;strategy&gt;] [-X &lt;strategy-option&gt;] [-S[&lt;keyid&gt;]]

         [--[no-]rerere-autoupdate] [-m &lt;msg&gt;] [&lt;commit&gt;&#8230;]

 <em>git merge</em> &lt;msg&gt; HEAD &lt;commit&gt;&#8230;

 <em>git merge</em> --abort</pre>

@@ -1011,6 +1011,17 @@ option can be used to override --squash.</p></div>
 </p>

 </dd>

 <dt class="hdlist1">

+-S[&lt;keyid&gt;]

+</dt>

+<dt class="hdlist1">

+--gpg-sign[=&lt;keyid&gt;]

+</dt>

+<dd>

+<p>

+        GPG-sign the resulting merge commit.

+</p>

+</dd>

+<dt class="hdlist1">

 -m &lt;msg&gt;

 </dt>

 <dd>

@@ -1805,7 +1816,7 @@ branch.&lt;name&gt;.mergeoptions
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2013-09-05 16:41:39 PDT

+Last updated 2013-10-18 15:11:10 PDT

 </div>

 </div>

 </body>