Merge branch 'jk/merge-base-fork-point-without-reflog'
commit92657ea597310c05b8f4ac3496ba90496286b5d6
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2016 20:14:46 +0000 (26 13:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2016 20:14:47 +0000 (26 13:14 -0700)
treecf35cd3a6b4108807c68357a50be3a5e193c3c80
parentcaabffaf375d0f4b9195a04e9141852229ee5aee
parent4f21454b55f4237b7d0487ad5099c9edf4fc3967
Merge branch 'jk/merge-base-fork-point-without-reflog'

"git rebase" immediately after "git clone" failed to find the fork
point from the upstream.

* jk/merge-base-fork-point-without-reflog:
  merge-base: handle --fork-point without reflog
t/t6010-merge-base.sh