git-branch.txt: document -f correctly
authorMichael J Gruber <git@drmicha.warpmail.net>
Tue, 17 Mar 2009 14:06:20 +0000 (15:06 +0100)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Mar 2009 22:10:23 +0000 (15:10 -0700)
'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>
Documentation/git-branch.txt
index 6103d62fe3dca23c78b16dbdbb5ba231a6b39bf7..27b73bcf9e0a140eceb32343592d9b2415918e90 100644 (file)
@@ -76,8 +76,8 @@ OPTIONS
        based sha1 expressions such as "<branchname>@\{yesterday}".
 
 -f::
        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.
 
 -m::
        Move/rename a branch and the corresponding reflog.