summaryrefslogtreecommitdiff
path: root/Documentation/git-branch.txt
diff options
context:
space:
mode:
authorQuy Tonthat <qtonthat@gmail.com>2006-12-21 04:18:07 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-12-21 04:36:42 (GMT)
commit7dda22e3174dd6e4b8b2f60fb0ad1e8f1be912ad (patch)
tree61c0992375766d37ff2c13dc2976803fba5e4bb5 /Documentation/git-branch.txt
parentc902c9a608c1b727160d6fbb04fa363d9418cd00 (diff)
downloadgit-7dda22e3174dd6e4b8b2f60fb0ad1e8f1be912ad.zip
git-7dda22e3174dd6e4b8b2f60fb0ad1e8f1be912ad.tar.gz
git-7dda22e3174dd6e4b8b2f60fb0ad1e8f1be912ad.tar.bz2
Documentation/git-branch: new -r to delete remote-tracking branches.
Signed-off-by: Quy Tonthat <qtonthat@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-branch.txt')
-rw-r--r--Documentation/git-branch.txt13
1 files changed, 8 insertions, 5 deletions
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index 71417fe..c464bd2 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -11,7 +11,7 @@ SYNOPSIS
'git-branch' [-r | -a] [-v [--abbrev=<length>]]
'git-branch' [-l] [-f] <branchname> [<start-point>]
'git-branch' (-m | -M) [<oldbranch>] <newbranch>
-'git-branch' (-d | -D) <branchname>...
+'git-branch' (-d | -D) [-r] <branchname>...
DESCRIPTION
-----------
@@ -33,7 +33,8 @@ to happen.
With a `-d` or `-D` option, `<branchname>` will be deleted. You may
specify more than one branch for deletion. If the branch currently
-has a ref log then the ref log will also be deleted.
+has a ref log then the ref log will also be deleted. Use -r together with -d
+to delete remote-tracking branches.
OPTIONS
@@ -60,7 +61,7 @@ OPTIONS
Move/rename a branch even if the new branchname already exists.
-r::
- List the remote-tracking branches.
+ List or delete (if used with -d) the remote-tracking branches.
-a::
List both remote-tracking branches and local branches.
@@ -111,10 +112,12 @@ Delete unneeded branch::
------------
$ git clone git://git.kernel.org/.../git.git my.git
$ cd my.git
-$ git branch -D todo <1>
+$ git branch -d -r todo html man <1>
+$ git branch -D test <2>
------------
+
-<1> delete todo branch even if the "master" branch does not have all
+<1> delete remote-tracking branches "todo", "html", "man"
+<2> delete "test" branch even if the "master" branch does not have all
commits from todo branch.