When I fixed the hunk offsets in add -p when hunks are skipped I forgot that the reverse patch case needs to be handled differently. Phillip Wood (1): add -p: fix checkout -p with pathological context git-add--interactive.perl | 6 +++++- t/t3701-add-interactive.sh | 8 ++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) base-commit: aeb582a98374c094361cba1bd756dc6307432c42 Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-262%2Fphillipwood%2Fwip%2Ffix-checkout-p-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-262/phillipwood/wip/fix-checkout-p-v1 Pull-Request: https://github.com/gitgitgadget/git/pull/262 -- gitgitgadget