Merge branch 'js/fsmonitor-unflake'

diff --git a/advice.h b/advice.h
index 4a2052eecfb59852f0ade33d142387c09eb7d897..e50f02cdfeff788910699f2d34fff1c93081c24b 100644 (file)
--- a/advice.h
+++ b/advice.h
@@ -26,6 +26,7 @@ extern int advice_ignored_hook;
 extern int advice_waiting_for_editor;
 extern int advice_graft_file_deprecated;
 extern int advice_checkout_ambiguous_remote_branch_name;
+extern int advice_nested_tag;
 
 int git_default_advice_config(const char *var, const char *value);
 __attribute__((format (printf, 1, 2)))