advice.h 1.25 KB
Newer Older
1 2 3
#ifndef ADVICE_H
#define ADVICE_H

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

6
extern int advice_push_update_rejected;
7 8
extern int advice_push_non_ff_current;
extern int advice_push_non_ff_matching;
9
extern int advice_push_already_exists;
10 11
extern int advice_push_fetch_first;
extern int advice_push_needs_force;
12
extern int advice_push_unqualified_ref_name;
13
extern int advice_status_hints;
14
extern int advice_status_u_option;
15
extern int advice_commit_before_merge;
16
extern int advice_reset_quiet_warning;
17
extern int advice_resolve_conflict;
18
extern int advice_implicit_identity;
19
extern int advice_detached_head;
20
extern int advice_set_upstream_failure;
21
extern int advice_object_name_warning;
22
extern int advice_amworkdir;
23
extern int advice_rm_hints;
24
extern int advice_add_embedded_repo;
25
extern int advice_ignored_hook;
26
extern int advice_waiting_for_editor;
27
extern int advice_graft_file_deprecated;
28
extern int advice_checkout_ambiguous_remote_branch_name;
29 30

int git_default_advice_config(const char *var, const char *value);
31
__attribute__((format (printf, 1, 2)))
32 33
void advise(const char *advice, ...);
int error_resolve_conflict(const char *me);
34
extern void NORETURN die_resolve_conflict(const char *me);
35
void NORETURN die_conclude_merge(void);
36
void detach_advice(const char *new_name);
37

38
#endif /* ADVICE_H */