Staging
v0.5.1
https://github.com/git/git
Raw File
Tip revision: be3fa9125e708348c7baf04ebe9507a72a9d1800 authored by Junio C Hamano on 31 October 2011, 02:14:24 UTC
Git 1.7.8-rc0
Tip revision: be3fa91
advice.h
#ifndef ADVICE_H
#define ADVICE_H

#include "git-compat-util.h"

extern int advice_push_nonfastforward;
extern int advice_status_hints;
extern int advice_commit_before_merge;
extern int advice_resolve_conflict;
extern int advice_implicit_identity;
extern int advice_detached_head;

int git_default_advice_config(const char *var, const char *value);
void advise(const char *advice, ...);
int error_resolve_conflict(const char *me);
extern void NORETURN die_resolve_conflict(const char *me);

#endif /* ADVICE_H */
back to top