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.h | |
| parent | Merge branch 'ab/racy-hooks' (diff) | |
| parent | reset: show --no-refresh in the short-help (diff) | |
| download | tgif-6d51217467afe5303349cb5c57b6b131201f73f3.tar.xz | |
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.h')
| -rw-r--r-- | advice.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -36,7 +36,7 @@ struct string_list; ADVICE_PUSH_UPDATE_REJECTED_ALIAS, ADVICE_PUSH_UPDATE_REJECTED, ADVICE_PUSH_REF_NEEDS_UPDATE, - ADVICE_RESET_QUIET_WARNING, + ADVICE_RESET_NO_REFRESH_WARNING, ADVICE_RESOLVE_CONFLICT, ADVICE_RM_HINTS, ADVICE_SEQUENCER_IN_USE, |