Merge branch 'vr/merge-base-doc' into maint
commit8de43386505b503e25788f75f89802495828e6c0
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 May 2011 23:38:46 +0000 (16 16:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 May 2011 23:38:46 +0000 (16 16:38 -0700)
tree9ab51250b2a9474c7ae872596ea118dddf327a91
parentf7045912f85a1c67f3c997202020dfb26078e978
parentded7e0491b78e3e8384bcd9f63918c52785c4cd6
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
Documentation/git-merge-base.txt