[PATCH 0/3] git-merge-base -a vs. git-show-branch --merge-base

The two commands above behave differently when more than two commits are given. The purpose of this patch series is to correct and improve the documentation in this regard, and to document the difference in behavior with a test.

1/3 only depicts the DAG of a test which is already present, to make it easier for future test writers (such as that of 3/3).

2/3 cleans up the documentation so that man pages and usage strings for those two commands coincide.

3/3 adds a test case and corrects the documentation with regards to merge bases for more than two commits.

Michael J Gruber (3):
  t6010-merge-base.sh: Depict the octopus test graph
  git-merge-base/git-show-branch: Cleanup documentation and usage
  git-merge-base/git-show-branch --merge-base: Documentation and test

 Documentation/git-merge-base.txt  |    9 +++++++--
 Documentation/git-show-branch.txt |   13 ++++++++-----
 builtin-merge-base.c              |    2 +-
 builtin-show-branch.c             |    6 +++---
 t/t6010-merge-base.sh             |   18 ++++++++++++++++++
 5 files changed, 37 insertions(+), 11 deletions(-)