diff options
| author | Victoria Dye <vdye@github.com> | 2022-03-15 01:49:40 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-03-15 01:51:56 (GMT) |
| commit | 9396251b371b9475b60461ddb27bd22282c86d79 (patch) | |
| tree | 617875953a7084a10646f040174473a40fd2de29 /Documentation/config | |
| parent | fd56fba97f26bf668749207efd6a45aee2e2f57c (diff) | |
| download | git-9396251b371b9475b60461ddb27bd22282c86d79.zip git-9396251b371b9475b60461ddb27bd22282c86d79.tar.gz git-9396251b371b9475b60461ddb27bd22282c86d79.tar.bz2 | |
reset: replace '--quiet' with '--no-refresh' in performance advice
Replace references to '--quiet' with '--no-refresh' in the advice on how to
skip refreshing the index. When the advice was introduced, '--quiet' was the
only way to avoid the expensive 'refresh_index(...)' at the end of a mixed
reset. After introducing '--no-refresh', however, '--quiet' became only a
fallback option for determining refresh behavior, overridden by
'--[no-]refresh' or 'reset.refresh' if either is set. To ensure users are
advised to use the most reliable option for avoiding 'refresh_index(...)',
replace recommendation of '--quiet' with '--[no-]refresh'.
Signed-off-by: Victoria Dye <vdye@github.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config')
| -rw-r--r-- | Documentation/config/advice.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt index 971aad2..83c2a95 100644 --- a/Documentation/config/advice.txt +++ b/Documentation/config/advice.txt @@ -67,10 +67,10 @@ advice.*:: commitBeforeMerge:: Advice shown when linkgit:git-merge[1] refuses to merge to avoid overwriting local changes. - resetQuiet:: - Advice to consider using the `--quiet` option to linkgit:git-reset[1] - when the command takes more than 2 seconds to refresh the index - after reset. + resetNoRefresh:: + Advice to consider using the `--no-refresh` option to + linkgit:git-reset[1] when the command takes more than 2 seconds + to refresh the index after reset. resolveConflict:: Advice shown by various commands when conflicts prevent the operation from being performed. |