diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-06-13 13:27:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-13 13:27:06 -0700 |
| commit | 603d52d3cc2264f04a6f17ec67654f1a60793087 (patch) | |
| tree | 3523ce851c8b089d9ea0f70504e66142ababdb2d | |
| parent | Merge branch 'jk/drop-free-refspecs' into maint (diff) | |
| parent | docs: fix formatting and grammar (diff) | |
| download | tgif-603d52d3cc2264f04a6f17ec67654f1a60793087.tar.xz | |
Merge branch 'ad/pull-remote-doc' into maint
Docfix.
* ad/pull-remote-doc:
docs: fix formatting and grammar
| -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 942af8e0f7..e414185f5a 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: |