From: Jonathan Nieder Date: Fri, 3 Dec 2010 20:04:17 +0000 (-0600) Subject: Documentation: do not misinterpret pull refspec as bold text X-Git-Tag: v1.7.3.3~2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3bae8d4da1ee7fce0cf1ef9fcf49656ca1e48769;p=git.git 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 Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index e1b0bd286..abbc3eb3e 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]. 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 and are read from the "remote" and "merge" configuration for the current branch