diff options
| author |  Fredrik Kuivinen <freku045@student.liu.se> | 2006-01-29 15:02:51 +0100 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2006-01-29 15:00:46 -0800 |
| commit | 075dd8ee5417899c9f41b90f0dceecdf85433468 (patch) | |
| tree | 2dc2cb7f68a4cc447664e90c494e06b222d9f546 | |
| parent | merge-recursive: Improve the error message printed when merge(1) isn't found. (diff) | |
| download | tgif-075dd8ee5417899c9f41b90f0dceecdf85433468.tar.xz | |
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.txt | 7 | ||||
| -rwxr-xr-x | git-branch.sh | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index d20b475735..b1bc8272eb 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 b0e54ed2af..6ac961e6d1 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>.' |