summaryrefslogtreecommitdiff
path: root/Documentation/config
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-11-02 13:17:39 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-11-02 13:17:39 -0800
commit761a4e9ab1950fc7b868629ebe478bb41235db45 (patch)
tree6a76720a12eabfcb037c496005f794e4a52ec0e9 /Documentation/config
parentMerge branch 'ds/maintenance-commit-graph-auto-fix' (diff)
parentDocumentation: stylistically normalize references to Signed-off-by: (diff)
downloadtgif-761a4e9ab1950fc7b868629ebe478bb41235db45.tar.xz
Merge branch 'bk/sob-dco'
Document that the meaning of a Signed-off-by trailer can vary from project to project in the end-user documentation, and clarify what it means to this project. * bk/sob-dco: Documentation: stylistically normalize references to Signed-off-by: SubmittingPatches: clarify DCO is our --signoff rule Documentation: clarify and expand description of --signoff doc: preparatory clean-up of description on the sign-off option
Diffstat (limited to 'Documentation/config')
-rw-r--r--Documentation/config/format.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/config/format.txt b/Documentation/config/format.txt
index c2efd8758a..851bf410a3 100644
--- a/Documentation/config/format.txt
+++ b/Documentation/config/format.txt
@@ -79,7 +79,7 @@ format.thread::
format.signOff::
A boolean value which lets you enable the `-s/--signoff` option of
- format-patch by default. *Note:* Adding the Signed-off-by: line to a
+ format-patch by default. *Note:* Adding the `Signed-off-by` trailer to a
patch should be a conscious act and means that you certify you have
the rights to submit this work under the same open source license.
Please see the 'SubmittingPatches' document for further discussion.