diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2022-01-18 16:02:23 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-01-18 16:02:23 -0800 |
| commit | af4e5f569bc89f356eb34a9373d7f82aca6faa8a (patch) | |
| tree | 69f19624038868409ede5c502a28bc84af2869f5 | |
| parent | Merge branch 'jc/freebsd-without-c99-only-build' (diff) | |
| parent | branch,checkout: fix --track usage strings (diff) | |
| download | tgif-af4e5f569bc89f356eb34a9373d7f82aca6faa8a.tar.xz | |
Merge branch 'js/branch-track-inherit'
"git branch -h" incorrectly said "--track[=direct|inherit]",
implying that "--trackinherit" is a valid option, which has been
corrected.
* js/branch-track-inherit:
branch,checkout: fix --track usage strings
| -rw-r--r-- | builtin/branch.c | 4 | ||||
| -rw-r--r-- | builtin/checkout.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index 2251e6a54f..0c8d8a8827 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -638,9 +638,9 @@ 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, "direct|inherit", + OPT_CALLBACK_F('t', "track", &track, N_("mode"), N_("set branch tracking configuration"), - PARSE_OPT_OPTARG | PARSE_OPT_LITERAL_ARGHELP, + PARSE_OPT_OPTARG, parse_opt_tracking_mode), OPT_SET_INT_F(0, "set-upstream", &track, N_("do not use"), BRANCH_TRACK_OVERRIDE, PARSE_OPT_HIDDEN), diff --git a/builtin/checkout.c b/builtin/checkout.c index 94814c37b4..6a5dd2a2a2 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -1549,9 +1549,9 @@ static struct option *add_common_switch_branch_options( { struct option options[] = { OPT_BOOL('d', "detach", &opts->force_detach, N_("detach HEAD at named commit")), - OPT_CALLBACK_F('t', "track", &opts->track, "direct|inherit", - N_("set up tracking mode (see git-pull(1))"), - PARSE_OPT_OPTARG | PARSE_OPT_LITERAL_ARGHELP, + OPT_CALLBACK_F('t', "track", &opts->track, N_("mode"), + N_("set branch tracking configuration"), + PARSE_OPT_OPTARG, parse_opt_tracking_mode), OPT__FORCE(&opts->force, N_("force checkout (throw away local modifications)"), PARSE_OPT_NOCOMPLETE), |