advice.h 673 字节
Newer Older
1 2 3
#ifndef ADVICE_H
#define ADVICE_H

4 5
#include "git-compat-util.h"

6
extern int advice_push_nonfastforward;
7 8 9
extern int advice_push_non_ff_current;
extern int advice_push_non_ff_default;
extern int advice_push_non_ff_matching;
10
extern int advice_status_hints;
11
extern int advice_commit_before_merge;
12
extern int advice_resolve_conflict;
13
extern int advice_implicit_identity;
14
extern int advice_detached_head;
15 16

int git_default_advice_config(const char *var, const char *value);
17 18
void advise(const char *advice, ...);
int error_resolve_conflict(const char *me);
19
extern void NORETURN die_resolve_conflict(const char *me);
20
void detach_advice(const char *new_name);
21

22
#endif /* ADVICE_H */