summaryrefslogtreecommitdiffstats
path: root/git-pull.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-06-05 11:16:19 +0900
committerJunio C Hamano <gitster@pobox.com>2017-06-05 11:16:19 +0900
commit7016b0b3e833ebe925c0b7d0a532777403ab448e (patch)
tree8aa3633f16729efaac615082367ca2c9dc9e1a41 /git-pull.txt
parente0e20dff4554f5126cbf43465d7b358fae8bcede (diff)
downloadgit-htmldocs-7016b0b3e833ebe925c0b7d0a532777403ab448e.tar.gz
Autogenerated HTML docs for v2.13.1-388-g69e6b
Diffstat (limited to 'git-pull.txt')
-rw-r--r--git-pull.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-pull.txt b/git-pull.txt
index 942af8e0f..e414185f5 100644
--- a/git-pull.txt
+++ b/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: