summaryrefslogtreecommitdiff
path: root/advice.h
diff options
context:
space:
mode:
Diffstat (limited to 'advice.h')
-rw-r--r--advice.h17
1 files changed, 17 insertions, 0 deletions
diff --git a/advice.h b/advice.h
new file mode 100644
index 0000000000..3244ebb5c1
--- /dev/null
+++ b/advice.h
@@ -0,0 +1,17 @@
+#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);
+
+extern void NORETURN die_resolve_conflict(const char *me);
+
+#endif /* ADVICE_H */