diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-07-31 13:34:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-07-31 13:34:17 -0700 |
| commit | d71121c060dc1a76cb5be1674e4f719f5c58136e (patch) | |
| tree | b9ce9ca630f467d8c67876e4d0a777a079d5f497 /builtin/commit.c | |
| parent | 2794ac123d2d0498878d8e47ff4a2e1675557317 (diff) | |
| parent | 60cf761ed14298d618597e87e50f25bb61171e84 (diff) | |
Merge branch 'pw/add-patch-with-suppress-blank-empty'
"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