From: Fredrik Kuivinen <freku045@student.liu.se>
Date: Sun, 29 Jan 2006 14:02:51 GMT
Subject: [PATCH] git-branch: Documentation fixes
Message-ID: <20060129140251.GD4815@c165.ib.student.liu.se>

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>


---

 Documentation/git-branch.txt |    7 +++++--
 git-branch.sh                |    2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

fb625f143454671bfa6862ee83fbe9cdbac9af0b
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index d20b475..b1bc827 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -7,7 +7,7 @@ git-branch - Create a new branch, or rem
 
 SYNOPSIS
 --------
-'git-branch' [-d | -D] [<branchname> [start-point]]
+'git-branch' [(-d | -D) <branchname>] | [[-f] <branchname> [<start-point>]]
 
 DESCRIPTION
 -----------
@@ -25,10 +25,13 @@ OPTIONS
 -D::
 	Delete a branch irrespective of its index status.
 
+-f::
+	Force a reset of <branchname> to <start-point> (or current head).
+
 <branchname>::
 	The name of the branch to create or delete.
 
-start-point::
+<start-point>::
 	Where to create the branch; defaults to HEAD. This
 	option has no meaning with -d and -D.
 
diff --git a/git-branch.sh b/git-branch.sh
index b0e54ed..6ac961e 100755
--- a/git-branch.sh
+++ b/git-branch.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-USAGE='[-d <branch>] | [[-f] <branch> [start-point]]'
+USAGE='[(-d | -D) <branchname>] | [[-f] <branchname> [<start-point>]]'
 LONG_USAGE='If no arguments, show available branches and mark current branch with a star.
 If one argument, create a new branch <branchname> based off of current HEAD.
 If two arguments, create a new branch <branchname> based off of <start-point>.'
-- 
0.99.9k.g3480-dirty