diff options
| author | Adam Dinwoodie <adam@dinwoodie.org> | 2017-06-01 10:37:03 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-02 05:10:57 (GMT) |
| commit | 0c79cee697f7f4e304c53108ee895b706df1322e (patch) | |
| tree | ce79e2b4dc59b2a70fc2cf64126fd314e9ba1fdb | |
| parent | b06d3643105c8758ed019125a4399cb7efdcce2c (diff) | |
| download | git-0c79cee697f7f4e304c53108ee895b706df1322e.zip git-0c79cee697f7f4e304c53108ee895b706df1322e.tar.gz git-0c79cee697f7f4e304c53108ee895b706df1322e.tar.bz2 | |
docs: fix formatting and grammar
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@dinwoodie.org>
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/git-pull.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 942af8e..e414185 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -159,15 +159,15 @@ 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 `URL: ` line -in `$GIT_DIR/remotes/<origin>` file is used. +and if there is not any such variable, the value on the `URL:` line +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: |