@matheusbsbs / matheus-bagliano / commits / 3bae8d4da1
Fork 0

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>

Jonathan Nieder committed Dec 3, 2010 at 14:04 UTC 3bae8d4da1ee7fce0cf1ef9fcf49656ca1e48769
1 file changed +2 -2
Documentation/git-pull.txt
+2 -2
@@ -27,8 +27,8 @@ With `--rebase`, it runs 'git rebase' instead of 'git merge'.
27 passed to linkgit:git-fetch[1]. <refspec> can name an
28 arbitrary remote ref (for example, the name of a tag) or even
29 a collection of refs with corresponding remote tracking branches
30 -(e.g., refs/heads/*:refs/remotes/origin/*), but usually it is
31 -the name of a branch in the remote repository.
30 +(e.g., refs/heads/{asterisk}:refs/remotes/origin/{asterisk}),
31 +but usually it is the name of a branch in the remote repository.
32
33 Default values for <repository> and <branch> are read from the
34 "remote" and "merge" configuration for the current branch