All of lore.kernel.org
 help / color / mirror / Atom feed
From: Evan Gates <evan.gates@gmail.com>
To: git@vger.kernel.org
Subject: [PATCH] Doc: note minimum scissors line length for mailinfo
Date: Fri, 25 Sep 2020 12:16:59 -0700	[thread overview]
Message-ID: <20200925191659.31375-1-evan.gates@gmail.com> (raw)

There is a comment in is_scissors_line describing the requirements for
a line to be considered a scissors line.  While the existing wording
covers most of the requirements, there was no mention of minimum size.

Signed-off-by: Evan Gates <evan.gates@gmail.com>
---
This comes up after I tried to use --8<-- as scissors but git am didn't
recognize it because it's only 6 bytes.  I couldn't figure out why until
I cloned git and checked the source.

I am not subscribed to the list, please cc me in any replies.

 Documentation/git-mailinfo.txt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Documentation/git-mailinfo.txt b/Documentation/git-mailinfo.txt
index 3bbc731f67..859829d32f 100644
--- a/Documentation/git-mailinfo.txt
+++ b/Documentation/git-mailinfo.txt
@@ -74,11 +74,11 @@ conversion, even with this flag.
 --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
-	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.
+	(dash "-") marks and is at least 8 bytes long ("-- >8 --") is
+	called a scissors line, and is used to request the reader to cut
+	the message at that 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 when this option is used.
 +
 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
-- 
2.28.0


             reply	other threads:[~2020-09-25 20:43 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-25 19:16 Evan Gates [this message]
2020-09-28 18:35 ` [PATCH] Doc: note minimum scissors line length for mailinfo jrnieder
2020-09-28 18:55   ` Junio C Hamano
2020-09-28 19:00     ` Jonathan Nieder
2020-09-28 19:20       ` Evan Gates
2020-09-28 19:33         ` Kevin Daudt
2020-09-28 20:20 ` [PATCH v2] Doc: specify exact scissors line Evan Gates
2020-09-28 22:31   ` Junio C Hamano
2020-09-28 22:51   ` [PATCH v3] Doc: show example " Evan Gates
2020-09-28 23:41     ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200925191659.31375-1-evan.gates@gmail.com \
    --to=evan.gates@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.