From 58d2c961b310d9366dd193f2d95d7eae56edecec Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Fri, 9 Oct 2009 05:18:58 -0500 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- Documentation/git-branch.txt | 10 ++++++---- 1 file 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 :: 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 []:: + Only list branches whose tips are not reachable from the + specified commit (HEAD if not specified). :: The name of the branch to create or delete. -- 2.11.4.GIT