diff options
author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-12-06 16:08:25 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-12-06 19:57:34 +0300 |
commit | b4bbbbd5a247e0e75d079bca591b657ec9084a46 (patch) | |
tree | c575eff7b820e1524541268242d8b9965050831b /Makefile | |
parent | 89c8559367aae771006cc0956b6f5e54cc8c614c (diff) |
apply --allow-overlap: fix a corner case
Yes, yes, this is supposed to be only a band-aid option for `git add -p`
not Doing The Right Thing. But as long as we carry the `--allow-overlap`
option, we might just as well get it right.
This fixes the case where one hunk inserts a line before the first line,
and is followed by a hunk whose context overlaps with the first one's
and which appends a line at the end.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions