global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-04-05 06:20:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'eb/core-eol' into next

Browse Source 
* 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
This commit is contained in:
Junio C Hamano
2010-06-17 08:27:57 -07:00
parent cb81c35430 942e774767
commit 66b0c9f89f
12 changed files with 570 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

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