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 /contrib/scalar | |
| 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 'contrib/scalar')
| -rw-r--r-- | contrib/scalar/scalar.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/contrib/scalar/scalar.c b/contrib/scalar/scalar.c index 7db2a97416..58ca0e56f1 100644 --- a/contrib/scalar/scalar.c +++ b/contrib/scalar/scalar.c @@ -152,7 +152,6 @@ static int set_recommended_config(int reconfigure) { "pack.useBitmaps", "false", 1 }, { "pack.useSparse", "true", 1 }, { "receive.autoGC", "false", 1 }, - { "reset.quiet", "true", 1 }, { "feature.manyFiles", "false", 1 }, { "feature.experimental", "false", 1 }, { "fetch.unpackLimit", "1", 1 }, |