Merge branch 'pw/add-p-recount' into maint
commit689204ca8862a25be7bd7f91a42fbdf46cfb2a56
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Jul 2019 19:38:22 +0000 (29 12:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Jul 2019 19:38:22 +0000 (29 12:38 -0700)
tree3e889b66f7d0b4d43ceb072e17ac527807d5ac67
parent0324b6f035a19f0098c321a7e6e17c04e9405be2
parent2bd69b9024c8c7c1b77060e3ed996c74b4775b01
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
git-add--interactive.perl
t/t3701-add-interactive.sh