Revision 8c67c392e1620fc3b749aa9e0b8da13bd84226f8 authored by Junio C Hamano on 19 August 2010, 23:03:18 UTC, committed by Junio C Hamano on 19 August 2010, 23:03:18 UTC
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 745654f
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