Merge branch 'js/branch-track-inherit'

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

diff --git a/builtin/branch.c b/builtin/branch.c
index 6c8b0fcc11fbca461884b6459fd1405293e4ec89..78ce5da8329a557634ce177a4563f812a036a001 100644 (file)
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -638,8 +638,10 @@ 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_SET_INT('t', "track",  &track, N_("set up tracking mode (see git-pull(1))"),
-                       BRANCH_TRACK_EXPLICIT),
+               OPT_CALLBACK_F('t', "track",  &track, "direct|inherit",
+                       N_("set branch tracking configuration"),
+                       PARSE_OPT_OPTARG | PARSE_OPT_LITERAL_ARGHELP,
+                       parse_opt_tracking_mode),
                OPT_SET_INT_F(0, "set-upstream", &track, N_("do not use"),
                        BRANCH_TRACK_OVERRIDE, PARSE_OPT_HIDDEN),
                OPT_STRING('u', "set-upstream-to", &new_upstream, N_("upstream"), N_("change the upstream info")),