X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=environment.c;h=81a36824f03203e41702d9df3ee9c1658f1af7e4;hb=43dd2332853b2460a5252b0f43d8de3c5b545b9a;hp=876c5e53410250b5f2744671e39907c234771af3;hpb=3fea3139c252298f6d79a405f889f05859b9c47d;p=git.git

diff --git a/environment.c b/environment.c
index 876c5e534..81a36824f 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;
@@ -52,6 +53,7 @@ enum object_creation_mode object_creation_mode = OBJECT_CREATION_MODE;
 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;