| Jeff King | 7519443 | 2009-09-09 07:38:58 -0400 | [diff] [blame] | 1 | #ifndef ADVICE_H |
| 2 | #define ADVICE_H |
| 3 | |
| Matthieu Moy | d38a30d | 2010-01-12 10:54:44 +0100 | [diff] [blame] | 4 | #include "git-compat-util.h" |
| 5 | |
| Jeff King | 7519443 | 2009-09-09 07:38:58 -0400 | [diff] [blame] | 6 | extern int advice_push_nonfastforward; |
| Christopher Tiwald | f25950f | 2012-03-20 00:31:33 -0400 | [diff] [blame] | 7 | extern int advice_push_non_ff_current; |
| 8 | extern int advice_push_non_ff_default; |
| 9 | extern int advice_push_non_ff_matching; |
| Jeff King | edf563f | 2009-09-09 07:43:03 -0400 | [diff] [blame] | 10 | extern int advice_status_hints; |
| Matthieu Moy | 4c371f9 | 2009-11-22 23:26:17 +0100 | [diff] [blame] | 11 | extern int advice_commit_before_merge; |
| Matthieu Moy | d38a30d | 2010-01-12 10:54:44 +0100 | [diff] [blame] | 12 | extern int advice_resolve_conflict; |
| Jeff King | b706fcf | 2010-01-13 15:17:08 -0500 | [diff] [blame] | 13 | extern int advice_implicit_identity; |
| Junio C Hamano | 13be3e3 | 2010-01-29 22:03:24 -0800 | [diff] [blame] | 14 | extern int advice_detached_head; |
| Jeff King | 7519443 | 2009-09-09 07:38:58 -0400 | [diff] [blame] | 15 | |
| 16 | int git_default_advice_config(const char *var, const char *value); |
| Ramkumar Ramachandra | 38ef61c | 2011-08-04 16:08:59 +0530 | [diff] [blame] | 17 | void advise(const char *advice, ...); |
| 18 | int error_resolve_conflict(const char *me); |
| Matthieu Moy | d38a30d | 2010-01-12 10:54:44 +0100 | [diff] [blame] | 19 | extern void NORETURN die_resolve_conflict(const char *me); |
| Nguyễn Thái Ngọc Duy | 2857093 | 2012-01-16 16:46:16 +0700 | [diff] [blame] | 20 | void detach_advice(const char *new_name); |
| Matthieu Moy | d38a30d | 2010-01-12 10:54:44 +0100 | [diff] [blame] | 21 | |
| Jeff King | 7519443 | 2009-09-09 07:38:58 -0400 | [diff] [blame] | 22 | #endif /* ADVICE_H */ |
