git status: document trade-offs in choosing parameters to the -u option
[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
75194438 6extern int advice_push_nonfastforward;
f25950f3
CT
7extern int advice_push_non_ff_current;
8extern int advice_push_non_ff_default;
9extern int advice_push_non_ff_matching;
edf563fb 10extern int advice_status_hints;
4c371f91 11extern int advice_commit_before_merge;
d38a30df 12extern int advice_resolve_conflict;
b706fcfe 13extern int advice_implicit_identity;
13be3e31 14extern int advice_detached_head;
75194438
JK
15
16int git_default_advice_config(const char *var, const char *value);
38ef61cf
RR
17void advise(const char *advice, ...);
18int error_resolve_conflict(const char *me);
d38a30df 19extern void NORETURN die_resolve_conflict(const char *me);
2857093b 20void detach_advice(const char *new_name);
d38a30df 21
75194438 22#endif /* ADVICE_H */