From 1f8af483df5ea7070c421489eff40ca8e508b778 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 9 Sep 2005 15:40:45 -0700 Subject: show-branch: --list and --independent The --list option is what 'git branch' without parameter should have been; it shows the one-line commit message for each branch name. The --independent option is used to filter out commits that can be reachable from other commits, to make detection of fast forward condition in multi-head merge easier. Signed-off-by: Junio C Hamano --- Documentation/git-show-branch.txt | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'Documentation') diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt index cc7da30873..39e0682ee7 100644 --- a/Documentation/git-show-branch.txt +++ b/Documentation/git-show-branch.txt @@ -8,7 +8,7 @@ git-show-branch - Show branches and their commits. SYNOPSIS -------- -'git show-branch [--all] [--heads] [--tags] [--more=] [--merge-base] ...' +'git show-branch [--all] [--heads] [--tags] [--more= | --list | --independent | --merge-base] ...' DESCRIPTION ----------- @@ -29,13 +29,25 @@ OPTIONS Usually the command stops output upon showing the commit that is the common ancestor of all the branches. This flag tells the command to go more common commits - beyond that. + beyond that. When is negative, display only the + s given, without showing the commit ancestry + tree. + +--list:: + Synomym to `--more=-1` --merge-base:: Instead of showing the commit list, just act like the 'git-merge-base -a' command, except that it can accept more than two heads. +--independent:: + Among the s given, display only the ones that + cannot be reached from any other . + +Note that --more, --list, --independent and --merge-base options +are mutually exclusive. + OUTPUT ------ -- cgit v1.2.3