diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-08-16 12:50:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-08-16 12:50:54 -0700 |
| commit | 72a50fa03bb1f7ab3b7a1473dbfdc1b258f42cb7 (patch) | |
| tree | 04737210830cb20b1d7ef77981f34aa752e30a89 /builtin/commit.c | |
| parent | fca5ece27880b0d4f350d89fdf06e35a927ab547 (diff) | |
| parent | 60cf761ed14298d618597e87e50f25bb61171e84 (diff) | |
Merge branch 'pw/add-patch-with-suppress-blank-empty' into maint-2.46
"git add -p" by users with diff.suppressBlankEmpty set to true
failed to parse the patch that represents an unmodified empty line
with an empty line (not a line with a single space on it), which
has been corrected.
* pw/add-patch-with-suppress-blank-empty:
add-patch: use normalize_marker() when recounting edited hunk
add-patch: handle splitting hunks with diff.suppressBlankEmpty
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions