From: Miklos Vajna Date: Wed, 23 Apr 2008 23:04:48 +0000 (+0200) Subject: git checkout: add -t alias for --track X-Git-Tag: v1.5.6-rc0~122 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=498a6e7eaaa8d2641f7cc343e1557e1502437b33;p=git.git git checkout: add -t alias for --track Signed-off-by: Miklos Vajna Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index e11cddbfc..a644173e1 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 7deb50483..14b2fe776 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"),