Merge branch 'dm/color-palette'
[git] / advice.h
1 #ifndef ADVICE_H
2 #define ADVICE_H
3
4 #include "git-compat-util.h"
5
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;
11 extern int advice_detached_head;
12
13 int git_default_advice_config(const char *var, const char *value);
14
15 extern void NORETURN die_resolve_conflict(const char *me);
16
17 #endif /* ADVICE_H */