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: https://git.lorimer.id.au/gitweb.git/diff_plain/b281796eeb925f5e91d27cd6c6c579c925577160?ds=inline;hp=-c 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 --combined Documentation/git-pull.txt index e47361f234,abbc3eb3e0..4db73737b0 --- 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 @@@ -136,7 -136,7 +136,7 @@@ and if there is not any such variable, in `$GIT_DIR/remotes/` file is used. In order to determine what remote branches to fetch (and -optionally store in the tracking branches) when the command is +optionally store in the remote-tracking branches) when the command is run without any refspec parameters on the command line, values of the configuration variable `remote..fetch` are consulted, and if there aren't any, `$GIT_DIR/remotes/` @@@ -149,9 -149,9 +149,9 @@@ refs/heads/*:refs/remotes/origin/ ------------ A globbing refspec must have a non-empty RHS (i.e. must store -what were fetched in tracking branches), and its LHS and RHS +what were fetched in remote-tracking branches), and its LHS and RHS must end with `/*`. The above specifies that all remote -branches are tracked using tracking branches in +branches are tracked using remote-tracking branches in `refs/remotes/origin/` hierarchy under the same name. The rule to determine which remote branch to merge after