Merge branch 'cc/bisect'

diff --git a/environment.c b/environment.c
index 4892a302bd77c038a79a11935e21d556ede494cb..4fcb471248fb5276a68b9f86a77a2f5cde7dd884 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -11,9 +11,11 @@
 
 char git_default_email[MAX_GITNAME];
 char git_default_name[MAX_GITNAME];
+int user_ident_explicitly_given;
 int trust_executable_bit = 1;
 int quote_path_fully = 1;
 int has_symlinks = 1;
+int ignore_case;
 int assume_unchanged;
 int prefer_symlink_refs;
 int is_bare_repository_cfg = -1; /* unspecified */