From: Michael J Gruber <git@drmicha.warpmail.net>
Date: Tue, 17 Mar 2009 14:06:20 +0000 (+0100)
Subject: git-branch.txt: document -f correctly
X-Git-Tag: v1.6.3-rc0~150
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fcfdf797db015e13623645c0be049db679d5daaa;p=git.git

git-branch.txt: document -f correctly

'git branch -f a b' resets a to b when a exists, rather then deleting a.
Say so in the documentation.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index 6103d62fe..27b73bcf9 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -76,8 +76,8 @@ OPTIONS
 	based sha1 expressions such as "<branchname>@\{yesterday}".
 
 -f::
-	Force the creation of a new branch even if it means deleting
-	a branch that already exists with the same name.
+	Reset <branchname> to <startpoint> if <branchname> exists
+	already. Without `-f` 'git-branch' refuses to change an existing branch.
 
 -m::
 	Move/rename a branch and the corresponding reflog.