Merge branch 'jk/gcc-function-attributes'
[git/git.git] / advice.h
index d4c1764..08fbc8e 100644 (file)
--- a/advice.h
+++ b/advice.h
@@ -17,6 +17,8 @@ extern int advice_resolve_conflict;
 extern int advice_implicit_identity;
 extern int advice_detached_head;
 extern int advice_set_upstream_failure;
+extern int advice_object_name_warning;
+extern int advice_rm_hints;
 
 int git_default_advice_config(const char *var, const char *value);
 __attribute__((format (printf, 1, 2)))