| commit | d5a4164140c52a2d267d90e2413d1fe4a326a386 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 24 Nov 2007 04:14:20 +0000 (23 20:14 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 25 Nov 2007 00:47:08 +0000 (24 16:47 -0800) | ||
| tree | 5d122def3266d8e14fdffbc629351000030f1609 | treesnapshot (tar.gz zip) |
| parent | 81bf96bb2ecb8c869cc365a7fee2c4d2e937a43c | commitdiff |
builtin-apply: teach whitespace_rules
We earlier introduced core.whitespace to allow users to tweak the
definition of what the "whitespace errors" are, for the purpose of diff
output highlighting. This teaches the same to git-apply, so that the
command can both detect (when --whitespace=warn option is given) and fix
(when --whitespace=fix option is given) as configured.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
We earlier introduced core.whitespace to allow users to tweak the
definition of what the "whitespace errors" are, for the purpose of diff
output highlighting. This teaches the same to git-apply, so that the
command can both detect (when --whitespace=warn option is given) and fix
(when --whitespace=fix option is given) as configured.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin-apply.c | diffblobblamehistory | |
| t/t4124-apply-ws-rule.sh | [new file with mode: 0755] | blob |