trailer doc: emphasize the effect of configuration variables
The sentence does not mention the effect of configuration variables at all, when they are actively used by default (unless --parse is specified) to potentially add new trailers, without the user having to always supply --trailer manually. Signed-off-by: Linus Arver <linusa@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
289a0b2447
commit
db97296122
@ -34,9 +34,12 @@ This command reads commit messages from either the
|
|||||||
If `--parse` is specified, the output consists of the parsed trailers
|
If `--parse` is specified, the output consists of the parsed trailers
|
||||||
coming from the input, without influencing them with any command line
|
coming from the input, without influencing them with any command line
|
||||||
options or configuration variables.
|
options or configuration variables.
|
||||||
Otherwise, this command applies the arguments passed using the
|
|
||||||
`--trailer` option, if any, to each input file. The result is emitted on the
|
Otherwise, this command applies `trailer.*` configuration variables
|
||||||
standard output.
|
(which could potentially add new trailers, as well as reposition them),
|
||||||
|
as well as any command line arguments that can override configuration
|
||||||
|
variables (such as `--trailer=...` which could also add new trailers),
|
||||||
|
to each input file. The result is emitted on the standard output.
|
||||||
|
|
||||||
This command can also operate on the output of linkgit:git-format-patch[1],
|
This command can also operate on the output of linkgit:git-format-patch[1],
|
||||||
which is more elaborate than a plain commit message. Namely, such output
|
which is more elaborate than a plain commit message. Namely, such output
|
||||||
|
Reference in New Issue
Block a user