Andrew's git / gitweb.git / diff
?
git-branch: Mention -d and -D in man-page.
authorAndreas Ericsson <exon@op5.se>
Mon, 14 Nov 2005 16:53:42 +0000 (17:53 +0100)
committerJunio C Hamano <junkio@cox.net>
Mon, 14 Nov 2005 22:16:37 +0000 (14:16 -0800)
Signed-off-by: Andreas Ericsson <ae@op5.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/git-branch.txt patch | blob | history
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index a7121a4c632da21a6e00f5f53d136969ac8b9804..98014f6d9bb23c90e9f4c8eb5e8b12313b522a58 100644 (file)
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -3,11 +3,11 @@ git-branch(1)
 
 NAME
 ----
 
 NAME
 ----
-git-branch - Create a new branch.
+git-branch - Create a new branch, or remove an old one.
 
 SYNOPSIS
 --------
 
 SYNOPSIS
 --------
-'git-branch' [<branchname> [start-point]]
+'git-branch' [-d | -D] [<branchname> [start-point]]
 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------
@@ -19,11 +19,18 @@ created, otherwise it will be created at the current HEAD.
 
 OPTIONS
 -------
 
 OPTIONS
 -------
+-d::
+       Delete a branch. The branch must be fully merged.
+
+-D::
+       Delete a branch irrespective of its index status.
+
 <branchname>::
 <branchname>::
-       The name of the branch to create.
+       The name of the branch to create or delete.
 
 start-point::
 
 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
 ------
 
 Author
 ------