diff options
Diffstat (limited to 'advice.h')
-rw-r--r-- | advice.h | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -8,9 +8,11 @@ extern int advice_status_hints; extern int advice_commit_before_merge; extern int advice_resolve_conflict; extern int advice_implicit_identity; +extern int advice_detached_head; int git_default_advice_config(const char *var, const char *value); - +void advise(const char *advice, ...); +int error_resolve_conflict(const char *me); extern void NORETURN die_resolve_conflict(const char *me); #endif /* ADVICE_H */ |