diff options
| author | Ben Peart <benpeart@microsoft.com> | 2018-10-23 15:04:22 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-24 11:57:07 +0900 |
| commit | 4c3abd0551d8ff1c280de2bc53d6a7657b053d33 (patch) | |
| tree | 77e51277ff7cd25d35253bf42bf44c90db7356d1 | |
| parent | reset: don't compute unstaged changes after reset when --quiet (diff) | |
| download | git-4c3abd0551d8ff1c280de2bc53d6a7657b053d33.tar.gz git-4c3abd0551d8ff1c280de2bc53d6a7657b053d33.zip | |
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>
| -rw-r--r-- | Documentation/config.txt | 3 | ||||
| -rw-r--r-- | Documentation/git-reset.txt | 5 | ||||
| -rw-r--r-- | builtin/reset.c | 1 |
3 files changed, 8 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 diff --git a/builtin/reset.c b/builtin/reset.c index c2f8e72cb3..ff5f1756d5 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -307,6 +307,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix) }; git_config(git_reset_config, NULL); + git_config_get_bool("reset.quiet", &quiet); argc = parse_options(argc, argv, prefix, options, git_reset_usage, PARSE_OPT_KEEP_DASHDASH); |