Skip to content

Commit 467bb1b

Browse files
Linus Arvergitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent f659c56 commit 467bb1b

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Documentation/git-interpret-trailers.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ OPTIONS
117117
and applies to all '--trailer' options until the next occurrence of
118118
'--where' or '--no-where'. Upon encountering '--no-where', clear the
119119
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`,
121121
`before`, `end` or `start`.
122122

123123
--if-exists <action>::

builtin/interpret-trailers.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ int cmd_interpret_trailers(int argc, const char **argv, const char *prefix)
9797
OPT_BOOL(0, "in-place", &opts.in_place, N_("edit files in place")),
9898
OPT_BOOL(0, "trim-empty", &opts.trim_empty, N_("trim empty trailers")),
9999

100-
OPT_CALLBACK(0, "where", NULL, N_("action"),
100+
OPT_CALLBACK(0, "where", NULL, N_("placement"),
101101
N_("where to place the new trailer"), option_parse_where),
102102
OPT_CALLBACK(0, "if-exists", NULL, N_("action"),
103103
N_("action if trailer already exists"), option_parse_if_exists),

0 commit comments

Comments
 (0)