git-branch: Documentation fixes

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index d20b4757358d7927f114de4a816e912ba67553fc..b1bc8272ebf11fae564b435e7d812adb6e14a976 100644 (file)
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -7,7 +7,7 @@ git-branch - Create a new branch, or remove an old one.
 
 SYNOPSIS
 --------
 
 SYNOPSIS
 --------

-'git-branch' [-d | -D] [<branchname> [start-point]]
+'git-branch' [(-d | -D) <branchname>] | [[-f] <branchname> [<start-point>]]

 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------


@@ -25,10 +25,13 @@ OPTIONS
 -D::
        Delete a branch irrespective of its index status.
 
 -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.
 
 <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.
 
        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 b0e54ed2af9dbf06e79b7230a62029ee2ee8a269..6ac961e6d18b8419abdaa5ed57a55ef58f7bc0fb 100755 (executable)
--- a/git-branch.sh
+++ b/git-branch.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 #!/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>.'
 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>.'