Merge branch 'sg/t-helper-gitignore'
[git/git.git] / advice.h
CommitLineData
75194438
JK
1#ifndef ADVICE_H
2#define ADVICE_H
3
d38a30df
MM
4#include "git-compat-util.h"
5
377444b4 6extern int advice_fetch_show_forced_updates;
1184564e 7extern int advice_push_update_rejected;
f25950f3 8extern int advice_push_non_ff_current;
f25950f3 9extern int advice_push_non_ff_matching;
b4505682 10extern int advice_push_already_exists;
75e5c0dc
JH
11extern int advice_push_fetch_first;
12extern int advice_push_needs_force;
dd8dd300 13extern int advice_push_unqualified_ref_name;
edf563fb 14extern int advice_status_hints;
6a38ef2c 15extern int advice_status_u_option;
0a53561a 16extern int advice_status_ahead_behind_warning;
4c371f91 17extern int advice_commit_before_merge;
649bf3a4 18extern int advice_reset_quiet_warning;
d38a30df 19extern int advice_resolve_conflict;
6a1f9046 20extern int advice_sequencer_in_use;
b706fcfe 21extern int advice_implicit_identity;
13be3e31 22extern int advice_detached_head;
caa2036b 23extern int advice_set_upstream_failure;
798c35fc 24extern int advice_object_name_warning;
431bb23a 25extern int advice_amworkdir;
7e309446 26extern int advice_rm_hints;
53213994 27extern int advice_add_embedded_repo;
f805a00a 28extern int advice_ignored_hook;
abfb04d0 29extern int advice_waiting_for_editor;
f9f99b3f 30extern int advice_graft_file_deprecated;
ad8d5104 31extern int advice_checkout_ambiguous_remote_branch_name;
eea9c1e7 32extern int advice_nested_tag;
75194438
JK
33
34int git_default_advice_config(const char *var, const char *value);
4621085b 35__attribute__((format (printf, 1, 2)))
38ef61cf
RR
36void advise(const char *advice, ...);
37int error_resolve_conflict(const char *me);
55454427 38void NORETURN die_resolve_conflict(const char *me);
4a4cf9e8 39void NORETURN die_conclude_merge(void);
2857093b 40void detach_advice(const char *new_name);
d38a30df 41
75194438 42#endif /* ADVICE_H */