Merge branch 'jk/mailmap-from-blob'
[git.git] / advice.h
blob8bf63563a5cf1573e0e6bf7ffcd5c55643d3f439
1 #ifndef ADVICE_H
2 #define ADVICE_H
4 #include "git-compat-util.h"
6 extern int advice_push_update_rejected;
7 extern int advice_push_non_ff_current;
8 extern int advice_push_non_ff_default;
9 extern int advice_push_non_ff_matching;
10 extern int advice_push_already_exists;
11 extern int advice_status_hints;
12 extern int advice_commit_before_merge;
13 extern int advice_resolve_conflict;
14 extern int advice_implicit_identity;
15 extern int advice_detached_head;
17 int git_default_advice_config(const char *var, const char *value);
18 void advise(const char *advice, ...);
19 int error_resolve_conflict(const char *me);
20 extern void NORETURN die_resolve_conflict(const char *me);
21 void detach_advice(const char *new_name);
23 #endif /* ADVICE_H */