Merge branch 'mk/grep-pcre'
[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;
edf563fb 7extern int advice_status_hints;
4c371f91 8extern int advice_commit_before_merge;
d38a30df 9extern int advice_resolve_conflict;
b706fcfe 10extern int advice_implicit_identity;
13be3e31 11extern int advice_detached_head;
75194438
JK
12
13int git_default_advice_config(const char *var, const char *value);
14
d38a30df
MM
15extern void NORETURN die_resolve_conflict(const char *me);
16
75194438 17#endif /* ADVICE_H */