Merge branch 'jc/diff' into next

[git.git] / Documentation / git-branch.txt

diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index d20b475..4cd0cb9 100644 (file)
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -3,11 +3,11 @@ git-branch(1)
 
 NAME
 ----
-git-branch - Create a new branch, or remove an old one.
+git-branch - Create a new branch, or remove an old one
 
 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.