summaryrefslogtreecommitdiff
path: root/advice.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-20 22:42:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-20 22:42:59 (GMT)
commit71b3ef11fa0aade4a514c51b83438858a4a3c03b (patch)
tree6cea8215ecc0e70c8f19e04c51327deda93672d3 /advice.h
parentf922df8655675aafaea96f3715c9473c63d2ca47 (diff)
parentd38a30df7dd54c5c6883af1de1a03ec7d523cee5 (diff)
downloadgit-71b3ef11fa0aade4a514c51b83438858a4a3c03b.zip
git-71b3ef11fa0aade4a514c51b83438858a4a3c03b.tar.gz
git-71b3ef11fa0aade4a514c51b83438858a4a3c03b.tar.bz2
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
Diffstat (limited to 'advice.h')
-rw-r--r--advice.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/advice.h b/advice.h
index 728ab90..9b7a3ad 100644
--- a/advice.h
+++ b/advice.h
@@ -1,11 +1,16 @@
#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 */