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)
* 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

1  2 
Documentation/config.txt
Documentation/git-cvsserver.txt
Documentation/gitattributes.txt
Makefile
attr.c
cache.h
config.c
convert.c
environment.c
git-cvsserver.perl

Simple merge
Simple merge
Simple merge
diff --cc 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
Simple merge