trailer --only-input: prefer "configuration variables" over "rules"
Use the phrase "configuration variables" instead of "rules" because (1) we already say "configuration variables" in multiple places in the docs (where the word "rules" is only used for describing "--only-input" behavior and for an unrelated case of mentioning how the trailers do not follow "rules for RFC 822 headers"), and (2) this phrase is more specific than just "rules". Signed-off-by: Linus Arver <linusa@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Linus Arver committed
Sep 7, 2023 at 22:20 UTC
a6c72e7046cce70384eb54764c43e78dd4a1bfec
2 files changed
+3
-3
Documentation/git-interpret-trailers.txt
+2
-2
@@ -149,8 +149,8 @@ OPTIONS
149
150
--only-input::
151
Output only trailers that exist in the input; do not add any
152
- from the command-line or by following configured `trailer.*`
153
- rules.
152
+ from the command-line or by applying `trailer.*` configuration
153
+ variables.
154
155
--unfold::
156
Remove any whitespace-continuation in trailers, so that each
builtin/interpret-trailers.c
+1
-1
@@ -105,7 +105,7 @@ int cmd_interpret_trailers(int argc, const char **argv, const char *prefix)
105
N_("action if trailer is missing"), option_parse_if_missing),
106
107
OPT_BOOL(0, "only-trailers", &opts.only_trailers, N_("output only the trailers")),
108
- OPT_BOOL(0, "only-input", &opts.only_input, N_("do not apply config rules")),
108
+ OPT_BOOL(0, "only-input", &opts.only_input, N_("do not apply trailer.* configuration variables")),
109
OPT_BOOL(0, "unfold", &opts.unfold, N_("join whitespace-continued values")),
110
OPT_CALLBACK_F(0, "parse", &opts, NULL, N_("alias for --only-trailers --only-input --unfold"),
111
PARSE_OPT_NOARG | PARSE_OPT_NONEG, parse_opt_parse),