projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Rewrite read-tree
[git.git]
/
Documentation
/
git-show-branch.txt
diff --git
a/Documentation/git-show-branch.txt
b/Documentation/git-show-branch.txt
index
cc7da30
..
39e0682
100644
(file)
--- 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
--------
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
-----------
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
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.
--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
------
OUTPUT
------