summaryrefslogtreecommitdiff
path: root/builtin-show-branch.c
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 /builtin-show-branch.c
parent995bdc73fe0e28d622af0897440f0ea298345585 (diff)
downloadgit-f621a8454d19d17fe46e6951b7e3d22bebd92aba.tar.gz
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 'builtin-show-branch.c')
-rw-r--r--builtin-show-branch.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-show-branch.c b/builtin-show-branch.c
index 03bdea6863..3510a86e38 100644
--- a/builtin-show-branch.c
+++ b/builtin-show-branch.c
@@ -665,7 +665,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
OPT_BOOLEAN(0, "sha1-name", &sha1_name,
"name commits with their object names"),
OPT_BOOLEAN(0, "merge-base", &merge_base,
- "act like git merge-base -a"),
+ "show possible merge bases"),
OPT_BOOLEAN(0, "independent", &independent,
"show refs unreachable from any other ref"),
OPT_BOOLEAN(0, "topo-order", &lifo,