Jeff King <peff@xxxxxxxx> writes: > On Thu, Jun 01, 2017 at 11:37:03AM +0100, Adam Dinwoodie wrote: > >> When compiling the documentation, asciidoc thinks a backtick surrounded >> by whitespace shouldn't be interpreted as marking the start or end of a >> literal. In most cases, that's useful behaviour, but in the git-pull >> documentation it means asciidoc is failing to correctly detect which >> text should be monospaced and which shouldn't. >> >> To avoid this, remove the extraneous spaces from the text to be >> monospaced. It would also be possible to fix the formatting by >> switching to asciidoc's ++ monospace format markers and still have the >> space characters included in the monospace text, but the spaces aren't >> necessary and not having them keeps the markup simpler. >> >> Also include a minor grammar fix suggested by Jeff while we're changing >> these lines. >> >> Signed-off-by: Adam Dinwoodie <adam@xxxxxxxxxxxxx> >> Helped-by: Jeff King <peff@xxxxxxxx> >> --- >> Documentation/git-pull.txt | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) > > This looks fine, although... > >> In order to determine what URL to use to fetch from, the value >> of the configuration `remote.<origin>.url` is consulted >> -and if there is not any such variable, the value on `URL: ` line >> +and if there is not any such variable, the value on the `URL:` line >> in `$GIT_DIR/remotes/<origin>` file is used. > > ...I should have read to the end of the sentence. It should also be "in > the `$GIT_DIR/remotes/<origin>` file". Or just drop "file". There is another one nearby. Here is what I understand as your suggestion (the "just drop" variant), which I'll queue as SQUASH??? on top of Adam's patch. Thanks. Documentation/git-pull.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 1d90dd17bd..e414185f5a 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -160,14 +160,14 @@ present while on branch `<name>`, that value is used instead of In order to determine what URL to use to fetch from, the value of the configuration `remote.<origin>.url` is consulted and if there is not any such variable, the value on the `URL:` line -in `$GIT_DIR/remotes/<origin>` file is used. +in `$GIT_DIR/remotes/<origin>` is used. In order to determine what remote branches to fetch (and optionally store in the remote-tracking branches) when the command is run without any refspec parameters on the command line, values of the configuration variable `remote.<origin>.fetch` are consulted, and if there aren't any, `$GIT_DIR/remotes/<origin>` -file is consulted and its `Pull:` lines are used. +is consulted and its `Pull:` lines are used. In addition to the refspec formats described in the OPTIONS section, you can have a globbing refspec that looks like this: