https://github.com/git/git
Raw File
Tip revision: 8051a030617cf7d083568cca223bdaa15052c33f authored by Junio C Hamano on 07 February 2010, 23:52:28 UTC
Merge git://repo.or.cz/git-gui
Tip revision: 8051a03
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;

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