From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 21 Jun 2010 13:02:49 +0000 (-0700)
Subject: Merge branch 'eb/core-eol'
X-Git-Tag: v1.7.2-rc0~23
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d5cff17edaf438bbf45a2130e9cadc0c938291d6;p=git.git

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

d5cff17edaf438bbf45a2130e9cadc0c938291d6
diff --cc Makefile
index 3dc072fc8,bf5f8a7b0..9aca8a16d
--- a/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