Merge branch 'gc/branch-recurse-submodules-fix'

[thirdparty/git.git] / advice.c

diff --git a/advice.c b/advice.c
index 2e1fd483040bf399e3a689145d6c8dd3dfa277f5..cb755c551a283a09351fc9c3d31db675a9329b16 100644 (file)
--- a/advice.c
+++ b/advice.c
@@ -61,7 +61,7 @@ static struct {
        [ADVICE_PUSH_NON_FF_MATCHING]                   = { "pushNonFFMatching", 1 },
        [ADVICE_PUSH_UNQUALIFIED_REF_NAME]              = { "pushUnqualifiedRefName", 1 },
        [ADVICE_PUSH_UPDATE_REJECTED]                   = { "pushUpdateRejected", 1 },
-       [ADVICE_RESET_QUIET_WARNING]                    = { "resetQuiet", 1 },
+       [ADVICE_RESET_NO_REFRESH_WARNING]               = { "resetNoRefresh", 1 },
        [ADVICE_RESOLVE_CONFLICT]                       = { "resolveConflict", 1 },
        [ADVICE_RM_HINTS]                               = { "rmHints", 1 },
        [ADVICE_SEQUENCER_IN_USE]                       = { "sequencerInUse", 1 },