From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 21 Aug 2008 06:41:38 +0000 (-0700)
Subject: Merge branch 'cc/merge-base-many'
X-Git-Tag: v1.6.1-rc1~334
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0569d7566e07f482ba8e7fa9dc629d987435513a;p=git.git

Merge branch 'cc/merge-base-many'

* cc/merge-base-many:
  git-merge-octopus: use (merge-base A (merge B C D E...)) for stepwise merge
  merge-base-many: add trivial tests based on the documentation
  documentation: merge-base: explain "git merge-base" with more than 2 args
  merge-base: teach "git merge-base" to drive underlying merge_bases_many()
---

0569d7566e07f482ba8e7fa9dc629d987435513a