[thirdparty/git.git] / advice.h

#ifndef ADVICE_H
#define ADVICE_H

#include "git-compat-util.h"

extern int advice_push_nonfastforward;
extern int advice_push_non_ff_current;
extern int advice_push_non_ff_default;
extern int advice_push_non_ff_matching;
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);
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
75194438	6	extern int advice_push_nonfastforward;
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;
edf563fb	10	extern int advice_status_hints;
4c371f91	11	extern int advice_commit_before_merge;
d38a30df	12	extern int advice_resolve_conflict;
b706fcfe	13	extern int advice_implicit_identity;
13be3e31	14	extern int advice_detached_head;
75194438 JK	15
75194438 JK	16	int git_default_advice_config(const char var, const char value);
38ef61cf RR	17	void advise(const char *advice, ...);
38ef61cf RR	18	int error_resolve_conflict(const char *me);
d38a30df	19	extern void NORETURN die_resolve_conflict(const char *me);
2857093b	20	void detach_advice(const char *new_name);
d38a30df	21
75194438	22	#endif /* ADVICE_H */