diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-03-22 14:24:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-22 14:24:21 -0700 |
| commit | dfc20a5e3c5f15e625044ef919c943bbc5a6aefc (patch) | |
| tree | fa8d07f8570a3fdeb9549f2033f3e739ad602ed8 | |
| parent | 68559c464a8d22d4c3cc0a258fb4317125ddd099 (diff) | |
| parent | 760f1ad101fe9f1a5f8cf5ba6637de835987f27a (diff) | |
| download | git-dfc20a5e3c5f15e625044ef919c943bbc5a6aefc.tar.gz | |
Merge branch 'bc/doc-interpret-trailers-grammofix' into maint
Docfix.
* bc/doc-interpret-trailers-grammofix:
docs/interpret-trailers: fix agreement error
| -rw-r--r-- | Documentation/git-interpret-trailers.txt | 2 |
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. |