diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-02-16 17:59:20 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-16 17:59:20 -0800 |
| commit | 2ac4b4b2228f3ef996db7b07aea74c4b1a796f38 (patch) | |
| tree | 245c7610f3a42fef9d63a883a281dc8e3efffe8a /environment.c | |
| parent | 990732609ce735c482e571ad95767edf1d693b41 (diff) | |
| parent | 21e5ad50fc5e7277c74cfbb3cf6502468e840f86 (diff) | |
| download | git-2ac4b4b2228f3ef996db7b07aea74c4b1a796f38.tar.gz git-2ac4b4b2228f3ef996db7b07aea74c4b1a796f38.tar.xz | |
Merge branch 'sp/safecrlf'
* sp/safecrlf:
safecrlf: Add mechanism to warn about irreversible crlf conversions
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 fa3633372..3527f1663 100644 --- a/environment.c +++ b/environment.c @@ -35,6 +35,7 @@ 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 safe_crlf safe_crlf = SAFE_CRLF_WARN; unsigned whitespace_rule_cfg = WS_DEFAULT_RULE; /* This is set by setup_git_dir_gently() and/or git_default_config() */ |