diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-06-21 06:02:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-21 06:02:49 -0700 |
| commit | d5cff17edaf438bbf45a2130e9cadc0c938291d6 (patch) | |
| tree | 19acab3f0fbb8fa480cb45a315d0dac2e6f16ab1 /blob.h | |
| parent | Merge branch 'fg/autocrlf' (diff) | |
| parent | Add "core.eol" config variable (diff) | |
| download | tgif-d5cff17edaf438bbf45a2130e9cadc0c938291d6.tar.xz | |
Merge branch 'eb/core-eol'
* eb/core-eol:
Add "core.eol" config variable
Rename the "crlf" attribute "text"
Add per-repository eol normalization
Add tests for per-repository eol normalization
Conflicts:
Documentation/config.txt
Makefile
Diffstat (limited to 'blob.h')
0 files changed, 0 insertions, 0 deletions