summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Michael J Gruber <git@drmicha.warpmail.net>2009-03-17 15:06:20 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-03-17 15:10:23 -0700
commitfcfdf797db015e13623645c0be049db679d5daaa (patch)
tree02ae4b2c8d058c65aa2fc300fc5842bb62f8d363
parentpickaxe: count regex matches only once (diff)
downloadtgif-fcfdf797db015e13623645c0be049db679d5daaa.tar.xz
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>
-rw-r--r--Documentation/git-branch.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index 6103d62fe3..27b73bcf9e 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.