diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-06-21 06:02:49 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-06-21 06:02:49 -0700 |
commit | d5cff17edaf438bbf45a2130e9cadc0c938291d6 (patch) | |
tree | 19acab3f0fbb8fa480cb45a315d0dac2e6f16ab1 /Makefile | |
parent | d249515f297d47df6d79167b988eaa7db0981178 (diff) | |
parent | 942e7747678ecf5f118ea5b2d0c763166de21f3a (diff) | |
download | git-d5cff17edaf438bbf45a2130e9cadc0c938291d6.tar.gz git-d5cff17edaf438bbf45a2130e9cadc0c938291d6.tar.xz |
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
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -233,6 +233,8 @@ all:: # # 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 @@ -1056,6 +1058,7 @@ ifeq ($(uname_S),Windows) NO_CURL = YesPlease NO_PYTHON = YesPlease BLK_SHA1 = YesPlease + NATIVE_CRLF = YesPlease CC = compat/vcbuild/scripts/clink.pl AR = compat/vcbuild/scripts/lib.pl |