From: Jon Loeliger <jdl@jdl.com>
Date: Sat, 18 Mar 2006 00:24:37 +0000 (-0600)
Subject: Call out the two different uses of git-branch and fix a typo.
X-Git-Tag: v1.3.0-rc1~22^2~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=dd1811199ed01280f882f9907e743153b4a2c937;p=git.git

Call out the two different uses of git-branch and fix a typo.

Signed-off-by: Jon Loeliger <jdl@jdl.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index 4cd0cb90a..71ecd858a 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -7,16 +7,20 @@ git-branch - Create a new branch, or remove an old one
 
 SYNOPSIS
 --------
-'git-branch' [(-d | -D) <branchname>] | [[-f] <branchname> [<start-point>]]
+[verse]
+'git-branch' [[-f] <branchname> [<start-point>]]
+'git-branch' (-d | -D) <branchname>
 
 DESCRIPTION
 -----------
 If no argument is provided, show available branches and mark current
 branch with star. Otherwise, create a new branch of name <branchname>.
-
 If a starting point is also specified, that will be where the branch is
 created, otherwise it will be created at the current HEAD.
 
+With a `-d` or `-D` option, `<branchname>` will be deleted.
+
+
 OPTIONS
 -------
 -d::
@@ -39,7 +43,7 @@ OPTIONS
 Examples
 ~~~~~~~~
 
-Start development off of a know tag::
+Start development off of a known tag::
 +
 ------------
 $ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6