diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-06-28 12:53:32 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-06-28 12:53:32 -0700 |
commit | 5eb8da850860839bdf38ab80079eb8875b764431 (patch) | |
tree | a2156eaf3bd403dd7b1ac4e78412dba283fa78fa /git-gui/.gitignore | |
parent | 0079732e960dc20ab2a68043d5593de358f1377f (diff) | |
parent | f4d35a6b49621348c73222e7017a434551799308 (diff) | |
download | git-5eb8da850860839bdf38ab80079eb8875b764431.tar.gz |
Merge branch 'pw/add-p-recount'
When user edits the patch in "git add -p" and the user's editor is
set to strip trailing whitespaces indiscriminately, an empty line
that is unchanged in the patch would become completely empty
(instead of a line with a sole SP on it). The code introduced in
Git 2.17 timeframe failed to parse such a patch, but now it learned
to notice the situation and cope with it.
* pw/add-p-recount:
add -p: fix counting empty context lines in edited patches
Diffstat (limited to 'git-gui/.gitignore')
0 files changed, 0 insertions, 0 deletions