Merge branch 'maint'

diff --git a/cache.h b/cache.h
index ab1294d6fbb7f699af160ac06674e54798f3db6c..ff9e145be0a869546d309fb16db651f6b30a70e9 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -554,6 +554,8 @@ extern enum branch_track git_branch_track;
 extern enum rebase_setup_type autorebase;
 extern enum push_default_type push_default;
 
+extern int unreliable_hardlinks;
+
 #define GIT_REPO_VERSION 0
 extern int repository_format_version;
 extern int check_repository_format(void);