From: Junio C Hamano Date: Fri, 3 Dec 2010 23:23:50 +0000 (-0800) Subject: Merge branch 'maint' to sync with Git 1.7.3.3 X-Git-Tag: v1.7.4-rc0~95 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b281796eeb925f5e91d27cd6c6c579c925577160;p=git.git Merge branch 'maint' to sync with Git 1.7.3.3 * maint: Git 1.7.3.3 CodingGuidelines: mention whitespace preferences for shell scripts Documentation: do not misinterpret pull refspec as bold text Conflicts: Documentation/git-pull.txt RelNotes --- b281796eeb925f5e91d27cd6c6c579c925577160 diff --cc Documentation/git-pull.txt index e47361f23,abbc3eb3e..4db73737b --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@@ -26,9 -26,9 +26,9 @@@ With `--rebase`, it runs 'git rebase' i should be the name of a remote repository as 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 +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