diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-11-23 11:23:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-11-23 11:23:17 -0800 |
| commit | 6a2b569c2fec49cc213e0218f1251749771044d6 (patch) | |
| tree | 12c5a517fce40ac267f2aef08b5945a377d2c04e /Documentation | |
| parent | bd53f38d52b87340ad791290d700c5c7e8587f23 (diff) | |
| parent | df616b19b4a8633261f304450c9a3872ffe33ae0 (diff) | |
| download | git-6a2b569c2fec49cc213e0218f1251749771044d6.tar.gz | |
Merge branch 'jt/trailer-with-cruft'
Doc update.
* jt/trailer-with-cruft:
doc: mention user-configured trailers
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-interpret-trailers.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt index e99bda6add..09074c75a4 100644 --- a/Documentation/git-interpret-trailers.txt +++ b/Documentation/git-interpret-trailers.txt @@ -49,7 +49,8 @@ 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 -least one Git-generated trailer and consists of at least 25% trailers. +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. The group must either be at the end of the message or be the last non-whitespace lines before a line that starts with '---'. Such three |