trailer: trailer location is a place, not an action
Fix the help text to say "placement" instead of "action" because the values are placements, not actions. While we're at it, tweak the documentation to say "placements" instead of "values", similar to how the existing language for "--if-exists" uses the word "action" to describe both the syntax (with the phrase "--if-exists <action>") and the possible values (with the phrase "possible actions"). 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
467bb1b97ad9181cc22dbebeb0efffada3e6b523
2 files changed
+2
-2
Documentation/git-interpret-trailers.txt
+1
-1
@@ -117,7 +117,7 @@ OPTIONS
117
and applies to all '--trailer' options until the next occurrence of
118
'--where' or '--no-where'. Upon encountering '--no-where', clear the
119
effect of any previous use of '--where', such that the relevant configuration
120
- variables are no longer overridden. Possible values are `after`,
120
+ variables are no longer overridden. Possible placements are `after`,
121
`before`, `end` or `start`.
122
123
--if-exists <action>::
builtin/interpret-trailers.c
+1
-1
@@ -97,7 +97,7 @@ int cmd_interpret_trailers(int argc, const char **argv, const char *prefix)
97
OPT_BOOL(0, "in-place", &opts.in_place, N_("edit files in place")),
98
OPT_BOOL(0, "trim-empty", &opts.trim_empty, N_("trim empty trailers")),
99
100
- OPT_CALLBACK(0, "where", NULL, N_("action"),
100
+ OPT_CALLBACK(0, "where", NULL, N_("placement"),
101
N_("where to place the new trailer"), option_parse_where),
102
OPT_CALLBACK(0, "if-exists", NULL, N_("action"),
103
N_("action if trailer already exists"), option_parse_if_exists),