summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Loeliger <jdl@jdl.com>2006-03-18 00:24:37 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-03-18 04:42:30 (GMT)
commitdd1811199ed01280f882f9907e743153b4a2c937 (patch)
tree083f4525a9e6b6cbfb0f5612f28cbb97f7d806a1
parent55258b5c20d3647f44e1bb3c69e39966b2c07619 (diff)
downloadgit-dd1811199ed01280f882f9907e743153b4a2c937.zip
git-dd1811199ed01280f882f9907e743153b4a2c937.tar.gz
git-dd1811199ed01280f882f9907e743153b4a2c937.tar.bz2
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>
-rw-r--r--Documentation/git-branch.txt10
1 files changed, 7 insertions, 3 deletions
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index 4cd0cb9..71ecd85 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