| commit | f621a8454d19d17fe46e6951b7e3d22bebd92aba | |
| author | Michael J Gruber <git@drmicha.warpmail.net> | |
| Wed, 5 Aug 2009 07:59:20 +0000 (5 09:59 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 Aug 2009 17:29:37 +0000 (5 10:29 -0700) | ||
| tree | aae7fd662daff4819773be4deee37e564c4a0bdf | treesnapshot (tar.gz zip) |
| parent | 995bdc73fe0e28d622af0897440f0ea298345585 | commitdiff |
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>
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>
| Documentation/git-merge-base.txt | diffblobblamehistory | |
| Documentation/git-show-branch.txt | diffblobblamehistory | |
| builtin-show-branch.c | diffblobblamehistory | |
| t/t6010-merge-base.sh | diffblobblamehistory |