diff options
| author | Brian Gernhardt <benji@silverinsanity.com> | 2007-04-24 01:56:45 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-24 01:58:10 +0200 |
| commit | 81178fe48c1466f400741842f9e3da1528cfd124 (patch) | |
| tree | e2ee4f5e2521ea515ca4abbc98c4bc1bc7096c8f | |
| parent | dir.c(common_prefix): Fix two bugs (diff) | |
| download | git-81178fe48c1466f400741842f9e3da1528cfd124.tar.xz git-81178fe48c1466f400741842f9e3da1528cfd124.zip | |
Reverse the order of -b and --track in the man page.
Using "-b --track newbranch oldbranch" gives the error:
git checkout: updating paths is incompatible with switching
branches/forcing
However, "--track -b ..." works just fine.
Signed-off-by: Brian Gernhardt <benji@silverinsanity.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | Documentation/git-checkout.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index 4f2e847dc3..918d8ee720 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/git-checkout.txt @@ -8,7 +8,7 @@ git-checkout - Checkout and switch to a branch SYNOPSIS -------- [verse] -'git-checkout' [-q] [-f] [-b [--track | --no-track] <new_branch> [-l]] [-m] [<branch>] +'git-checkout' [-q] [-f] [[--track | --no-track] -b <new_branch> [-l]] [-m] [<branch>] 'git-checkout' [<tree-ish>] <paths>... DESCRIPTION |