Autogenerated HTML docs for v2.14.1-326-g3dc57

1 files changed, 14 insertions, 1 deletions

diff --git a/git-merge.html b/git-merge.html
index 9bbbb6127..24af24708 100644
--- a/git-merge.html
+++ b/git-merge.html
@@ -1029,6 +1029,19 @@ option can be used to override --squash.</p></div>
 </p>

 </dd>

 <dt class="hdlist1">

+--signoff

+</dt>

+<dd>

+<p>

+        Add Signed-off-by line by the committer at the end of the commit

+        log message.  The meaning of a signoff depends on the project,

+        but it typically certifies that committer has

+        the rights to submit this work under the same license and

+        agrees to a Developer Certificate of Origin

+        (see <a href="http://developercertificate.org/">http://developercertificate.org/</a> for more information).

+</p>

+</dd>

+<dt class="hdlist1">

 -S[&lt;keyid&gt;]

 </dt>

 <dt class="hdlist1">

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

 <div id="footer">

 <div id="footer-text">

-Last updated 2017-03-30 16:00:02 PDT

+Last updated 2017-08-24 11:09:12 PDT

 </div>

 </div>

 </body>