Merge branch 'jt/http-redact-cookies' into maint
[git.git] / advice.h
blob70568fa7922d8aea403e415f9b9b554a88ace293
1 #ifndef ADVICE_H
2 #define ADVICE_H
4 #include "git-compat-util.h"
6 extern int advice_push_update_rejected;
7 extern int advice_push_non_ff_current;
8 extern int advice_push_non_ff_matching;
9 extern int advice_push_already_exists;
10 extern int advice_push_fetch_first;
11 extern int advice_push_needs_force;
12 extern int advice_status_hints;
13 extern int advice_status_u_option;
14 extern int advice_commit_before_merge;
15 extern int advice_resolve_conflict;
16 extern int advice_implicit_identity;
17 extern int advice_detached_head;
18 extern int advice_set_upstream_failure;
19 extern int advice_object_name_warning;
20 extern int advice_rm_hints;
21 extern int advice_add_embedded_repo;
22 extern int advice_ignored_hook;
23 extern int advice_waiting_for_editor;
25 int git_default_advice_config(const char *var, const char *value);
26 __attribute__((format (printf, 1, 2)))
27 void advise(const char *advice, ...);
28 int error_resolve_conflict(const char *me);
29 extern void NORETURN die_resolve_conflict(const char *me);
30 void NORETURN die_conclude_merge(void);
31 void detach_advice(const char *new_name);
33 #endif /* ADVICE_H */