[thirdparty/git.git] / advice.h

#ifndef ADVICE_H
#define ADVICE_H

#include "git-compat-util.h"

extern int advice_push_update_rejected;
extern int advice_push_non_ff_current;
extern int advice_push_non_ff_default;
extern int advice_push_non_ff_matching;
extern int advice_push_already_exists;
extern int advice_push_fetch_first;
extern int advice_push_needs_force;
extern int advice_status_hints;
extern int advice_status_u_option;
extern int advice_commit_before_merge;
extern int advice_resolve_conflict;
extern int advice_implicit_identity;
extern int advice_detached_head;
extern int advice_set_upstream_failure;

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);
void detach_advice(const char *new_name);

#endif /* ADVICE_H */
Commit	Line	Data
75194438 JK	1	#ifndef ADVICE_H
	2	#define ADVICE_H
	3
d38a30df MM	4	#include "git-compat-util.h"
d38a30df MM	5
1184564e	6	extern int advice_push_update_rejected;
f25950f3 CT	7	extern int advice_push_non_ff_current;
	8	extern int advice_push_non_ff_default;
	9	extern int advice_push_non_ff_matching;
b4505682	10	extern int advice_push_already_exists;
75e5c0dc JH	11	extern int advice_push_fetch_first;
75e5c0dc JH	12	extern int advice_push_needs_force;
edf563fb	13	extern int advice_status_hints;
6a38ef2c	14	extern int advice_status_u_option;
4c371f91	15	extern int advice_commit_before_merge;
d38a30df	16	extern int advice_resolve_conflict;
b706fcfe	17	extern int advice_implicit_identity;
13be3e31	18	extern int advice_detached_head;
caa2036b	19	extern int advice_set_upstream_failure;
75194438 JK	20
75194438 JK	21	int git_default_advice_config(const char var, const char value);
38ef61cf RR	22	void advise(const char *advice, ...);
38ef61cf RR	23	int error_resolve_conflict(const char *me);
d38a30df	24	extern void NORETURN die_resolve_conflict(const char *me);
2857093b	25	void detach_advice(const char *new_name);
d38a30df	26
75194438	27	#endif /* ADVICE_H */