Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'bc/doc-interpret-trailers-grammofix' into maint
author
Junio C Hamano
<gitster@pobox.com>
Thu, 22 Mar 2018 21:24:21 +0000
(14:24 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 22 Mar 2018 21:24:21 +0000
(14:24 -0700)
Docfix.
* bc/doc-interpret-trailers-grammofix:
docs/interpret-trailers: fix agreement error
Documentation/git-interpret-trailers.txt
patch
|
blob
|
history
raw
(from parent 1:
68559c4
)
diff --git
a/Documentation/git-interpret-trailers.txt
b/Documentation/git-interpret-trailers.txt
index 9dd19a1dd9f126fbf54f1dc628b30fbe05445cf3..ff446f15f79f270a8979d1a398450a50ba4a4e95 100644
(file)
--- 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.