From: Phillip Wood <phillip.wood@xxxxxxxxxxxxx> While working on a patch series to stage selected lines from a hunk without having to edit it I got worried that subsequent patches would be applied in the wrong place which lead to this series to correct the offsets of hunks following those that are skipped or edited. Phillip Wood (4): add -i: add function to format hunk header t3701: add failing test for pathological context lines add -p: Adjust offsets of subsequent hunks when one is skipped add -p: calculate offset delta for edited patches git-add--interactive.perl | 93 +++++++++++++++++++++++++++++++++++----------- t/t3701-add-interactive.sh | 30 +++++++++++++++ 2 files changed, 102 insertions(+), 21 deletions(-) -- 2.16.1