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 /environment.c | |
| parent | d249515f297d47df6d79167b988eaa7db0981178 (diff) | |
| parent | 942e7747678ecf5f118ea5b2d0c763166de21f3a (diff) | |
| download | git-d5cff17edaf438bbf45a2130e9cadc0c938291d6.tar.gz | |
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 'environment.c')
| -rw-r--r-- | environment.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/environment.c b/environment.c index 876c5e5341..83d38d3c23 100644 --- a/environment.c +++ b/environment.c @@ -38,8 +38,9 @@ const char *pager_program; int pager_use_color = 1; const char *editor_program; const char *excludes_file; -int auto_crlf = 0; /* 1: both ways, -1: only when adding git objects */ +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; |