summaryrefslogtreecommitdiffstats
path: root/git-interpret-trailers.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-02-28 15:40:27 -0800
committerJunio C Hamano <gitster@pobox.com>2018-02-28 15:40:27 -0800
commit615c3b305d84007474d17c62d54fc18c71fdc587 (patch)
tree3c342628ed177b313bffbdb3250ed18d71046cca /git-interpret-trailers.txt
parent90fd88e4a2ddbb1298553bb804788405aa3e984c (diff)
downloadgit-htmldocs-615c3b305d84007474d17c62d54fc18c71fdc587.tar.gz
Autogenerated HTML docs for v2.16.2-345-g7e3123
Diffstat (limited to 'git-interpret-trailers.txt')
-rw-r--r--git-interpret-trailers.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-interpret-trailers.txt b/git-interpret-trailers.txt
index 9dd19a1dd..ff446f15f 100644
--- a/git-interpret-trailers.txt
+++ b/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.