Ramsay Jones <ramsay@xxxxxxxxxxxxxxxxxxxx> writes: >> diff --git a/Documentation/config.txt b/Documentation/config.txt >> index f6f4c21a54..a2d1b8b116 100644 >> --- a/Documentation/config.txt >> +++ b/Documentation/config.txt >> @@ -2728,6 +2728,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. > > Mention that this 'Defaults to false'? Perhaps. >> -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. > > Better than last time, but how about something like: > > -q:: > --quiet:: > --no-quiet:: > Be quiet, only report errors. The default behaviour of the > command, which is to not be quiet, can be specified by the > `reset.quiet` configuration variable. The `--quiet` and > `--no-quiet` options can be used to override any configured > default. > > Hmm, I am not sure that is any better! :-D To be honest, I find the second sentence in your rewrite even more confusing. It reads as if `reset.quiet` configuration variable can be used to restore the "show what is yet to be added" behaviour, due to the parenthetical mention of the default behaviour without any configuration. The command reports what is yet to be added to the index after `reset` by default. It can be made to only report errors with the `--quiet` option, or setting `reset.quiet` configuration variable to `true` (the latter can be overriden with `--no-quiet`). That may not be much better, though X-<.
