path: root/Documentation/process/submitting-patches.rst
diff options
authorJunio C Hamano <gitster@pobox.com>2017-09-25 18:36:19 +0900
committerJonathan Corbet <corbet@lwn.net>2017-09-26 14:53:29 -0600
commitd19b3e32375bd21b5d89cc484dfc56cbd9b7fee4 (patch)
tree462ce639e7d6623fb0cd83de552973f732e77f0e /Documentation/process/submitting-patches.rst
parentac0a314caed1827f4ef5d7145eb609147b48b45d (diff)
Documentation/process: fix the canonical patch format description
There shouldn't be a blank line at the beginning, if there is no optional in-body "From" line. There must be a blank line between the body of the explanation and the beginning of the S-o-b lines. Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'Documentation/process/submitting-patches.rst')
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/process/submitting-patches.rst b/Documentation/process/submitting-patches.rst
index 733478ade91b..1ef19d3a3eee 100644
--- a/Documentation/process/submitting-patches.rst
+++ b/Documentation/process/submitting-patches.rst
@@ -621,14 +621,14 @@ The canonical patch subject line is::
The canonical patch message body contains the following:
- - A ``from`` line specifying the patch author (only needed if the person
- sending the patch is not the author).
- - An empty line.
+ - A ``from`` line specifying the patch author, followed by an empty
+ line (only needed if the person sending the patch is not the author).
- The body of the explanation, line wrapped at 75 columns, which will
be copied to the permanent changelog to describe this patch.
+ - An empty line.
- The ``Signed-off-by:`` lines, described above, which will
also go in the changelog.