aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSitaram Chamarty <sitaramc@gmail.com>2009-04-28 20:51:20 +0530
committerJunio C Hamano <gitster@pobox.com>2009-05-09 08:32:14 -0700
commitbe427d758b53343d31debb520c0bc251a62013a9 (patch)
tree5469c902114933ce89c3ab8eff328448a0082f5f
parent74fd8728e2abd46a6276f6d48bfc6c9f01d74570 (diff)
downloadgit-be427d758b53343d31debb520c0bc251a62013a9.tar.gz
git-be427d758b53343d31debb520c0bc251a62013a9.tar.xz
allow -t abbreviation for --track in git branch
also makes it consistent with git-checkout Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git-branch.txt1
-rw-r--r--builtin-branch.c2
2 files changed, 2 insertions, 1 deletions
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",