Merge branch 'jc/diff' into next

diff --git a/environment.c b/environment.c
index 0886ad38f94ddb897629d832160333921ac89481..16c08f06971c25a48fce0784845fa7176ec3f568 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -12,9 +12,12 @@
 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 repository_format_version = 0;
 char git_commit_encoding[MAX_ENCODING_LENGTH] = "utf-8";
+int shared_repository = 0;
+const char *apply_default_whitespace = NULL;
 
 static char *git_dir, *git_object_dir, *git_index_file, *git_refs_dir,
        *git_graft_file;