Merge branch 'es/rebase-i-no-abbrev' into maint

diff --git a/advice.h b/advice.h
index 94caa32f9213f59a627176ec8b4aea022f6b0f8f..08fbc8ee3ce79f265bbe15b63e2ae561ee8a0857 100644 (file)
--- a/advice.h
+++ b/advice.h
@@ -17,8 +17,11 @@ 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)))
 void advise(const char *advice, ...);
 int error_resolve_conflict(const char *me);
 extern void NORETURN die_resolve_conflict(const char *me);