Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git-branch.txt: document -f correctly
author
Michael J Gruber
<git@drmicha.warpmail.net>
Tue, 17 Mar 2009 14:06:20 +0000
(15:06 +0100)
committer
Junio 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
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
50fd699
)
diff --git
a/Documentation/git-branch.txt
b/Documentation/git-branch.txt
index 6103d62fe3dca23c78b16dbdbb5ba231a6b39bf7..27b73bcf9e0a140eceb32343592d9b2415918e90 100644
(file)
--- 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
+ a
lready. Without `-f` 'git-branch' refuses to change an existing branch
.
-m::
Move/rename a branch and the corresponding reflog.