From: Jonathan Nieder Date: Fri, 09 Oct 2009 10:18:58 GMT Subject: [PATCH 6/9] Documentation: branch: update --merged description Message-ID: <20091009101858.GF16558@progeny.tock> In-Reply-To: <20091009101400.GA16549@progeny.tock> 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 --- 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 aad71dc..e8b32a2 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 :: Only list branches which contain the specified commit. ---merged:: - Only list branches which are fully contained by HEAD. +--merged []:: + 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 []:: + Do not list branches whose tips are reachable from the + specified commit (HEAD if not specified). :: The name of the branch to create or delete. -- 1.6.5.rc1.199.g596ec