Merge branch 'jc/merge-reword'
[git/jrn.git] / advice.h
blob3244ebb5c1caffebaaf8f28ce221533c38ec29b5
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;
11 extern int advice_detached_head;
13 int git_default_advice_config(const char *var, const char *value);
15 extern void NORETURN die_resolve_conflict(const char *me);
17 #endif /* ADVICE_H */