Skip to content

Commit 0c79cee

Browse files
me-andgitster
authored andcommitted
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 <[email protected]> Helped-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent b06d364 commit 0c79cee

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Documentation/git-pull.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,15 +159,15 @@ present while on branch `<name>`, that value is used instead of
159159

160160
In order to determine what URL to use to fetch from, the value
161161
of the configuration `remote.<origin>.url` is consulted
162-
and if there is not any such variable, the value on `URL: ` line
163-
in `$GIT_DIR/remotes/<origin>` file is used.
162+
and if there is not any such variable, the value on the `URL:` line
163+
in `$GIT_DIR/remotes/<origin>` is used.
164164

165165
In order to determine what remote branches to fetch (and
166166
optionally store in the remote-tracking branches) when the command is
167167
run without any refspec parameters on the command line, values
168168
of the configuration variable `remote.<origin>.fetch` are
169169
consulted, and if there aren't any, `$GIT_DIR/remotes/<origin>`
170-
file is consulted and its `Pull: ` lines are used.
170+
is consulted and its `Pull:` lines are used.
171171
In addition to the refspec formats described in the OPTIONS
172172
section, you can have a globbing refspec that looks like this:
173173

0 commit comments

Comments
 (0)