git/advice.h
Junio C Hamano 71b3ef11fa Merge branch 'mm/conflict-advice'
* mm/conflict-advice:
  Be more user-friendly when refusing to do something because of conflict.

Conflicts:
	Documentation/config.txt
	advice.c
	advice.h
2010-01-20 14:42:59 -08:00

17 lines
399 B
C

#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 */