aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/git-interpret-trailers.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-02-27 10:34:00 -0800
committerJunio C Hamano <gitster@pobox.com>2018-02-27 10:34:00 -0800
commita42d457dc4a60d55c1edadb92ee796b068b9b5e1 (patch)
treedd926e68d7ca9a908db00b9bcef2e2a90d149d37 /Documentation/git-interpret-trailers.txt
parentd4053966ea71a9f6460419fd68db912bda91ff85 (diff)
parent760f1ad101fe9f1a5f8cf5ba6637de835987f27a (diff)
downloadgit-a42d457dc4a60d55c1edadb92ee796b068b9b5e1.tar.gz
Merge branch 'bc/doc-interpret-trailers-grammofix'
Docfix. * bc/doc-interpret-trailers-grammofix: docs/interpret-trailers: fix agreement error
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 9dd19a1dd9..ff446f15f7 100644
--- a/Documentation/git-interpret-trailers.txt
+++ b/Documentation/git-interpret-trailers.txt
@@ -51,7 +51,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.