summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@frugalware.org>2008-04-23 23:04:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-04-27 20:19:33 (GMT)
commit498a6e7eaaa8d2641f7cc343e1557e1502437b33 (patch)
treecaf2b9b1ce97b4f966db3ff64ba2afd753299839
parentb1b359699a24a89f773cccdf35801bc6fc15ade8 (diff)
downloadgit-498a6e7eaaa8d2641f7cc343e1557e1502437b33.zip
git-498a6e7eaaa8d2641f7cc343e1557e1502437b33.tar.gz
git-498a6e7eaaa8d2641f7cc343e1557e1502437b33.tar.bz2
git checkout: add -t alias for --track
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git-checkout.txt2
-rw-r--r--builtin-checkout.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index e11cddb..a644173 100644
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -47,7 +47,7 @@ OPTIONS
by linkgit:git-check-ref-format[1]. Some of these checks
may restrict the characters allowed in a branch name.
---track::
+-t, --track::
When creating a new branch, set up configuration so that git-pull
will automatically retrieve data from the start point, which must be
a branch. Use this if you always pull from the same upstream branch
diff --git a/builtin-checkout.c b/builtin-checkout.c
index 7deb504..14b2fe7 100644
--- a/builtin-checkout.c
+++ b/builtin-checkout.c
@@ -504,7 +504,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
OPT__QUIET(&opts.quiet),
OPT_STRING('b', NULL, &opts.new_branch, "new branch", "branch"),
OPT_BOOLEAN('l', NULL, &opts.new_branch_log, "log for new branch"),
- OPT_SET_INT( 0 , "track", &opts.track, "track",
+ OPT_SET_INT('t', "track", &opts.track, "track",
BRANCH_TRACK_EXPLICIT),
OPT_BOOLEAN('f', NULL, &opts.force, "force"),
OPT_BOOLEAN('m', NULL, &opts.merge, "merge"),