| commit | 73b690a634b7065471144e0b97c74f30cef2acef | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 3 Mar 2015 22:37:02 +0000 (3 14:37 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 3 Mar 2015 22:37:02 +0000 (3 14:37 -0800) | ||
| tree | 00fbe2ce60815b2eff4852199745cd0e74f852a4 | treesnapshot (tar.gz zip) |
| parent | 71f19cce36103dce545e647e707be2e9a474139a | commitdiff |
| parent | 0a80bc9f13bf4373778e787b3a050f5b784faf30 | commitdiff |
Merge branch 'jc/apply-ws-fix-expands-report'
"git apply --whitespace=fix" fixed whitespace errors in the common
context lines but did so without reporting.
* jc/apply-ws-fix-expands-report:
apply: detect and mark whitespace errors in context lines when fixing
"git apply --whitespace=fix" fixed whitespace errors in the common
context lines but did so without reporting.
* jc/apply-ws-fix-expands-report:
apply: detect and mark whitespace errors in context lines when fixing
| builtin/apply.c | diff1 | diff2 | blobhistory |