diff options
author | Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com> | 2010-06-04 21:29:08 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-06-06 21:20:04 -0700 |
commit | 942e7747678ecf5f118ea5b2d0c763166de21f3a (patch) | |
tree | 0e5f1e1e72682b183831d0ee76485b6b09e0df41 /cache.h | |
parent | 5ec3e67052289217c84e53d2cda90d939ac5725b (diff) | |
download | git-942e7747678ecf5f118ea5b2d0c763166de21f3a.tar.gz git-942e7747678ecf5f118ea5b2d0c763166de21f3a.tar.xz |
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 'cache.h')
-rw-r--r-- | cache.h | 13 |
1 files changed, 13 insertions, 0 deletions
@@ -556,6 +556,19 @@ enum auto_crlf { extern enum auto_crlf auto_crlf; +enum eol { + EOL_UNSET, + EOL_CRLF, + EOL_LF, +#ifdef NATIVE_CRLF + EOL_NATIVE = EOL_CRLF +#else + EOL_NATIVE = EOL_LF +#endif +}; + +extern enum eol eol; + enum branch_track { BRANCH_TRACK_UNSPECIFIED = -1, BRANCH_TRACK_NEVER = 0, |