Ben Peart <peart...@gmail.com> 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. >>> + >> >> With 'nd/config-split' topic moving pretty much all config keys out of >> config.txt, you probably want to do the same for this series: add this >> in a new file called Documentation/reset-config.txt then include the >> file here like the sendemail one below. >> > > Seems a bit overkill to pull a line of documentation into a separate > file and replace it with a line of 'import' logic. Perhaps if/when > there is more documentation to pull out that would make more sense.
This change (ehh, rather, perhaps nd/config-split topic) came at an unfortunate moment. Until I actually did one integration cycle to rebuild 'pu' and merge this patch and the other topic, I had exactly the same reaction as yours above to Duy's comment. But seeing the tree at the tip of 'pu' today, I do think the end result with a single liner file that has configuration for the "reset" command that is included in config.txt would make sense, and I also think you would agree with it if you see the same tree. How we should get there is a different story. I think Duy's series needs at least another update to move the split pieces into its own subdirectory of Documentation/, and it is not all that urgent, while this three-patch series (with the advice.* bit added) for "reset" is pretty much ready to go 'next', so my gut feeling is that it is best to keep the description here, and to ask Duy to base the updated version of config-split topic on top.
