Merge branch 'jc/mv' into next

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