Skip to main content

Browse the archive

Staging
v0.5.1
Revision 8a90438506d3b7c8ef8bd802b7ed10c1f12da1d0 authored by Junio C Hamano on 22 October 2010, 00:14:32 UTC, committed by Junio C Hamano on 22 October 2010, 00:14:32 UTC 
Git 1.7.3.2
1 parent f7bff60
Raw File
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);

extern void NORETURN die_resolve_conflict(const char *me);

#endif /* ADVICE_H */
back to top