From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 27 Oct 2020 22:09:50 +0000 (-0700)
Subject: Merge branch 'dl/checkout-p-merge-base'
X-Git-Tag: v2.30.0-rc0~151
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f3cfeb3078ce4af0ac764515795f7e0849a88931;p=thirdparty%2Fgit.git

Merge branch 'dl/checkout-p-merge-base'

"git checkout -p A...B [-- <path>]" did not work, even though the
same command without "-p" correctly used the merge-base between
commits A and B.

* dl/checkout-p-merge-base:
  t2016: add a NEEDSWORK about the PERL prerequisite
  add-patch: add NEEDSWORK about comparing commits
  Doc: document "A...B" form for <tree-ish> in checkout and switch
  builtin/checkout: fix `git checkout -p HEAD...` bug
---

f3cfeb3078ce4af0ac764515795f7e0849a88931