]>
Commit | Line | Data |
---|---|---|
75194438 JK |
1 | #ifndef ADVICE_H |
2 | #define ADVICE_H | |
3 | ||
d38a30df MM |
4 | #include "git-compat-util.h" |
5 | ||
1184564e | 6 | extern int advice_push_update_rejected; |
f25950f3 CT |
7 | extern int advice_push_non_ff_current; |
8 | extern int advice_push_non_ff_default; | |
9 | extern int advice_push_non_ff_matching; | |
b4505682 | 10 | extern int advice_push_already_exists; |
75e5c0dc JH |
11 | extern int advice_push_fetch_first; |
12 | extern int advice_push_needs_force; | |
edf563fb | 13 | extern int advice_status_hints; |
6a38ef2c | 14 | extern int advice_status_u_option; |
4c371f91 | 15 | extern int advice_commit_before_merge; |
d38a30df | 16 | extern int advice_resolve_conflict; |
b706fcfe | 17 | extern int advice_implicit_identity; |
13be3e31 | 18 | extern int advice_detached_head; |
caa2036b | 19 | extern int advice_set_upstream_failure; |
798c35fc | 20 | extern int advice_object_name_warning; |
7e309446 | 21 | extern int advice_rm_hints; |
75194438 JK |
22 | |
23 | int git_default_advice_config(const char *var, const char *value); | |
4621085b | 24 | __attribute__((format (printf, 1, 2))) |
38ef61cf RR |
25 | void advise(const char *advice, ...); |
26 | int error_resolve_conflict(const char *me); | |
d38a30df | 27 | extern void NORETURN die_resolve_conflict(const char *me); |
2857093b | 28 | void detach_advice(const char *new_name); |
d38a30df | 29 | |
75194438 | 30 | #endif /* ADVICE_H */ |