diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-03-30 18:01:10 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-03-30 18:01:10 -0700 |
commit | 6d51217467afe5303349cb5c57b6b131201f73f3 (patch) | |
tree | d6e43ac30a50fabe7b7aee24796ee29455a5ada2 /advice.c | |
parent | cb3b3974b3321522b1c5c61d358d1259f19aae29 (diff) | |
parent | 5891c76cd012536a5bb833e512f7262a4b4358c1 (diff) | |
download | git-6d51217467afe5303349cb5c57b6b131201f73f3.tar.gz |
Merge branch 'vd/stash-silence-reset'
"git stash" does not allow subcommands it internally runs as its
implementation detail, except for "git reset", to emit messages;
now "git reset" part has also been squelched.
* vd/stash-silence-reset:
reset: show --no-refresh in the short-help
reset: remove 'reset.refresh' config option
reset: remove 'reset.quiet' config option
reset: do not make '--quiet' disable index refresh
stash: make internal resets quiet and refresh index
reset: suppress '--no-refresh' advice if logging is silenced
reset: replace '--quiet' with '--no-refresh' in performance advice
reset: introduce --[no-]refresh option to --mixed
reset: revise index refresh advice
Diffstat (limited to 'advice.c')
-rw-r--r-- | advice.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 }, |