summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-12-01 13:58:54 -0800
committerJunio C Hamano <gitster@pobox.com>2007-12-01 13:58:54 -0800
commit5fa00a4dcf5d283c0af50b246b60977c66193c63 (patch)
tree366a867165f16aec0c35c4c61ffaa775f5be2f79 /Documentation
parentc4d48ab5afc34b59582593622ef04da2543573d4 (diff)
parent3f7dfe77b71ff0ae78923518ab5ca28b0cf4d786 (diff)
downloadgit-5fa00a4dcf5d283c0af50b246b60977c66193c63.tar.gz
Merge branch 'jc/branch-contains'
* jc/branch-contains: git-branch --contains: doc and test git-branch --contains=commit parse-options: Allow to hide options from the default usage.
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-branch.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index f87b6968b4..d3f21c7975 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -10,6 +10,7 @@ SYNOPSIS
[verse]
'git-branch' [--color | --no-color] [-r | -a]
[-v [--abbrev=<length> | --no-abbrev]]
+ [--contains <commit>]
'git-branch' [--track | --no-track] [-l] [-f] <branchname> [<start-point>]
'git-branch' (-m | -M) [<oldbranch>] <newbranch>
'git-branch' (-d | -D) [-r] <branchname>...
@@ -20,6 +21,9 @@ With no arguments given a list of existing branches
will be shown, the current branch will be highlighted with an asterisk.
Option `-r` causes the remote-tracking branches to be listed,
and option `-a` shows both.
+With `--contains <commit>`, shows only the branches that
+contains the named commit (in other words, the branches whose
+tip commits are descendant of the named commit).
In its second form, a new branch named <branchname> will be created.
It will start out with a head equal to the one given as <start-point>.