Quoting myself... > A scissors mark doesn't have to be at the beginning. The line has to > contain the mark, and it has to consist of only the mark, '-' minus, the > phrase "cut here", and whitespaces. Junio, perhaps you want to squash some documentation, too. -- 8< -- cut here -- 8< -- cut here -- 8< -- Subject: [PATCH] Documentation: describe the scissors mark support of "git am" Describe what a scissors mark looks like, and explain in what situation it is often used. Signed-off-by: Nanako Shiraishi <nanako3@xxxxxxxxxxx> --- Documentation/git-am.txt | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index fcacc94..fecd5ac 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -128,10 +128,18 @@ the commit, after stripping common prefix "[PATCH <anything>]". The "Subject: " line is supposed to concisely describe what the commit is about in one line of text. -"From: " and "Subject: " lines starting the body (the rest of the -message after the blank line terminating the RFC2822 headers) -override the respective commit author name and title values taken -from the headers. +A line that contains a scissors mark (either ">8" or "8<") and does not +have anything other than scissors, dash (-), whitespaces or a phrase "cut +here" is called a scissors line. If such a line appears in the body of the +message before the patch, everything before it (including the scissors +line itself) is ignored. This is useful if you want to begin your message +in a discussion thread with comments and suggestions on the message you +are responding to, and to conclude it with a patch submission, separating +the discussion and the beginning of the proposed commit log message with a +scissors line. + +"From: " and "Subject: " lines starting the body override the respective +commit author name and title values taken from the headers. The commit message is formed by the title taken from the "Subject: ", a blank line and the body of the message up to -- Nanako Shiraishi http://ivory.ap.teacup.com/nanako3/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html