Merge branch 'mg/editorconfig-makefile'

[thirdparty/git.git] / advice.h

diff --git a/advice.h b/advice.h
index 9d4f49ae38bcfe3b0bdf9999cf9d66ee6a95739e..c8d29f97f39bef84062d541009a27bd35a47f9dd 100644 (file)
--- a/advice.h
+++ b/advice.h
@@ -25,6 +25,7 @@ enum advice_type {
        ADVICE_GRAFT_FILE_DEPRECATED,
        ADVICE_IGNORED_HOOK,
        ADVICE_IMPLICIT_IDENTITY,
+       ADVICE_MERGE_CONFLICT,
        ADVICE_NESTED_TAG,
        ADVICE_OBJECT_NAME_WARNING,
        ADVICE_PUSH_ALREADY_EXISTS,
@@ -36,6 +37,7 @@ enum advice_type {
        ADVICE_PUSH_UNQUALIFIED_REF_NAME,
        ADVICE_PUSH_UPDATE_REJECTED,
        ADVICE_PUSH_UPDATE_REJECTED_ALIAS,
+       ADVICE_REF_SYNTAX,
        ADVICE_RESET_NO_REFRESH_WARNING,
        ADVICE_RESOLVE_CONFLICT,
        ADVICE_RM_HINTS,
@@ -47,6 +49,7 @@ enum advice_type {
        ADVICE_STATUS_U_OPTION,
        ADVICE_SUBMODULES_NOT_UPDATED,
        ADVICE_SUBMODULE_ALTERNATE_ERROR_STRATEGY_DIE,
+       ADVICE_SUBMODULE_MERGE_CONFLICT,
        ADVICE_SUGGEST_DETACHING_HEAD,
        ADVICE_UPDATE_SPARSE_PATH,
        ADVICE_WAITING_FOR_EDITOR,