aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-show-branch.txt
diff options
context:
space:
mode:
authorMichael J Gruber <git@drmicha.warpmail.net>2009-08-05 09:59:20 +0200
committerJunio C Hamano <gitster@pobox.com>2009-08-05 10:29:37 -0700
commitf621a8454d19d17fe46e6951b7e3d22bebd92aba (patch)
treeaae7fd662daff4819773be4deee37e564c4a0bdf /Documentation/git-show-branch.txt
parent995bdc73fe0e28d622af0897440f0ea298345585 (diff)
downloadgit-f621a8454d19d17fe46e6951b7e3d22bebd92aba.tar.gz
git-f621a8454d19d17fe46e6951b7e3d22bebd92aba.tar.xz
git-merge-base/git-show-branch --merge-base: Documentation and test
Currently, the documentation suggests that 'git merge-base -a' and 'git show-branch --merge-base' are equivalent (in fact it claims that the former cannot handle more than two revs). Alas, the handling of more than two revs is very different. Document this by tests and correct the documentation to reflect this. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-show-branch.txt')
-rw-r--r--Documentation/git-show-branch.txt8
1 files changed, 5 insertions, 3 deletions
diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt
index 2c78c2571..734336119 100644
--- a/Documentation/git-show-branch.txt
+++ b/Documentation/git-show-branch.txt
@@ -82,9 +82,11 @@ OPTIONS
Synonym 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.
+ Instead of showing the commit list, determine possible
+ merge bases for the specified commits. All merge bases
+ will be contained in all specified commits. This is
+ different from how linkgit:git-merge-base[1] handles
+ the case of three or more commits.
--independent::
Among the <reference>s given, display only the ones that