diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2010-11-02 15:31:20 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-03 16:19:04 (GMT) |
| commit | 0e615b252f35006ea824fae1a95dc6af55326b9a (patch) | |
| tree | 81a66d2d1561c3310e4dd8cab7ac2869c3601371 /Documentation/git-pull.txt | |
| parent | 8009d83c7e7af0a298ef858609a8201d01086396 (diff) | |
| download | git-0e615b252f35006ea824fae1a95dc6af55326b9a.zip git-0e615b252f35006ea824fae1a95dc6af55326b9a.tar.gz git-0e615b252f35006ea824fae1a95dc6af55326b9a.tar.bz2 | |
Replace "remote tracking" with "remote-tracking"
"remote-tracking" branch makes it explicit that the branch is "tracking a
remote", as opposed to "remote, and tracking something".
See discussion in e.g.
http://mid.gmane.org/8835ADF9-45E5-4A26-9F7F-A72ECC065BB2@gmail.com
for more details.
This patch is a straightforward application of
perl -pi -e 's/remote tracking branch/remote-tracking branch/'
except in the RelNotes directory.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-pull.txt')
| -rw-r--r-- | Documentation/git-pull.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index c50f7dc..33e8438 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -26,7 +26,7 @@ With `--rebase`, it runs 'git rebase' instead of 'git merge'. <repository> should be the name of a remote repository as 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 +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. |