Junio C Hamano <gitster@xxxxxxxxx> writes: >> 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. I'll take the "it is not all that urgent" bit (and only that bit) back, even though the conclusion would be the same. It is quite painful having to keep this topic while a few topics that touch the huge Documentation/config.txt is in flight. The monolithic file is large enough that it does not cause much pain while many topics are in flight, but the single step of spliting it into million pieces done by nd/config-split topic is a pain to merge. Anybody interested may fetch, and try $ git checkout 5c2d198e8e $ git merge b2358ceaca and imagine that you'd have to redo that every time somebody adds or touches up a byte in the description of an individual entry in the Documentation/config.txt file. It is not pretty until we finish the split.