Merge branch 'master' of github.com:git/git into git-po-master
[git.git] / advice.h
blob0e6e58d9f8f79df4b4f6ae242cf1fb0a7d179d1b
1 #ifndef ADVICE_H
2 #define ADVICE_H
4 #include "git-compat-util.h"
6 extern int advice_fetch_show_forced_updates;
7 extern int advice_push_update_rejected;
8 extern int advice_push_non_ff_current;
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_push_unqualified_ref_name;
14 extern int advice_status_hints;
15 extern int advice_status_u_option;
16 extern int advice_status_ahead_behind_warning;
17 extern int advice_commit_before_merge;
18 extern int advice_reset_quiet_warning;
19 extern int advice_resolve_conflict;
20 extern int advice_sequencer_in_use;
21 extern int advice_implicit_identity;
22 extern int advice_detached_head;
23 extern int advice_set_upstream_failure;
24 extern int advice_object_name_warning;
25 extern int advice_amworkdir;
26 extern int advice_rm_hints;
27 extern int advice_add_embedded_repo;
28 extern int advice_ignored_hook;
29 extern int advice_waiting_for_editor;
30 extern int advice_graft_file_deprecated;
31 extern int advice_checkout_ambiguous_remote_branch_name;
32 extern int advice_nested_tag;
33 extern int advice_submodule_alternate_error_strategy_die;
34 extern int advice_add_ignored_file;
35 extern int advice_add_empty_pathspec;
37 int git_default_advice_config(const char *var, const char *value);
38 __attribute__((format (printf, 1, 2)))
39 void advise(const char *advice, ...);
40 int error_resolve_conflict(const char *me);
41 void NORETURN die_resolve_conflict(const char *me);
42 void NORETURN die_conclude_merge(void);
43 void detach_advice(const char *new_name);
45 #endif /* ADVICE_H */