summaryrefslogtreecommitdiff
path: root/advice.h
diff options
context:
space:
mode:
Diffstat (limited to 'advice.h')
-rw-r--r--advice.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/advice.h b/advice.h
index 3de5000..9b7a3ad 100644
--- a/advice.h
+++ b/advice.h
@@ -1,10 +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 */