summaryrefslogtreecommitdiffstats
path: root/merge-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-11-02 14:05:05 -0800
committerJunio C Hamano <gitster@pobox.com>2020-11-02 14:05:05 -0800
commitdf3d3cddff51ef14a454394a9977e899f72b8244 (patch)
treeb6f9a3c1f550494dd1bb439f3b1cb05067ce621a /merge-options.txt
parentb8e9cfb64bf7192e3861ff1b72d169e7d1554be9 (diff)
downloadgit-htmldocs-df3d3cddff51ef14a454394a9977e899f72b8244.tar.gz
Autogenerated HTML docs for v2.29.2-154-g7f7eb
Diffstat (limited to 'merge-options.txt')
-rw-r--r--merge-options.txt11
1 files changed, 1 insertions, 10 deletions
diff --git a/merge-options.txt b/merge-options.txt
index 80d483166..eb0aabd39 100644
--- a/merge-options.txt
+++ b/merge-options.txt
@@ -77,16 +77,7 @@ When not possible, refuse to merge and exit with a non-zero status.
With --no-log do not list one-line descriptions from the
actual commits being merged.
---signoff::
---no-signoff::
- 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 http://developercertificate.org/ for more information).
-+
-With --no-signoff do not add a Signed-off-by line.
+include::signoff-option.txt[]
--stat::
-n::