Merge branch 'jc/diff' into next

diff --git a/environment.c b/environment.c
index 251e53ca09cd00431dc86d2b0931a448764873f8..16c08f06971c25a48fce0784845fa7176ec3f568 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -17,6 +17,7 @@ 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;