| commit | c14b9d1e330a7f68ffd0ad7e22d6148c6097c122 | |
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | |
| Fri, 27 Jun 2008 17:43:09 +0000 (27 18:43 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 28 Jun 2008 08:19:42 +0000 (28 01:19 -0700) | ||
| tree | 2d25c5e478182d4677e6f21f5592a425f138858d | treesnapshot (tar.gz zip) |
| parent | d54467b8c319571b5dc433b1f7e471c4b0f21caf | commitdiff |
Allow git-apply to recount the lines in a hunk (AKA recountdiff)
Sometimes, the easiest way to fix up a patch is to edit it directly, even
adding or deleting lines. Now, many people are not as divine as certain
benevolent dictators as to update the hunk headers correctly at the first
try.
So teach the tool to do it for us.
[jc: with tests]
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sometimes, the easiest way to fix up a patch is to edit it directly, even
adding or deleting lines. Now, many people are not as divine as certain
benevolent dictators as to update the hunk headers correctly at the first
try.
So teach the tool to do it for us.
[jc: with tests]
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/git-apply.txt | diffblobblamehistory | |
| builtin-apply.c | diffblobblamehistory | |
| t/t4100-apply-stat.sh | diffblobblamehistory |