Andrew's git / gitweb.git / diff
?
Merge branch 'vr/merge-base-doc' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 May 2011 23:38:46 +0000 (16:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 May 2011 23:38:46 +0000 (16:38 -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 patch | diff1 | diff2 | blob | history
diff --cc Documentation/git-merge-base.txt
Simple merge