diff options
author | Nicolas Zingilé <nicolas.zingile@open.eurogiciel.org> | 2014-11-17 17:01:18 +0100 |
---|---|---|
committer | Nicolas Zingilé <nicolas.zingile@open.eurogiciel.org> | 2014-11-17 17:01:18 +0100 |
commit | 98e3d8faf9eebd382f62a75c886b7e1c6a20279b (patch) | |
tree | 756eb3879157731cb1c2b50f35a744aad8b8796d /advice.h | |
parent | ee5a57bc5c5641c30bc626892ddc31ddd18ed7ad (diff) | |
download | git-98e3d8faf9eebd382f62a75c886b7e1c6a20279b.tar.gz git-98e3d8faf9eebd382f62a75c886b7e1c6a20279b.tar.bz2 git-98e3d8faf9eebd382f62a75c886b7e1c6a20279b.zip |
Imported Upstream version 2.0.1upstream/2.0.1
Diffstat (limited to 'advice.h')
-rw-r--r-- | advice.h | 11 |
1 files changed, 9 insertions, 2 deletions
@@ -3,17 +3,24 @@ #include "git-compat-util.h" -extern int advice_push_nonfastforward; +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; +extern int advice_object_name_warning; +extern int advice_rm_hints; int git_default_advice_config(const char *var, const char *value); +__attribute__((format (printf, 1, 2))) void advise(const char *advice, ...); int error_resolve_conflict(const char *me); extern void NORETURN die_resolve_conflict(const char *me); |