git-p4: handle update of moved/copied files when updating a shelve
[git] / advice.h
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_matching;
9 extern int advice_push_already_exists;
10 extern int advice_push_fetch_first;
11 extern int advice_push_needs_force;
12 extern int advice_status_hints;
13 extern int advice_status_u_option;
14 extern int advice_commit_before_merge;
15 extern int advice_reset_quiet_warning;
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 extern int advice_object_name_warning;
21 extern int advice_amworkdir;
22 extern int advice_rm_hints;
23 extern int advice_add_embedded_repo;
24 extern int advice_ignored_hook;
25 extern int advice_waiting_for_editor;
26 extern int advice_graft_file_deprecated;
27 extern int advice_checkout_ambiguous_remote_branch_name;
28
29 int git_default_advice_config(const char *var, const char *value);
30 __attribute__((format (printf, 1, 2)))
31 void advise(const char *advice, ...);
32 int error_resolve_conflict(const char *me);
33 extern void NORETURN die_resolve_conflict(const char *me);
34 void NORETURN die_conclude_merge(void);
35 void detach_advice(const char *new_name);
36
37 #endif /* ADVICE_H */