Merge branch 'maint'

diff --git a/advice.h b/advice.h
index af0c983c686b9ca5be2e8631562e60bd19656c22..fefe39ac5caf5a1e8b95683a4c8dcc443df16d32 100644 (file)
--- a/advice.h
+++ b/advice.h
@@ -16,6 +16,8 @@ extern int advice_commit_before_merge;
 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;
 
 int git_default_advice_config(const char *var, const char *value);
 void advise(const char *advice, ...);