On Tue, Mar 24, 2020 at 6:26 PM Junio C Hamano <gitster@xxxxxxxxx> wrote: > > Elijah Newren <newren@xxxxxxxxx> writes: > > >> diff --git a/Documentation/config/grep.txt b/Documentation/config/grep.txt > >> index 44abe45a7c..76689771aa 100644 > >> --- a/Documentation/config/grep.txt > >> +++ b/Documentation/config/grep.txt > >> @@ -16,8 +16,11 @@ grep.extendedRegexp:: > >> ... > >> + Number of grep worker threads to use. See `--threads` in > >> + linkgit:git-grep[1] for more information. > >> ... > >> diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt > >> index ddb6acc025..97e25d7b1b 100644 > >> --- a/Documentation/git-grep.txt > >> +++ b/Documentation/git-grep.txt > >> @@ -41,34 +41,7 @@ characters. An empty string as search expression matches all lines. > >> ... > >> +include::config/grep.txt[] > >> ... > >> --threads <num>:: > >> - Number of grep worker threads to use. > >> - See `grep.threads` in 'CONFIGURATION' for more information. > >> + Number of grep worker threads to use. If not provided (or set to > >> + 0), Git will use as many worker threads as the number of logical > >> + cores available. The default value can also be set with the > >> + `grep.threads` configuration (see linkgit:git-config[1]). > > > > I'm possibly showing my ignorance here, but doesn't the > > "include::config/grep.txt[]" you added above mean that the user > > doesn't have to see an external manpage but can see the definition > > earlier within this same manpage? You are right. I added the "(see linkgit:git-config[1])" here more as a reference to the config system itself (for a user that is possibly not familiar with git-config). But if this is not necessary, we can remove the reference. > I think so. Also, the new reference "See `--threads` in git-grep" > added to grep.threads to config/grep.txt would become somewhat > redundant in the context of "git grep --help" (only "See --threads" > is relevant when it appears in this same manual page). Thanks for pointing that out. I think we can solve this issue with the following: diff --git a/Documentation/config/grep.txt b/Documentation/config/grep.txt index c1d49484c8..ac06db4206 100644 --- a/Documentation/config/grep.txt +++ b/Documentation/config/grep.txt @@ -16,8 +16,11 @@ grep.extendedRegexp:: other than 'default'. grep.threads:: - Number of grep worker threads to use. See `--threads` in - linkgit:git-grep[1] for more information. + Number of grep worker threads to use. See `--threads` +ifndef::git-grep[] + in linkgit:git-grep[1] +endif::git-grep[] + for more information. grep.fullName:: If set to true, enable `--full-name` option by default. diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt index 5c5c66c056..192aab4cba 100644 --- a/Documentation/git-grep.txt +++ b/Documentation/git-grep.txt @@ -41,6 +41,7 @@ characters. An empty string as search expression matches all lines. CONFIGURATION ------------- +:git-grep: 1 include::config/grep.txt[] OPTIONS I will add these changes in v2.
