diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-12-03 20:04:17 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-03 23:22:52 (GMT) |
| commit | 3bae8d4da1ee7fce0cf1ef9fcf49656ca1e48769 (patch) | |
| tree | ee9109391001e290017e24ed0f1ecc14f7dfd7e3 /Documentation/git-pull.txt | |
| parent | 7e4eb210bdf2a612d8bf4cc106d99ba190f73e3e (diff) | |
| download | git-3bae8d4da1ee7fce0cf1ef9fcf49656ca1e48769.zip git-3bae8d4da1ee7fce0cf1ef9fcf49656ca1e48769.tar.gz git-3bae8d4da1ee7fce0cf1ef9fcf49656ca1e48769.tar.bz2 | |
Documentation: do not misinterpret pull refspec as bold text
Use the {asterisk} entity to avoid mistreating the asterisks
in "(e.g., refs/heads/*:refs/remotes/origin/*)" as delimiters
for bold text.
From a quick search with 'git grep -e "\*.*\*"', this seems to
be the last example of this particular formatting problem.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-pull.txt')
| -rw-r--r-- | Documentation/git-pull.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index e1b0bd2..abbc3eb 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -27,8 +27,8 @@ With `--rebase`, it runs 'git rebase' instead of 'git merge'. passed to linkgit:git-fetch[1]. <refspec> can name an arbitrary remote ref (for example, the name of a tag) or even a collection of refs with corresponding remote tracking branches -(e.g., refs/heads/*:refs/remotes/origin/*), but usually it is -the name of a branch in the remote repository. +(e.g., refs/heads/{asterisk}:refs/remotes/origin/{asterisk}), +but usually it is the name of a branch in the remote repository. Default values for <repository> and <branch> are read from the "remote" and "merge" configuration for the current branch |