summaryrefslogtreecommitdiff
path: root/Documentation/git-branch.txt
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2007-11-12 04:07:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-11-12 07:40:32 (GMT)
commit53e780c8f662bb937dc66a698c34fa2407cff31b (patch)
tree825baa012a3b564b929ba68e9626f5ecb5c957ca /Documentation/git-branch.txt
parentc8cfa3e4a5b1d1d4c870c82d2dbf162f570f0561 (diff)
downloadgit-53e780c8f662bb937dc66a698c34fa2407cff31b.zip
git-53e780c8f662bb937dc66a698c34fa2407cff31b.tar.gz
git-53e780c8f662bb937dc66a698c34fa2407cff31b.tar.bz2
git-branch: remove mention of non-existent '-b' option
This looks like a cut and paste error from the git-checkout explanation of --no-track. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-branch.txt')
-rw-r--r--Documentation/git-branch.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index b7285bc..37cb8b8 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -105,7 +105,7 @@ OPTIONS
'--track' were given.
--no-track::
- When -b is given and a branch is created off a remote branch,
+ When a branch is created off a remote branch,
set up configuration so that git-pull will not retrieve data
from the remote branch, ignoring the branch.autosetupmerge
configuration variable.