Merge branch 'hb/maint-send-email-quote-recipients' into maint

diff --git a/environment.c b/environment.c
index fa3633372b8249899ff1e57a2f1431de029b211d..6739a3f41745fe1c01dc767e09af8746d6f2815f 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -35,7 +35,9 @@ 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;
+enum branch_track git_branch_track = BRANCH_TRACK_REMOTE;
 
 /* This is set by setup_git_dir_gently() and/or git_default_config() */
 char *git_work_tree_cfg;