From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 9 Jul 2019 22:25:37 +0000 (-0700)
Subject: Merge branch 'pw/add-p-recount'
X-Git-Tag: v2.23.0-rc0~84
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1b074e15d0f976be2bc14f9528874a841c055213

Merge branch 'pw/add-p-recount'

"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
---

1b074e15d0f976be2bc14f9528874a841c055213