From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 16 May 2011 23:38:46 +0000 (-0700)
Subject: Merge branch 'vr/merge-base-doc' into maint
X-Git-Tag: v1.7.5.2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8de43386505b503e25788f75f89802495828e6c0;p=thirdparty%2Fgit.git

Merge branch 'vr/merge-base-doc' into maint

* vr/merge-base-doc:
  Restructure documentation for git-merge-base.
  Documentation: update to git-merge-base --octopus
---

8de43386505b503e25788f75f89802495828e6c0