summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorEvan Gates <evan.gates@gmail.com>2020-09-28 22:51:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-09-28 23:09:04 (GMT)
commit287416dba6258ab1819060fb62bb5df5d25aa10e (patch)
treea41e6dc2ee330b9450e6d6b8fa6b91bd24550ce9 /Documentation
parent47ae905ffb98cc4d4fd90083da6bc8dab55d9ecc (diff)
downloadgit-287416dba6258ab1819060fb62bb5df5d25aa10e.zip
git-287416dba6258ab1819060fb62bb5df5d25aa10e.tar.gz
git-287416dba6258ab1819060fb62bb5df5d25aa10e.tar.bz2
Doc: show example scissors line
The text tries to say the code accepts many variations that look remotely like scissors and perforation marks, but gives too little detail for users to decide what is and what is not taken as a scissors line for themselves. Instead of describing the heuristics more, just spell out what will always be accepted, namely "-- >8 --", as it would not help users to give them more choices and flexibility and be "creative" in their scissors line. Signed-off-by: Evan Gates <evan.gates@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-mailinfo.txt7
1 files changed, 3 insertions, 4 deletions
diff --git a/Documentation/git-mailinfo.txt b/Documentation/git-mailinfo.txt
index 3bbc731..7a6aed0 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.