4 #include "git-compat-util.h"
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_resolve_conflict
;
16 extern int advice_implicit_identity
;
17 extern int advice_detached_head
;
18 extern int advice_set_upstream_failure
;
19 extern int advice_object_name_warning
;
20 extern int advice_rm_hints
;
22 int git_default_advice_config(const char *var
, const char *value
);
23 __attribute__((format (printf
, 1, 2)))
24 void advise(const char *advice
, ...);
25 int error_resolve_conflict(const char *me
);
26 extern void NORETURN
die_resolve_conflict(const char *me
);
27 void NORETURN
die_conclude_merge(void);
28 void detach_advice(const char *new_name
);