diff options
| author | Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com> | 2010-06-04 19:29:08 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-07 04:20:04 (GMT) |
| commit | 942e7747678ecf5f118ea5b2d0c763166de21f3a (patch) | |
| tree | 0e5f1e1e72682b183831d0ee76485b6b09e0df41 /Makefile | |
| parent | 5ec3e67052289217c84e53d2cda90d939ac5725b (diff) | |
| download | git-942e7747678ecf5f118ea5b2d0c763166de21f3a.zip git-942e7747678ecf5f118ea5b2d0c763166de21f3a.tar.gz git-942e7747678ecf5f118ea5b2d0c763166de21f3a.tar.bz2 | |
Add "core.eol" config variable
Introduce a new configuration variable, "core.eol", that allows the user
to set which line endings to use for end-of-line-normalized files in the
working directory. It defaults to "native", which means CRLF on Windows
and LF everywhere else.
Note that "core.autocrlf" overrides core.eol. This means that
[core]
autocrlf = true
puts CRLFs in the working directory even if core.eol is set to "lf".
Signed-off-by: Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -214,6 +214,8 @@ all:: # DEFAULT_EDITOR='~/bin/vi', # DEFAULT_EDITOR='$GIT_FALLBACK_EDITOR', # DEFAULT_EDITOR='"C:\Program Files\Vim\gvim.exe" --nofork' +# +# Define NATIVE_CRLF if your platform uses CRLF for line endings. GIT-VERSION-FILE: FORCE @$(SHELL_PATH) ./GIT-VERSION-GEN @@ -947,6 +949,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 |