diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-02-13 21:39:08 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-13 21:39:08 (GMT) |
| commit | 9bc89b17e36db31a54bc3ff16e48b5cb6beb095b (patch) | |
| tree | 160acf5d402bc4a638fbaa5ad7d16dc228e08f88 /environment.c | |
| parent | 8fe806bcd5ac621e22982c73306e94d26e56cf79 (diff) | |
| parent | 8462ff43e42ab67cecd16fdfb59451a53cc8a945 (diff) | |
| download | git-9bc89b17e36db31a54bc3ff16e48b5cb6beb095b.zip git-9bc89b17e36db31a54bc3ff16e48b5cb6beb095b.tar.gz git-9bc89b17e36db31a54bc3ff16e48b5cb6beb095b.tar.bz2 | |
Merge branch 'tb/crlf-conv-flags'
Code clean-up.
* tb/crlf-conv-flags:
convert_to_git(): safe_crlf/checksafe becomes int conv_flags
Diffstat (limited to 'environment.c')
| -rw-r--r-- | environment.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/environment.c b/environment.c index 0adc71e..de8431e 100644 --- a/environment.c +++ b/environment.c @@ -51,7 +51,7 @@ enum auto_crlf auto_crlf = AUTO_CRLF_FALSE; int check_replace_refs = 1; char *git_replace_ref_base; enum eol core_eol = EOL_UNSET; -enum safe_crlf safe_crlf = SAFE_CRLF_WARN; +int global_conv_flags_eol = CONV_EOL_RNDTRP_WARN; unsigned whitespace_rule_cfg = WS_DEFAULT_RULE; enum branch_track git_branch_track = BRANCH_TRACK_REMOTE; enum rebase_setup_type autorebase = AUTOREBASE_NEVER; |