summaryrefslogtreecommitdiff
path: root/Documentation/git-reset.txt
diff options
context:
space:
mode:
authorLibravatar Victoria Dye <vdye@github.com>2022-03-23 18:17:58 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-03-23 14:39:44 -0700
commit45bf76284b40856e47e8809e952167f0316b8a99 (patch)
treed9f3716ebcd9163c959255b0485dfa9e7714b9ea /Documentation/git-reset.txt
parentstash: make internal resets quiet and refresh index (diff)
downloadtgif-45bf76284b40856e47e8809e952167f0316b8a99.tar.xz
reset: do not make '--quiet' disable index refresh
Update '--quiet' to no longer implicitly skip refreshing the index in a mixed reset. Users now have the ability to explicitly disable refreshing the index with the '--no-refresh' option, so they no longer need to use '--quiet' to do so. Moreover, we explicitly remove the refresh-skipping behavior from '--quiet' because it is completely unrelated to the stated purpose of the option: "Be quiet, only report errors." Helped-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Victoria Dye <vdye@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-reset.txt')
-rw-r--r--Documentation/git-reset.txt5
1 files changed, 1 insertions, 4 deletions
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index 89ddc85c2e..bc1646c301 100644
--- a/Documentation/git-reset.txt
+++ b/Documentation/git-reset.txt
@@ -114,10 +114,7 @@ OPTIONS
--no-refresh::
Proactively refresh the index after a mixed reset. If unspecified, the
behavior falls back on the `reset.refresh` config option. If neither
- `--[no-]refresh` nor `reset.refresh` are set, the default behavior is
- decided by the `--[no-]quiet` option and/or `reset.quiet` config.
- If `--quiet` is specified or `reset.quiet` is set with no command-line
- "quiet" setting, refresh is disabled. Otherwise, refresh is enabled.
+ `--[no-]refresh` nor `reset.refresh` are set, refresh is enabled.
--pathspec-from-file=<file>::
Pathspec is passed in `<file>` instead of commandline args. If