aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-branch.txt
diff options
context:
space:
mode:
authorAndreas Ericsson <exon@op5.se>2005-11-14 17:53:42 +0100
committerJunio C Hamano <junkio@cox.net>2005-11-14 14:16:37 -0800
commitd4072c9722d1ef28abe8ef0eb0b244017fff3f42 (patch)
treeaf23f685308b0bd366565c419fda010ee28559f7 /Documentation/git-branch.txt
parentb6ebac9e4316cd5d35c2c24f83f1eb51ce17beb9 (diff)
downloadgit-d4072c9722d1ef28abe8ef0eb0b244017fff3f42.tar.gz
git-d4072c9722d1ef28abe8ef0eb0b244017fff3f42.tar.xz
git-branch: Mention -d and -D in man-page.
Signed-off-by: Andreas Ericsson <ae@op5.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-branch.txt')
-rw-r--r--Documentation/git-branch.txt15
1 files changed, 11 insertions, 4 deletions
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index a7121a4c6..98014f6d9 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -3,11 +3,11 @@ git-branch(1)
NAME
----
-git-branch - Create a new branch.
+git-branch - Create a new branch, or remove an old one.
SYNOPSIS
--------
-'git-branch' [<branchname> [start-point]]
+'git-branch' [-d | -D] [<branchname> [start-point]]
DESCRIPTION
-----------
@@ -19,11 +19,18 @@ created, otherwise it will be created at the current HEAD.
OPTIONS
-------
+-d::
+ Delete a branch. The branch must be fully merged.
+
+-D::
+ Delete a branch irrespective of its index status.
+
<branchname>::
- The name of the branch to create.
+ The name of the branch to create or delete.
start-point::
- Where to create the branch; defaults to HEAD.
+ Where to create the branch; defaults to HEAD. This
+ option has no meaning with -d and -D.
Author
------