development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-17 19:17:52 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

trailer: trailer location is a place, not an action

Browse source 
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>
This commit is contained in:
Linus Arver 2023-09-07 22:20:01 +00:00 committed by Junio C Hamano
parent f659c56a8c
commit 467bb1b97a
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Documentation/git-interpret-trailers.txt
View file

@ -117,7 +117,7 @@ OPTIONS
and applies to all '--trailer' options until the next occurrence of
'--where' or '--no-where'. Upon encountering '--no-where', clear the
effect of any previous use of '--where', such that the relevant configuration
variables are no longer overridden. Possible values are `after`,
variables are no longer overridden. Possible placements are `after`,
`before`, `end` or `start`.
--if-exists <action>::

2
builtin/interpret-trailers.c
View file

@ -97,7 +97,7 @@ int cmd_interpret_trailers(int argc, const char **argv, const char *prefix)
OPT_BOOL(0, "in-place", &opts.in_place, N_("edit files in place")),
OPT_BOOL(0, "trim-empty", &opts.trim_empty, N_("trim empty trailers")),
OPT_CALLBACK(0, "where", NULL, N_("action"),
OPT_CALLBACK(0, "where", NULL, N_("placement"),
N_("where to place the new trailer"), option_parse_where),
OPT_CALLBACK(0, "if-exists", NULL, N_("action"),
N_("action if trailer already exists"), option_parse_if_exists),