diff options
Diffstat (limited to 'third_party/git/advice.h')
| -rw-r--r-- | third_party/git/advice.h | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/third_party/git/advice.h b/third_party/git/advice.h new file mode 100644 index 000000000000..0e6e58d9f8f7 --- /dev/null +++ b/third_party/git/advice.h @@ -0,0 +1,45 @@ +#ifndef ADVICE_H +#define ADVICE_H + +#include "git-compat-util.h" + +extern int advice_fetch_show_forced_updates; +extern int advice_push_update_rejected; +extern int advice_push_non_ff_current; +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_push_unqualified_ref_name; +extern int advice_status_hints; +extern int advice_status_u_option; +extern int advice_status_ahead_behind_warning; +extern int advice_commit_before_merge; +extern int advice_reset_quiet_warning; +extern int advice_resolve_conflict; +extern int advice_sequencer_in_use; +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_amworkdir; +extern int advice_rm_hints; +extern int advice_add_embedded_repo; +extern int advice_ignored_hook; +extern int advice_waiting_for_editor; +extern int advice_graft_file_deprecated; +extern int advice_checkout_ambiguous_remote_branch_name; +extern int advice_nested_tag; +extern int advice_submodule_alternate_error_strategy_die; +extern int advice_add_ignored_file; +extern int advice_add_empty_pathspec; + +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); +void NORETURN die_resolve_conflict(const char *me); +void NORETURN die_conclude_merge(void); +void detach_advice(const char *new_name); + +#endif /* ADVICE_H */ |