X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-branch.txt;h=d20b4757358d7927f114de4a816e912ba67553fc;hb=8e76c79f4a1e66ed8e371d1232e879f45141dce1;hp=a7121a4c632da21a6e00f5f53d136969ac8b9804;hpb=1301c6eb412e7c5511b952a12e42c70ad56f028b;p=git.git diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index a7121a4c..d20b4757 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' [ [start-point]] +'git-branch' [-d | -D] [ [start-point]] DESCRIPTION ----------- @@ -19,11 +19,44 @@ 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. + :: - 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. + + +Examples +~~~~~~~~ + +Start development off of a know tag:: ++ +------------ +$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6 +$ cd my2.6 +$ git branch my2.6.14 v2.6.14 <1> +$ git checkout my2.6.14 + +<1> These two steps are the same as "checkout -b my2.6.14 v2.6.14". +------------ + +Delete unneeded branch:: ++ +------------ +$ git clone git://git.kernel.org/.../git.git my.git +$ cd my.git +$ git branch -D todo <1> + +<1> delete todo branch even if the "master" branch does not have all +commits from todo branch. +------------ Author ------