summaryrefslogtreecommitdiffstats
path: root/merge-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-11-10 15:01:12 +0900
committerJunio C Hamano <gitster@pobox.com>2017-11-10 15:01:12 +0900
commit3a9c034734bf5aa3e3b139e72a6b0b96ddf0b3e9 (patch)
tree53a0176d8d930235e125d80c7705681f80bf1957 /merge-options.txt
parenta65b67605da51cd9b94659acdac8984dd205dcc7 (diff)
downloadgit-htmldocs-3a9c034734bf5aa3e3b139e72a6b0b96ddf0b3e9.tar.gz
Autogenerated HTML docs for v2.15.0-164-g4123b
Diffstat (limited to 'merge-options.txt')
-rw-r--r--merge-options.txt10
1 files changed, 10 insertions, 0 deletions
diff --git a/merge-options.txt b/merge-options.txt
index 2552ab8e8..3888c3ff8 100644
--- a/merge-options.txt
+++ b/merge-options.txt
@@ -57,6 +57,16 @@ set to `no` at the beginning of them.
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.
--stat::
-n::