Merge branch 'master' of git://git.kernel.org/pub/scm/git/git
[git/jnareb-git.git] / advice.h
blobf3cdbbf29e570e151b2b6b329ee9a9940ae59a98
1 #ifndef ADVICE_H
2 #define ADVICE_H
4 #include "git-compat-util.h"
6 extern int advice_push_nonfastforward;
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_status_hints;
11 extern int advice_commit_before_merge;
12 extern int advice_resolve_conflict;
13 extern int advice_implicit_identity;
14 extern int advice_detached_head;
16 int git_default_advice_config(const char *var, const char *value);
17 void advise(const char *advice, ...);
18 int error_resolve_conflict(const char *me);
19 extern void NORETURN die_resolve_conflict(const char *me);
20 void detach_advice(const char *new_name);
22 #endif /* ADVICE_H */