push: Provide situational hints for non-fast-forward errors
[git/git.git] / advice.h
... / ...
CommitLineData
1#ifndef ADVICE_H
2#define ADVICE_H
3
4#include "git-compat-util.h"
5
6extern int advice_push_nonfastforward;
7extern int advice_push_non_ff_current;
8extern int advice_push_non_ff_default;
9extern int advice_push_non_ff_matching;
10extern int advice_status_hints;
11extern int advice_commit_before_merge;
12extern int advice_resolve_conflict;
13extern int advice_implicit_identity;
14extern int advice_detached_head;
15
16int git_default_advice_config(const char *var, const char *value);
17void advise(const char *advice, ...);
18int error_resolve_conflict(const char *me);
19extern void NORETURN die_resolve_conflict(const char *me);
20void detach_advice(const char *new_name);
21
22#endif /* ADVICE_H */