| commit | c122c9a968d5528b799fd5aeab8e67fffb45ef4d | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 25 Jun 2014 18:46:23 +0000 (25 11:46 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 25 Jun 2014 18:46:23 +0000 (25 11:46 -0700) | ||
| tree | bd71efe988e971408b48572a23b9032540465d05 | treesnapshot (tar.gz zip) |
| parent | ff7e96b78f3ad9db61fbdfdeaf7b71f254f76310 | commitdiff |
| parent | 14d3bb4955a41e146b6f1cd6571602a6b46b2af9 | commitdiff |
Merge branch 'jc/apply-ignore-whitespace' into maint
"--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 |