]> granicus.if.org Git - git/commit
Merge branch 'jk/merge-base-fork-point-without-reflog' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 28 Oct 2016 16:01:17 +0000 (09:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 28 Oct 2016 16:01:17 +0000 (09:01 -0700)
commit96ec83ce5207be0aac3c1df1ac92356f9de9ad81
tree2fd2924a0023333772153f04fe654fbd8641e5b3
parenta5406125cc3989a7007d4fad7e5757cdb9837ebf
parent4f21454b55f4237b7d0487ad5099c9edf4fc3967
Merge branch 'jk/merge-base-fork-point-without-reflog' into maint

"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