diff --git a/environment.c b/environment.c
index 876c5e53410250b5f2744671e39907c234771af3..81a36824f03203e41702d9df3ee9c1658f1af7e4 100644 (file)
--- a/environment.c
+++ b/environment.c
int pager_use_color = 1;
const char *editor_program;
const char *excludes_file;
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;
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;
enum safe_crlf safe_crlf = SAFE_CRLF_WARN;
unsigned whitespace_rule_cfg = WS_DEFAULT_RULE;
enum branch_track git_branch_track = BRANCH_TRACK_REMOTE;
char *notes_ref_name;
int grafts_replace_parents = 1;
int core_apply_sparse_checkout;
char *notes_ref_name;
int grafts_replace_parents = 1;
int core_apply_sparse_checkout;
+int merge_renormalize;
/* Parallel index stat data preload? */
int core_preload_index = 0;
/* Parallel index stat data preload? */
int core_preload_index = 0;