Merge branch 'jc/pull' into next

[git.git] / cache.h

diff --git a/cache.h b/cache.h
index 1f962809b0be75b83abc285d492b62c7e6426623..255e6b5cc7aa799eee892dcd3632cd0656e6dd1e 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -165,6 +165,7 @@ extern void rollback_index_file(struct cache_file *);
 extern int trust_executable_bit;
 extern int assume_unchanged;
 extern int only_use_symrefs;
+extern int warn_ambiguous_refs;
 extern int diff_rename_limit_default;
 extern int shared_repository;
 extern const char *apply_default_whitespace;