Merge branch 'bw/doc-submodule-recurse-config-with-clone'

diff --git a/environment.c b/environment.c
index 0adc71ebe54eb9914a9c1292e2cd22f42bbc47c4..de8431e01e7f4a2168e35df2dfa5695d3c810210 100644 (file)
--- 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;