summaryrefslogtreecommitdiff
path: root/advice.h
diff options
context:
space:
mode:
Diffstat (limited to 'advice.h')
-rw-r--r--advice.h11
1 files changed, 9 insertions, 2 deletions
diff --git a/advice.h b/advice.h
index f3cdbbf29e..5ecc6c154e 100644
--- a/advice.h
+++ b/advice.h
@@ -3,17 +3,24 @@
#include "git-compat-util.h"
-extern int advice_push_nonfastforward;
+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_push_fetch_first;
+extern int advice_push_needs_force;
extern int advice_status_hints;
+extern int advice_status_u_option;
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;
+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);