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/lib | |
| parent | Merge branch 'jk/fetch-all-peeled-fix' (diff) | |
| parent | add -p: fix counting empty context lines in edited patches (diff) | |
| download | tgif-5eb8da850860839bdf38ab80079eb8875b764431.tar.xz | |
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/lib')
0 files changed, 0 insertions, 0 deletions