Revision 4daf6fc837f7cc84335958b9d9e8a29e41b4ee8e authored by Junio C Hamano on 13 February 2012, 19:42:18 UTC, committed by Junio C Hamano on 13 February 2012, 19:42:18 UTC
* js/add-e-submodule-fix: add -e: do not show difference in a submodule that is merely dirty
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 */
Computing file changes ...
