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 4cd0cb90ad0f47765dc1a326a343d0619977308f..71ecd858aad06b88cd459af15751fd2b604c3271 100644 (file)
--- 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
 --------
 
 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>.
 
 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.
 
 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::
 OPTIONS
 -------
 -d::


@@ -39,7 +43,7 @@ OPTIONS
 Examples
 ~~~~~~~~
 
 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
 +
 ------------
 $ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6