pull: support pull.ff config
[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
1184564e 6extern int advice_push_update_rejected;
f25950f3 7extern int advice_push_non_ff_current;
f25950f3 8extern int advice_push_non_ff_matching;
b4505682 9extern int advice_push_already_exists;
75e5c0dc
JH
10extern int advice_push_fetch_first;
11extern int advice_push_needs_force;
edf563fb 12extern int advice_status_hints;
6a38ef2c 13extern int advice_status_u_option;
4c371f91 14extern int advice_commit_before_merge;
d38a30df 15extern int advice_resolve_conflict;
b706fcfe 16extern int advice_implicit_identity;
13be3e31 17extern int advice_detached_head;
caa2036b 18extern int advice_set_upstream_failure;
798c35fc 19extern int advice_object_name_warning;
7e309446 20extern int advice_rm_hints;
75194438
JK
21
22int git_default_advice_config(const char *var, const char *value);
4621085b 23__attribute__((format (printf, 1, 2)))
38ef61cf
RR
24void advise(const char *advice, ...);
25int error_resolve_conflict(const char *me);
d38a30df 26extern void NORETURN die_resolve_conflict(const char *me);
2857093b 27void detach_advice(const char *new_name);
d38a30df 28
75194438 29#endif /* ADVICE_H */