]>
Commit | Line | Data |
---|---|---|
1 | #ifndef ADVICE_H | |
2 | #define ADVICE_H | |
3 | ||
4 | #include "git-compat-util.h" | |
5 | ||
6 | extern int advice_push_update_rejected; | |
7 | extern int advice_push_non_ff_current; | |
8 | extern int advice_push_non_ff_default; | |
9 | extern int advice_push_non_ff_matching; | |
10 | extern int advice_push_already_exists; | |
11 | extern int advice_push_fetch_first; | |
12 | extern int advice_push_needs_force; | |
13 | extern int advice_status_hints; | |
14 | extern int advice_status_u_option; | |
15 | extern int advice_commit_before_merge; | |
16 | extern int advice_resolve_conflict; | |
17 | extern int advice_implicit_identity; | |
18 | extern int advice_detached_head; | |
19 | extern int advice_set_upstream_failure; | |
20 | ||
21 | int git_default_advice_config(const char *var, const char *value); | |
22 | void advise(const char *advice, ...); | |
23 | int error_resolve_conflict(const char *me); | |
24 | extern void NORETURN die_resolve_conflict(const char *me); | |
25 | void detach_advice(const char *new_name); | |
26 | ||
27 | #endif /* ADVICE_H */ |