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

diff --cc git-add--interactive.perl
Simple merge

diff --cc t/t3701-add-interactive.sh
Simple merge