Merge branch 'vr/merge-base-doc'
authorJunio C Hamano <gitster@pobox.com>
Wed, 4 May 2011 22:51:37 +0000 (15:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 4 May 2011 22:51:37 +0000 (15:51 -0700)
commit014d298b1d6c7a493e7a4339e8327ae1c8e1d8d9
tree4bdacdfa27f5f3e8027680dcbbbed2fd3a2b429d
parent3340f60483e4ccb74db5d0eb453396322c2962aa
parentded7e0491b78e3e8384bcd9f63918c52785c4cd6
Merge branch 'vr/merge-base-doc'

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