diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-01-20 23:25:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-01-20 23:25:38 (GMT) |
| commit | 297ca895a27a6bbdb7906371d533f72a12ad25b2 (patch) | |
| tree | 22d57d4e9642379100ff6f8c216487287be46882 /builtin | |
| parent | 50b2d72e110cad39ecaf2322bfdf1b60cd13dd96 (diff) | |
| parent | 6327f0efed36c64d98a140110171362b7cb75a52 (diff) | |
| download | git-297ca895a27a6bbdb7906371d533f72a12ad25b2.zip git-297ca895a27a6bbdb7906371d533f72a12ad25b2.tar.gz git-297ca895a27a6bbdb7906371d533f72a12ad25b2.tar.bz2 | |
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.
source: <3de40324bea6a1dd9bca2654721471e3809e87d8.1642538935.git.steadmon@google.com>
source: <c3c26192-aee9-185a-e559-b8735139e49c@web.de>
* js/branch-track-inherit:
branch,checkout: fix --track documentation
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/branch.c | 2 | ||||
| -rw-r--r-- | builtin/checkout.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index 0c8d8a8..4ce2a24 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -638,7 +638,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), diff --git a/builtin/checkout.c b/builtin/checkout.c index 6a5dd2a..0bc2e63 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -1549,7 +1549,7 @@ 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, N_("mode"), + OPT_CALLBACK_F('t', "track", &opts->track, "(direct|inherit)", N_("set branch tracking configuration"), PARSE_OPT_OPTARG, parse_opt_tracking_mode), |