Merge branch 'js/branch-track-inherit'

[thirdparty/git.git] / builtin / branch.c

diff --git a/builtin/branch.c b/builtin/branch.c
index 2251e6a54f01f4665ccf5fa970e68d63ba2c4a10..0c8d8a882758e3de2424b2efcf07243be184c81e 100644 (file)
--- 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),