diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-04-15 20:35:45 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-15 20:35:45 (GMT) |
| commit | 201ac8efc79668353281583629aa15ac7f36e843 (patch) | |
| tree | 47e2fb942f76d24d329ad6b61f8ff23a9df44c02 /xdiff-interface.c | |
| parent | 8c701249d2257699c19822b528c101668abc55b9 (diff) | |
| download | git-201ac8efc79668353281583629aa15ac7f36e843.zip git-201ac8efc79668353281583629aa15ac7f36e843.tar.gz git-201ac8efc79668353281583629aa15ac7f36e843.tar.bz2 | |
Fix 'crlf' attribute semantics.
Earlier we said 'crlf lets the path go through core.autocrlf
process while !crlf disables it altogether'. This fixes the
semantics to:
- Lack of 'crlf' attribute makes core.autocrlf to apply
(i.e. we guess based on the contents and if platform
expresses its desire to have CRLF line endings via
core.autocrlf, we do so).
- Setting 'crlf' attribute to true forces CRLF line endings in
working tree files, even if blob does not look like text
(e.g. contains NUL or other bytes we consider binary).
- Setting 'crlf' attribute to false disables conversion.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'xdiff-interface.c')
0 files changed, 0 insertions, 0 deletions