Merge branch 'maint-1.6.6' into maint
[tgit.git] / advice.h
blob9b7a3ad1ca126cb882e87d400820043043061f78
1 #ifndef ADVICE_H
2 #define ADVICE_H
4 #include "git-compat-util.h"
6 extern int advice_push_nonfastforward;
7 extern int advice_status_hints;
8 extern int advice_commit_before_merge;
9 extern int advice_resolve_conflict;
10 extern int advice_implicit_identity;
12 int git_default_advice_config(const char *var, const char *value);
14 extern void NORETURN die_resolve_conflict(const char *me);
16 #endif /* ADVICE_H */