summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7e4eb21)
raw | patch | inline | side by side (parent: 7e4eb21)
author | Jonathan Nieder <jrnieder@gmail.com> | |
Fri, 3 Dec 2010 20:04:17 +0000 (14:04 -0600) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 3 Dec 2010 23:22:52 +0000 (15:22 -0800) |
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>
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>
Documentation/git-pull.txt | patch | blob | history |
index e1b0bd2868e5f4c489f698038c4d4aaae7740c52..abbc3eb3e0ee208a13237cde5ae3d00d962ad62e 100644 (file)
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