summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFredrik Kuivinen <freku045@student.liu.se>2006-01-29 14:02:51 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-01-29 23:00:46 (GMT)
commit075dd8ee5417899c9f41b90f0dceecdf85433468 (patch)
tree2dc2cb7f68a4cc447664e90c494e06b222d9f546
parent4353f386166d74fd96cb552900fc22f6df211c21 (diff)
downloadgit-075dd8ee5417899c9f41b90f0dceecdf85433468.zip
git-075dd8ee5417899c9f41b90f0dceecdf85433468.tar.gz
git-075dd8ee5417899c9f41b90f0dceecdf85433468.tar.bz2
git-branch: Documentation fixes
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--Documentation/git-branch.txt7
-rwxr-xr-xgit-branch.sh2
2 files changed, 6 insertions, 3 deletions
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index d20b475..b1bc827 100644
--- 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
--------
-'git-branch' [-d | -D] [<branchname> [start-point]]
+'git-branch' [(-d | -D) <branchname>] | [[-f] <branchname> [<start-point>]]
DESCRIPTION
-----------
@@ -25,10 +25,13 @@ OPTIONS
-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.
-start-point::
+<start-point>::
Where to create the branch; defaults to HEAD. This
option has no meaning with -d and -D.
diff --git a/git-branch.sh b/git-branch.sh
index b0e54ed..6ac961e 100755
--- a/git-branch.sh
+++ b/git-branch.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-USAGE='[-d <branch>] | [[-f] <branch> [start-point]]'
+USAGE='[(-d | -D) <branchname>] | [[-f] <branchname> [<start-point>]]'
LONG_USAGE='If no arguments, show available branches and mark current branch with a star.
If one argument, create a new branch <branchname> based off of current HEAD.
If two arguments, create a new branch <branchname> based off of <start-point>.'