Revision cd0887327544ecdc8778e16219aec3f43b0dd682 authored by Junio C Hamano on 05 May 2017, 04:08:54 UTC, committed by Junio C Hamano on 05 May 2017, 04:08:54 UTC
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent a8d93d1
advice.h
#ifndef ADVICE_H
#define ADVICE_H
#include "git-compat-util.h"
extern int advice_push_update_rejected;
extern int advice_push_non_ff_current;
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);
void NORETURN die_conclude_merge(void);
void detach_advice(const char *new_name);
#endif /* ADVICE_H */
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...