]> git.ipfire.org Git - thirdparty/git.git/blame_incremental - advice.h
Merge branch 'sg/rebase-progress' into maint
[thirdparty/git.git] / advice.h
... / ...
CommitLineData
1#ifndef ADVICE_H
2#define ADVICE_H
3
4#include "git-compat-util.h"
5
6extern int advice_push_update_rejected;
7extern int advice_push_non_ff_current;
8extern int advice_push_non_ff_matching;
9extern int advice_push_already_exists;
10extern int advice_push_fetch_first;
11extern int advice_push_needs_force;
12extern int advice_push_unqualified_ref_name;
13extern int advice_status_hints;
14extern int advice_status_u_option;
15extern int advice_commit_before_merge;
16extern int advice_reset_quiet_warning;
17extern int advice_resolve_conflict;
18extern int advice_implicit_identity;
19extern int advice_detached_head;
20extern int advice_set_upstream_failure;
21extern int advice_object_name_warning;
22extern int advice_amworkdir;
23extern int advice_rm_hints;
24extern int advice_add_embedded_repo;
25extern int advice_ignored_hook;
26extern int advice_waiting_for_editor;
27extern int advice_graft_file_deprecated;
28extern int advice_checkout_ambiguous_remote_branch_name;
29extern int advice_nested_tag;
30
31int git_default_advice_config(const char *var, const char *value);
32__attribute__((format (printf, 1, 2)))
33void advise(const char *advice, ...);
34int error_resolve_conflict(const char *me);
35void NORETURN die_resolve_conflict(const char *me);
36void NORETURN die_conclude_merge(void);
37void detach_advice(const char *new_name);
38
39#endif /* ADVICE_H */