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 /environment.c | |
| 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 'environment.c')
| -rw-r--r-- | environment.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/environment.c b/environment.c index 3c8abae84..5bafcd83a 100644 --- a/environment.c +++ b/environment.c @@ -40,6 +40,7 @@ const char *editor_program; const char *excludes_file; enum auto_crlf auto_crlf = AUTO_CRLF_FALSE; int read_replace_refs = 1; +enum eol eol = EOL_UNSET; enum safe_crlf safe_crlf = SAFE_CRLF_WARN; unsigned whitespace_rule_cfg = WS_DEFAULT_RULE; enum branch_track git_branch_track = BRANCH_TRACK_REMOTE; |