From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 29 Jul 2019 19:38:22 +0000 (-0700)
Subject: Merge branch 'pw/add-p-recount' into maint
X-Git-Tag: v2.23.0-rc0~1^2~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/689204ca8862a25be7bd7f91a42fbdf46cfb2a56

Merge branch 'pw/add-p-recount' into maint

"git checkout -p" needs to selectively apply a patch in reverse,
which did not work well.

* pw/add-p-recount:
add -p: fix checkout -p with pathological context
---

689204ca8862a25be7bd7f91a42fbdf46cfb2a56