Code

Merge branch 'eb/core-eol'
authorJunio C Hamano <gitster@pobox.com>
Mon, 21 Jun 2010 13:02:49 +0000 (06:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Jun 2010 13:02:49 +0000 (06:02 -0700)
commitd5cff17edaf438bbf45a2130e9cadc0c938291d6
tree19acab3f0fbb8fa480cb45a315d0dac2e6f16ab1
parentd249515f297d47df6d79167b988eaa7db0981178
parent942e7747678ecf5f118ea5b2d0c763166de21f3a
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
Documentation/config.txt
Documentation/git-cvsserver.txt
Documentation/gitattributes.txt
Makefile
attr.c
cache.h
config.c
convert.c
environment.c
git-cvsserver.perl