Autogenerated HTML docs for v2.15.0-rc2

1 files changed, 14 insertions, 14 deletions

diff --git a/git-merge.html b/git-merge.html
index b6b967e9f..691a7df96 100644
--- a/git-merge.html
+++ b/git-merge.html
@@ -875,6 +875,19 @@ set to <code>no</code> at the beginning of them.</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. The <code>keyid</code> argument is

+        optional and defaults to the committer identity; if specified,

+        it must be stuck to the option without a space.

+</p>

+</dd>

+<dt class="hdlist1">

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

 </dt>

 <dt class="hdlist1">

@@ -1042,19 +1055,6 @@ 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. The <code>keyid</code> argument is

-        optional and defaults to the committer identity; if specified,

-        it must be stuck to the option without a space.

-</p>

-</dd>

-<dt class="hdlist1">

 -m &lt;msg&gt;

 </dt>

 <dd>

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

 <div id="footer">

 <div id="footer-text">

-Last updated 2017-09-10 17:38:46 JST

+Last updated 2017-10-20 15:42:50 JST

 </div>

 </div>

 </body>