X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=builtin-branch.c;h=5687d6042ced29e60aa1999dc9d73eb6c38b8e77;hb=59773c7e583b1dcf4b63c4ee222b79cef460456b;hp=91098ca9b106239916af000cb54a4bf09629e6b6;hpb=037e9d5b1575d7ede05b50c317d9d88258556d84;p=~andy%2Fgit diff --git a/builtin-branch.c b/builtin-branch.c index 91098ca9b..5687d6042 100644 --- a/builtin-branch.c +++ b/builtin-branch.c @@ -547,7 +547,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix) struct option options[] = { OPT_GROUP("Generic options"), OPT__VERBOSE(&verbose), - OPT_SET_INT( 0 , "track", &track, "set up tracking mode (see git-pull(1))", + OPT_SET_INT('t', "track", &track, "set up tracking mode (see git-pull(1))", BRANCH_TRACK_EXPLICIT), OPT_BOOLEAN( 0 , "color", &branch_use_color, "use colored output"), OPT_SET_INT('r', NULL, &kinds, "act on remote-tracking branches", @@ -610,7 +610,8 @@ int cmd_branch(int argc, const char **argv, const char *prefix) } hashcpy(merge_filter_ref, head_sha1); - argc = parse_options(argc, argv, options, builtin_branch_usage, 0); + argc = parse_options(argc, argv, prefix, options, builtin_branch_usage, + 0); if (!!delete + !!rename + !!force_create > 1) usage_with_options(builtin_branch_usage, options);