summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Ben Peart <benpeart@microsoft.com>2018-10-23 15:04:22 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-10-24 11:57:07 +0900
commit4c3abd0551d8ff1c280de2bc53d6a7657b053d33 (patch)
tree77e51277ff7cd25d35253bf42bf44c90db7356d1 /Documentation
parentreset: don't compute unstaged changes after reset when --quiet (diff)
downloadtgif-4c3abd0551d8ff1c280de2bc53d6a7657b053d33.tar.xz
reset: add new reset.quiet config setting
Add a reset.quiet config setting that sets the default value of the --quiet flag when running the reset command. This enables users to change the default behavior to take advantage of the performance advantages of avoiding the scan for unstaged changes after reset. Defaults to false. Signed-off-by: Ben Peart <benpeart@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt3
-rw-r--r--Documentation/git-reset.txt5
2 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 552827935a..fef680f886 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2753,6 +2753,9 @@ rerere.enabled::
`$GIT_DIR`, e.g. if "rerere" was previously used in the
repository.
+reset.quiet::
+ When set to true, 'git reset' will default to the '--quiet' option.
+
include::sendemail-config.txt[]
sequence.editor::
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index 1d697d9962..2dac95c71a 100644
--- a/Documentation/git-reset.txt
+++ b/Documentation/git-reset.txt
@@ -95,7 +95,10 @@ OPTIONS
-q::
--quiet::
- Be quiet, only report errors.
+--no-quiet::
+ Be quiet, only report errors. The default behavior is set by the
+ `reset.quiet` config option. `--quiet` and `--no-quiet` will
+ override the default behavior.
EXAMPLES