From: Sitaram Chamarty Date: Tue, 28 Apr 2009 15:21:20 +0000 (+0530) Subject: allow -t abbreviation for --track in git branch X-Git-Tag: v1.6.4-rc0~174 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=be427d758b53343d31debb520c0bc251a62013a9;p=git.git allow -t abbreviation for --track in git branch also makes it consistent with git-checkout Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index cbd427587..ae201deb7 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.txt @@ -111,6 +111,7 @@ OPTIONS --no-abbrev:: Display the full sha1s in the output listing rather than abbreviating them. +-t:: --track:: When creating a new branch, set up configuration to mark the start-point branch as "upstream" from the new branch. This diff --git a/builtin-branch.c b/builtin-branch.c index 91098ca9b..6aaa70847 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",