diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2009-10-09 05:18:58 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-10-09 14:50:21 -0700 |
| commit | 58d2c961b310d9366dd193f2d95d7eae56edecec (patch) | |
| tree | 3681d8134a2a47199f42c3d861473bd621efe52e /Documentation/git-branch.txt | |
| parent | 25dcc0d64b9f3c11abcd0f53a9b9cdb6092ed646 (diff) | |
| download | git-58d2c961b310d9366dd193f2d95d7eae56edecec.tar.gz | |
Documentation: branch: update --merged description
Update the documentation for --merged and --no-merged to explain
the meaning of the optional parameter introduced in commit 049716b
(branch --merged/--no-merged: allow specifying arbitrary commit,
2008-07-08).
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-branch.txt')
| -rw-r--r-- | Documentation/git-branch.txt | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index aad71dc59a..f34911fe9a 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.txt @@ -134,11 +134,13 @@ start-point is either a local or remote branch. --contains <commit>:: Only list branches which contain the specified commit. ---merged:: - Only list branches which are fully contained by HEAD. +--merged [<commit>]:: + Only list branches whose tips are reachable from the + specified commit (HEAD if not specified). ---no-merged:: - Do not list branches which are fully contained by HEAD. +--no-merged [<commit>]:: + Only list branches whose tips are not reachable from the + specified commit (HEAD if not specified). <branchname>:: The name of the branch to create or delete. |