projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge fixes up to GIT 1.1.6
[git.git]
/
Documentation
/
git-branch.txt
diff --git
a/Documentation/git-branch.txt
b/Documentation/git-branch.txt
index
d20b475
..
b1bc827
100644
(file)
--- a/
Documentation/git-branch.txt
+++ b/
Documentation/git-branch.txt
@@
-7,7
+7,7
@@
git-branch - Create a new branch, or remove an old one.
SYNOPSIS
--------
SYNOPSIS
--------
-'git-branch' [
-d | -D] [<branchname> [start-point
]]
+'git-branch' [
(-d | -D) <branchname>] | [[-f] <branchname> [<start-point>
]]
DESCRIPTION
-----------
DESCRIPTION
-----------
@@
-25,10
+25,13
@@
OPTIONS
-D::
Delete a branch irrespective of its index status.
-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.
<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.
Where to create the branch; defaults to HEAD. This
option has no meaning with -d and -D.