| commit | 66b0c9f89f75d261f350ff13dde17efbc01ccbb3 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 17 Jun 2010 15:27:57 +0000 (17 08:27 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 17 Jun 2010 15:27:57 +0000 (17 08:27 -0700) | ||
| tree | 89f628bfb35c87b34c54ff24d331ef2486808a11 | treesnapshot (tar.gz zip) |
| parent | cb81c354309f72a8c59b7a0a51cfc311b2ea1d05 | commitdiff |
| parent | 942e7747678ecf5f118ea5b2d0c763166de21f3a | commitdiff |
Merge branch 'eb/core-eol' into next
* 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
* 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