]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: caabffa 4f21454)
Merge branch 'jk/merge-base-fork-point-without-reflog'
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2016 20:14:46 +0000 (13:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2016 20:14:47 +0000 (13:14 -0700)
"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

1  2 
t/t6010-merge-base.sh patch | diff1 | diff2 | blob | history

diff --cc t/t6010-merge-base.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.