Sync with maint

[thirdparty/git.git] / advice.c

diff --git a/advice.c b/advice.c
index 3ee0ee2d8fbb04dabcfc0152dc741c7d1f28b220..249c60dcf32e242b57316385fb31d52bec2a282a 100644 (file)
--- a/advice.c
+++ b/advice.c
@@ -30,6 +30,7 @@ int advice_waiting_for_editor = 1;
 int advice_graft_file_deprecated = 1;
 int advice_checkout_ambiguous_remote_branch_name = 1;
 int advice_nested_tag = 1;
+int advice_submodule_alternate_error_strategy_die = 1;
 
 static int advice_use_color = -1;
 static char advice_colors[][COLOR_MAXLEN] = {
@@ -89,6 +90,7 @@ static struct {
        { "graftFileDeprecated", &advice_graft_file_deprecated },
        { "checkoutAmbiguousRemoteBranchName", &advice_checkout_ambiguous_remote_branch_name },
        { "nestedTag", &advice_nested_tag },
+       { "submoduleAlternateErrorStrategyDie", &advice_submodule_alternate_error_strategy_die },
 
        /* make this an alias for backward compatibility */
        { "pushNonFastForward", &advice_push_update_rejected }