summaryrefslogtreecommitdiff
path: root/Documentation/git-checkout.txt
diff options
context:
space:
mode:
authorBrian Gernhardt <benji@silverinsanity.com>2007-04-23 23:56:45 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-04-23 23:58:10 (GMT)
commit81178fe48c1466f400741842f9e3da1528cfd124 (patch)
treee2ee4f5e2521ea515ca4abbc98c4bc1bc7096c8f /Documentation/git-checkout.txt
parentc7f34c180b7117cf60ad12a8b180eed33716e390 (diff)
downloadgit-81178fe48c1466f400741842f9e3da1528cfd124.zip
git-81178fe48c1466f400741842f9e3da1528cfd124.tar.gz
git-81178fe48c1466f400741842f9e3da1528cfd124.tar.bz2
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>
Diffstat (limited to 'Documentation/git-checkout.txt')
-rw-r--r--Documentation/git-checkout.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index 4f2e847..918d8ee 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