Merge branch 'eb/mailinfo' into next

diff --git a/environment.c b/environment.c
index 5d29b92bd5fe65ecad1efbec66c810cdcd523113..2e79eab18d322b61e783f45758fdbdc5210de13c 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -13,8 +13,9 @@ char git_default_email[MAX_GITNAME];
 char git_default_name[MAX_GITNAME];
 int trust_executable_bit = 1;
 int assume_unchanged = 0;
-int only_use_symrefs = 0;
-int warn_ambiguous_refs = 0;
+int prefer_symlink_refs = 0;
+int log_all_ref_updates = 0;
+int warn_ambiguous_refs = 1;
 int repository_format_version = 0;
 char git_commit_encoding[MAX_ENCODING_LENGTH] = "utf-8";
 int shared_repository = 0;