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)
* vr/merge-base-doc:
  Restructure documentation for git-merge-base.
  Documentation: update to git-merge-base --octopus

1  2 
Documentation/git-merge-base.txt

Simple merge