From: Brian Gernhardt <benji@silverinsanity.com>
Date: Mon, 23 Apr 2007 23:56:45 +0000 (-0400)
Subject: Reverse the order of -b and --track in the man page.
X-Git-Tag: v1.5.1.3~45
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=81178fe48c1466f400741842f9e3da1528cfd124;p=git.git

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>
---

diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index 4f2e847dc..918d8ee72 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