mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jt/trailer-with-cruft'

Browse Source 
Doc update.

* jt/trailer-with-cruft:
  doc: mention user-configured trailers
This commit is contained in:
Junio C Hamano
2016-11-23 11:23:17 -08:00
parent bd53f38d52 df616b19b4
commit 6a2b569c2f
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/git-interpret-trailers.txt
View File

@ -49,7 +49,8 @@ will be added before the new trailer.
Existing trailers are extracted from the input message by looking for 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) 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 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 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 non-whitespace lines before a line that starts with '---'. Such three