From: Junio C Hamano Date: Wed, 6 Dec 2017 17:08:59 +0000 (-0800) Subject: Merge branch 'bc/submitting-patches-in-asciidoc' into maint X-Git-Tag: v2.15.2~13 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3cdea38707b6266b3bfa2bc5820f3f715f400d39 Merge branch 'bc/submitting-patches-in-asciidoc' into maint The SubmittingPatches document has been converted to produce an HTML version via AsciiDoc/Asciidoctor. * bc/submitting-patches-in-asciidoc: Documentation: convert SubmittingPatches to AsciiDoc Documentation: enable compat-mode for Asciidoctor --- 3cdea38707b6266b3bfa2bc5820f3f715f400d39 diff --cc Documentation/SubmittingPatches index 89f2390716,17419f7901..3ef30922ec --- a/Documentation/SubmittingPatches +++ b/Documentation/SubmittingPatches @@@ -184,15 -203,14 +203,15 @@@ lose tabs that way if you are not caref It is a common convention to prefix your subject line with [PATCH]. This lets people easily distinguish patches from other -e-mail discussions. Use of additional markers after PATCH and -the closing bracket to mark the nature of the patch is also -encouraged. E.g. [PATCH/RFC] is often used when the patch is -not ready to be applied but it is for discussion, [PATCH v2], -[PATCH v3] etc. are often seen when you are sending an update to -what you have previously sent. - -`git format-patch` command follows the best current practice to +e-mail discussions. Use of markers in addition to PATCH within +the brackets to describe the nature of the patch is also +encouraged. E.g. [RFC PATCH] (where RFC stands for "request for +comments") is often used to indicate a patch needs further +discussion before being accepted, [PATCH v2], [PATCH v3] etc. +are often seen when you are sending an update to what you have +previously sent. + - The "git format-patch" command follows the best current practice to ++The `git format-patch` command follows the best current practice to format the body of an e-mail message. At the beginning of the patch should come your commit message, ending with the Signed-off-by: lines, and a line that consists of three dashes,