projects / thirdparty / git.git / blame
| 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 | 7 | extern int advice_push_non_ff_current; |
| f25950f3 | 8 | extern int advice_push_non_ff_matching; |
| b4505682 | 9 | extern int advice_push_already_exists; |
| 75e5c0dc JH |
10 | extern int advice_push_fetch_first; |
| 11 | extern int advice_push_needs_force; | |
| edf563fb | 12 | extern int advice_status_hints; |
| 6a38ef2c | 13 | extern int advice_status_u_option; |
| 4c371f91 | 14 | extern int advice_commit_before_merge; |
| d38a30df | 15 | extern int advice_resolve_conflict; |
| b706fcfe | 16 | extern int advice_implicit_identity; |
| 13be3e31 | 17 | extern int advice_detached_head; |
| caa2036b | 18 | extern int advice_set_upstream_failure; |
| 798c35fc | 19 | extern int advice_object_name_warning; |
| 431bb23a | 20 | extern int advice_amworkdir; |
| 7e309446 | 21 | extern int advice_rm_hints; |
| 53213994 | 22 | extern int advice_add_embedded_repo; |
| f805a00a | 23 | extern int advice_ignored_hook; |
| abfb04d0 | 24 | extern int advice_waiting_for_editor; |
| f9f99b3f | 25 | extern int advice_graft_file_deprecated; |
| 75194438 JK |
26 | |
| 27 | int git_default_advice_config(const char *var, const char *value); | |
| 4621085b | 28 | __attribute__((format (printf, 1, 2))) |
| 38ef61cf RR |
29 | void advise(const char *advice, ...); |
| 30 | int error_resolve_conflict(const char *me); | |
| d38a30df | 31 | extern void NORETURN die_resolve_conflict(const char *me); |
| 4a4cf9e8 | 32 | void NORETURN die_conclude_merge(void); |
| 2857093b | 33 | void detach_advice(const char *new_name); |
| d38a30df | 34 | |
| 75194438 | 35 | #endif /* ADVICE_H */ |