status: show more info than "currently not on any branch"

diff --git a/advice.h b/advice.h
index e9df8e026c301767b12217ba0374860a15742f2e..8bf63563a5cf1573e0e6bf7ffcd5c55643d3f439 100644 (file)
--- a/advice.h
+++ b/advice.h
@@ -1,9 +1,23 @@
 #ifndef ADVICE_H
 #define ADVICE_H
 
-extern int advice_push_nonfastforward;
+#include "git-compat-util.h"
+
+extern int advice_push_update_rejected;
+extern int advice_push_non_ff_current;
+extern int advice_push_non_ff_default;
+extern int advice_push_non_ff_matching;
+extern int advice_push_already_exists;
 extern int advice_status_hints;
+extern int advice_commit_before_merge;
+extern int advice_resolve_conflict;
+extern int advice_implicit_identity;
+extern int advice_detached_head;
 
 int git_default_advice_config(const char *var, const char *value);
+void advise(const char *advice, ...);
+int error_resolve_conflict(const char *me);
+extern void NORETURN die_resolve_conflict(const char *me);
+void detach_advice(const char *new_name);
 
 #endif /* ADVICE_H */