Autogenerated HTML docs for v2.29.2-154-g7f7eb

1 files changed, 13 insertions, 8 deletions

diff --git a/git-merge.html b/git-merge.html
index e92ee4b0e..211904202 100644
--- a/git-merge.html
+++ b/git-merge.html
@@ -927,14 +927,19 @@ actual commits being merged.</p></div>
 </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>

-<div class="paragraph"><p>With --no-signoff do not add a Signed-off-by line.</p></div>

+        Add a <code>Signed-off-by</code> trailer by the committer at the end of the commit

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

+        to which you&#8217;re committing.  For example, it may certify that

+        the committer has the rights to submit the work under the

+        project&#8217;s license or agrees to some contributor representation,

+        such as a Developer Certificate of Origin.

+        (See <a href="http://developercertificate.org">http://developercertificate.org</a> for the one used by the

+        Linux kernel and Git projects.)  Consult the documentation or

+        leadership of the project to which you&#8217;re contributing to

+        understand how the signoffs are used in that project.

+</p>

+<div class="paragraph"><p>The --no-signoff option can be used to countermand an earlier --signoff

+option on the command line.</p></div>

 </dd>

 <dt class="hdlist1">

 --stat