( Paste error, sorry. ) The 24/08/09, Nicolas Sebrecht wrote: > [ Please, please, please, wrap your lines. ] > > The 24/08/09, Nanako Shiraishi wrote: > > > Looking at the way other people use the mark in their messages, I think this explanation isn't correct. > > I'd say that should not document what people do but what the program > does. > > > 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. > > ...and (">8" or "<8"), you're right. But isn't the following mark a bit > too much permissive? ->8 Subject: [PATCH] squashme to 925bd84 (Teach mailinfo to ignore everything before -- >8 -- mark, 2009-08-23) --- Documentation/git-am.txt | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index fcacc94..5294d47 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -138,6 +138,12 @@ The commit message is formed by the title taken from the where the patch begins. Excess whitespace at the end of each line is automatically stripped. +If a line contains a mark in the body of the message, everything +before (and the line itself) will be ignored. A mark has typically +the form "-- >8 -- cut here -- >8 --". Strictly speacking, it must +have one dash at least and a ">8" (or "<8"). Spaces and strings +"cut here" are permited. + The patch is expected to be inline, directly following the message. Any line that is of the form: -- Nicolas Sebrecht -- 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