| commit | f008cef4abb2a4db766b4a152b304aca91a0101a | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 3 Jun 2014 19:06:40 +0000 (3 12:06 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 3 Jun 2014 19:06:40 +0000 (3 12:06 -0700) | ||
| tree | 67c1722488c99d9f56aedcc8ae52fad3558e413e | treesnapshot (tar.gz zip) |
| parent | 52df9173fa9b409a96c02a62b06d2b19f4ff5d0f | commitdiff |
| parent | 14d3bb4955a41e146b6f1cd6571602a6b46b2af9 | commitdiff |
Merge branch 'jc/apply-ignore-whitespace'
"--ignore-space-change" option of "git apply" ignored the
spaces at the beginning of line too aggressively, which is
inconsistent with the option of the same name "diff" and "git diff"
have.
* jc/apply-ignore-whitespace:
apply --ignore-space-change: lines with and without leading whitespaces do not match
"--ignore-space-change" option of "git apply" ignored the
spaces at the beginning of line too aggressively, which is
inconsistent with the option of the same name "diff" and "git diff"
have.
* jc/apply-ignore-whitespace:
apply --ignore-space-change: lines with and without leading whitespaces do not match
| builtin/apply.c | diff1 | diff2 | blobhistory |