summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-09-09 22:40:45 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-09-09 23:35:53 (GMT)
commit1f8af483df5ea7070c421489eff40ca8e508b778 (patch)
tree605c37e067defadc4ba556ba2f16c304c757c9c2 /Documentation
parenta9ab586a5db015d200dfdadcf5876d62f15dd36c (diff)
downloadgit-1f8af483df5ea7070c421489eff40ca8e508b778.zip
git-1f8af483df5ea7070c421489eff40ca8e508b778.tar.gz
git-1f8af483df5ea7070c421489eff40ca8e508b778.tar.bz2
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 <junkio@cox.net>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-show-branch.txt16
1 files changed, 14 insertions, 2 deletions
diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt
index cc7da30..39e0682 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=<n>] [--merge-base] <reference>...'
+'git show-branch [--all] [--heads] [--tags] [--more=<n> | --list | --independent | --merge-base] <reference>...'
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 <n> more common commits
- beyond that.
+ beyond that. When <n> is negative, display only the
+ <reference>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 <reference>s given, display only the ones that
+ cannot be reached from any other <reference>.
+
+Note that --more, --list, --independent and --merge-base options
+are mutually exclusive.
+
OUTPUT
------