Sync with 1.8.1.5
[git/jnareb-git.git] / advice.h
blobfad36df467f065bf7ff7a82d9d447ee4ac5cecb9
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_push_fetch_first;
12 extern int advice_push_needs_force;
13 extern int advice_status_hints;
14 extern int advice_commit_before_merge;
15 extern int advice_resolve_conflict;
16 extern int advice_implicit_identity;
17 extern int advice_detached_head;
19 int git_default_advice_config(const char *var, const char *value);
20 void advise(const char *advice, ...);
21 int error_resolve_conflict(const char *me);
22 extern void NORETURN die_resolve_conflict(const char *me);
23 void detach_advice(const char *new_name);
25 #endif /* ADVICE_H */