branch,checkout: fix --track documentation
Document that the accepted variants of the --track option are --track, --track=direct, and --track=inherit. The equal sign in the latter two cannot be replaced with whitespace; in general optional arguments need to be attached firmly to their option. Put "direct" consistently before "inherit", if only for the reasons that the former is the default, explained first in the documentation, and comes before the latter alphabetically. Mention both modes in the short help so that readers don't have to look them up in the full documentation. They are literal strings and thus untranslatable. PARSE_OPT_LITERAL_ARGHELP is inferred due to the pipe and parenthesis characters, so we don't have to provide that flag explicitly. Mention that -t has the same effect as --track and --track=direct. There is no way to specify inherit mode using the short option, because short options generally don't accept optional arguments. Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
15f002812f
commit
6327f0efed
@ -632,7 +632,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
|
||||
OPT__VERBOSE(&filter.verbose,
|
||||
N_("show hash and subject, give twice for upstream branch")),
|
||||
OPT__QUIET(&quiet, N_("suppress informational messages")),
|
||||
OPT_CALLBACK_F('t', "track", &track, N_("mode"),
|
||||
OPT_CALLBACK_F('t', "track", &track, "(direct|inherit)",
|
||||
N_("set branch tracking configuration"),
|
||||
PARSE_OPT_OPTARG,
|
||||
parse_opt_tracking_mode),
|
||||
|
Reference in New Issue
Block a user