| commit | 6ccbc6679426e39720278aedbb8e415dac8db79b | |
| author | Linus Arver <linusa@google.com> | |
| Thu, 7 Sep 2023 22:20:09 +0000 (7 22:20 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 8 Sep 2023 06:04:44 +0000 (7 23:04 -0700) | ||
| tree | 292e858e1b13ccf9c4537491bbfcda0e49bd015a | treesnapshot (tar.gz zip) |
| parent | ab76661f221807b0c8d71ed7acb259575205f4e9 | commitdiff |
trailer doc: <token> is a <key> or <keyAlias>, not both
The `--trailer` option takes a "<token>=<value>" argument, for example
--trailer "Acked-by=Bob"
And in this exampple it is understood that "Acked-by" is the <token>.
However, the user can use a shorter "ack" string by defining
configuration like
git config trailer.ack.key "Acked-by"
However, in the docs we define the above configuration as
trailer.<token>.key
so the <token> can mean either the longer "Acked-by" or the shorter
"ack".
Separate the two meanings of <token> into <key> and <keyAlias>, and
update the configuration syntax to say "trailer.<keyAlias>.key".
Signed-off-by: Linus Arver <linusa@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The `--trailer` option takes a "<token>=<value>" argument, for example
--trailer "Acked-by=Bob"
And in this exampple it is understood that "Acked-by" is the <token>.
However, the user can use a shorter "ack" string by defining
configuration like
git config trailer.ack.key "Acked-by"
However, in the docs we define the above configuration as
trailer.<token>.key
so the <token> can mean either the longer "Acked-by" or the shorter
"ack".
Separate the two meanings of <token> into <key> and <keyAlias>, and
update the configuration syntax to say "trailer.<keyAlias>.key".
Signed-off-by: Linus Arver <linusa@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/git-interpret-trailers.txt | diffblobblamehistory | |
| builtin/interpret-trailers.c | diffblobblamehistory |