diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-10-04 12:49:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-10-04 12:49:09 -0700 |
| commit | 9839cce4a7d9c426b82d3b2198a503918d9c8894 (patch) | |
| tree | 450de120cf455ac972c0dbf925315f1f37be82c3 | |
| parent | Merge branch 'mr/bisect-in-c-2' (diff) | |
| parent | Doc: show example scissors line (diff) | |
| download | tgif-9839cce4a7d9c426b82d3b2198a503918d9c8894.tar.xz | |
Merge branch 'eg/mailinfo-doc-scissors'
The explanation of the "scissors line" has been clarified.
* eg/mailinfo-doc-scissors:
Doc: show example scissors line
| -rw-r--r-- | Documentation/git-mailinfo.txt | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Documentation/git-mailinfo.txt b/Documentation/git-mailinfo.txt index 3bbc731f67..7a6aed0e30 100644 --- a/Documentation/git-mailinfo.txt +++ b/Documentation/git-mailinfo.txt @@ -72,10 +72,9 @@ conversion, even with this flag. is useful in order to associate commits with mailing list discussions. --scissors:: - Remove everything in body before a scissors line. A line that - mainly consists of scissors (either ">8" or "8<") and perforation - (dash "-") marks is called a scissors line, and is used to request - the reader to cut the message at that line. If such a line + Remove everything in body before a scissors line (e.g. "-- >8 --"). + The line represents scissors and perforation marks, and is used to + request the reader to cut the message at that line. If that line appears in the body of the message before the patch, everything before it (including the scissors line itself) is ignored when this option is used. |