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

diff --cc Documentation/config.txt
Simple merge

diff --cc Documentation/git-cvsserver.txt
Simple merge

diff --cc Documentation/gitattributes.txt
Simple merge

diff --cc Makefile
index 3dc072fc8162be1b1d57db207a976b8b78928f04,bf5f8a7b0e8520e2f1b493ad357cb832d3502dca..9aca8a16d955e904b4a8f07e70fba754ac65fcc3
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -227,12 -215,7 +227,14 @@@ all:
  #   DEFAULT_EDITOR='$GIT_FALLBACK_EDITOR',
  #   DEFAULT_EDITOR='"C:\Program Files\Vim\gvim.exe" --nofork'
  #
 +# Define COMPUTE_HEADER_DEPENDENCIES if your compiler supports the -MMD option
 +# and you want to avoid rebuilding objects when an unrelated header file
 +# changes.
 +#
 +# Define CHECK_HEADER_DEPENDENCIES to check for problems in the hard-coded
 +# dependency rules.
++#
+ # Define NATIVE_CRLF if your platform uses CRLF for line endings.
  
  GIT-VERSION-FILE: FORCE
        @$(SHELL_PATH) ./GIT-VERSION-GEN

diff --cc attr.c
Simple merge

diff --cc cache.h
Simple merge

diff --cc config.c
Simple merge

diff --cc convert.c
Simple merge

diff --cc environment.c
Simple merge

diff --cc git-cvsserver.perl
Simple merge