]> git.ipfire.org Git - thirdparty/git.git/blame - advice.h
git-submodule.sh: shorten submodule SHA-1s using rev-parse
[thirdparty/git.git] / advice.h
CommitLineData
75194438
JK
1#ifndef ADVICE_H
2#define ADVICE_H
3
d38a30df
MM
4#include "git-compat-util.h"
5
1184564e 6extern int advice_push_update_rejected;
f25950f3 7extern int advice_push_non_ff_current;
f25950f3 8extern int advice_push_non_ff_matching;
b4505682 9extern int advice_push_already_exists;
75e5c0dc
JH
10extern int advice_push_fetch_first;
11extern int advice_push_needs_force;
edf563fb 12extern int advice_status_hints;
6a38ef2c 13extern int advice_status_u_option;
4c371f91 14extern int advice_commit_before_merge;
649bf3a4 15extern int advice_reset_quiet_warning;
d38a30df 16extern int advice_resolve_conflict;
b706fcfe 17extern int advice_implicit_identity;
13be3e31 18extern int advice_detached_head;
caa2036b 19extern int advice_set_upstream_failure;
798c35fc 20extern int advice_object_name_warning;
431bb23a 21extern int advice_amworkdir;
7e309446 22extern int advice_rm_hints;
53213994 23extern int advice_add_embedded_repo;
f805a00a 24extern int advice_ignored_hook;
abfb04d0 25extern int advice_waiting_for_editor;
f9f99b3f 26extern int advice_graft_file_deprecated;
ad8d5104 27extern int advice_checkout_ambiguous_remote_branch_name;
75194438
JK
28
29int git_default_advice_config(const char *var, const char *value);
4621085b 30__attribute__((format (printf, 1, 2)))
38ef61cf
RR
31void advise(const char *advice, ...);
32int error_resolve_conflict(const char *me);
d38a30df 33extern void NORETURN die_resolve_conflict(const char *me);
4a4cf9e8 34void NORETURN die_conclude_merge(void);
2857093b 35void detach_advice(const char *new_name);
d38a30df 36
75194438 37#endif /* ADVICE_H */