summaryrefslogtreecommitdiff
path: root/Documentation/git-interpret-trailers.txt
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2018-02-13 02:23:52 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-02-13 17:45:45 (GMT)
commit760f1ad101fe9f1a5f8cf5ba6637de835987f27a (patch)
tree4ef6037358434371e3cc976312968406b94d6476 /Documentation/git-interpret-trailers.txt
parent39aaab109972d6bbc1d0ffe5d4de47bbd4b8bb07 (diff)
downloadgit-760f1ad101fe9f1a5f8cf5ba6637de835987f27a.zip
git-760f1ad101fe9f1a5f8cf5ba6637de835987f27a.tar.gz
git-760f1ad101fe9f1a5f8cf5ba6637de835987f27a.tar.bz2
docs/interpret-trailers: fix agreement error
In the description of git interpret-trailers, we describe "a group…of lines" that have certain characteristics. Ensure both options describing this group use a singular verb for parallelism. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-interpret-trailers.txt')
-rw-r--r--Documentation/git-interpret-trailers.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt
index 09074c7..a861fc0 100644
--- a/Documentation/git-interpret-trailers.txt
+++ b/Documentation/git-interpret-trailers.txt
@@ -48,7 +48,7 @@ with only spaces at the end of the commit message part, one blank line
will be added before the new trailer.
Existing trailers are extracted from the input message by looking for
-a group of one or more lines that (i) are all trailers, or (ii) contains at
+a group of one or more lines that (i) is all trailers, or (ii) contains at
least one Git-generated or user-configured trailer and consists of at
least 25% trailers.
The group must be preceded by one or more empty (or whitespace-only) lines.