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>
This commit is contained in:
Matthieu Moy 2010-11-02 16:31:20 +01:00 коммит произвёл Junio C Hamano
Родитель 8009d83c7e
Коммит 0e615b252f
10 изменённых файлов: 11 добавлений и 11 удалений

Просмотреть файл

@ -708,7 +708,7 @@ color.diff.<slot>::
color.decorate.<slot>:: color.decorate.<slot>::
Use customized color for 'git log --decorate' output. `<slot>` is one Use customized color for 'git log --decorate' output. `<slot>` is one
of `branch`, `remoteBranch`, `tag`, `stash` or `HEAD` for local of `branch`, `remoteBranch`, `tag`, `stash` or `HEAD` for local
branches, remote tracking branches, tags, stash and HEAD, respectively. branches, remote-tracking branches, tags, stash and HEAD, respectively.
color.grep:: color.grep::
When set to `always`, always highlight matches. When `false` (or When set to `always`, always highlight matches. When `false` (or

Просмотреть файл

@ -36,7 +36,7 @@ ifndef::git-pull[]
-p:: -p::
--prune:: --prune::
After fetching, remove any remote tracking branches which After fetching, remove any remote-tracking branches which
no longer exist on the remote. no longer exist on the remote.
endif::git-pull[] endif::git-pull[]

Просмотреть файл

@ -116,7 +116,7 @@ git log --follow builtin-rev-list.c::
git log --branches --not --remotes=origin:: git log --branches --not --remotes=origin::
Shows all commits that are in any of local branches but not in Shows all commits that are in any of local branches but not in
any of remote tracking branches for 'origin' (what you have that any of remote-tracking branches for 'origin' (what you have that
origin doesn't). origin doesn't).
git log master --not --remotes=*/master:: git log master --not --remotes=*/master::

Просмотреть файл

@ -26,7 +26,7 @@ With `--rebase`, it runs 'git rebase' instead of 'git merge'.
<repository> should be the name of a remote repository as <repository> should be the name of a remote repository as
passed to linkgit:git-fetch[1]. <refspec> can name an passed to linkgit:git-fetch[1]. <refspec> can name an
arbitrary remote ref (for example, the name of a tag) or even 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 (e.g., refs/heads/*:refs/remotes/origin/*), but usually it is
the name of a branch in the remote repository. the name of a branch in the remote repository.

Просмотреть файл

@ -75,7 +75,7 @@ was passed.
'rename':: 'rename'::
Rename the remote named <old> to <new>. All remote tracking branches and Rename the remote named <old> to <new>. All remote-tracking branches and
configuration settings for the remote are updated. configuration settings for the remote are updated.
+ +
In case <old> and <new> are the same, and <old> is a file under In case <old> and <new> are the same, and <old> is a file under
@ -84,7 +84,7 @@ the configuration file format.
'rm':: 'rm'::
Remove the remote named <name>. All remote tracking branches and Remove the remote named <name>. All remote-tracking branches and
configuration settings for the remote are removed. configuration settings for the remote are removed.
'set-head':: 'set-head'::

Просмотреть файл

@ -385,7 +385,7 @@ alice$ git fetch bob
Unlike the longhand form, when Alice fetches from Bob using a Unlike the longhand form, when Alice fetches from Bob using a
remote repository shorthand set up with 'git remote', what was remote repository shorthand set up with 'git remote', what was
fetched is stored in a remote tracking branch, in this case fetched is stored in a remote-tracking branch, in this case
`bob/master`. So after this: `bob/master`. So after this:
------------------------------------- -------------------------------------

Просмотреть файл

@ -264,7 +264,7 @@ endif::git-rev-list[]
Pretend as if all the refs in `refs/remotes` are listed Pretend as if all the refs in `refs/remotes` are listed
on the command line as '<commit>'. If '<pattern>' is given, limit on the command line as '<commit>'. If '<pattern>' is given, limit
remote tracking branches to ones matching given shell glob. remote-tracking branches to ones matching given shell glob.
If pattern lacks '?', '*', or '[', '/*' at the end is implied. If pattern lacks '?', '*', or '[', '/*' at the end is implied.
--glob=<glob-pattern>:: --glob=<glob-pattern>::

Просмотреть файл

@ -1700,7 +1700,7 @@ may wish to check the original repository for updates and merge them
into your own work. into your own work.
We have already seen <<Updating-a-repository-With-git-fetch,how to We have already seen <<Updating-a-repository-With-git-fetch,how to
keep remote tracking branches up to date>> with linkgit:git-fetch[1], keep remote-tracking branches up to date>> with linkgit:git-fetch[1],
and how to merge two branches. So you can merge in changes from the and how to merge two branches. So you can merge in changes from the
original repository's master branch with: original repository's master branch with:

Просмотреть файл

@ -786,7 +786,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
* With no paths, if <something> is _not_ a commit, no -t nor -b * With no paths, if <something> is _not_ a commit, no -t nor -b
* was given, and there is a tracking branch whose name is * was given, and there is a tracking branch whose name is
* <something> in one and only one remote, then this is a short-hand * <something> in one and only one remote, then this is a short-hand
* to fork local <something> from that remote tracking branch. * to fork local <something> from that remote-tracking branch.
* *
* Otherwise <something> shall not be ambiguous. * Otherwise <something> shall not be ambiguous.
* - If it's *only* a reference, treat it like case (1). * - If it's *only* a reference, treat it like case (1).

Просмотреть файл

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
test_description='fetch follows remote tracking branches correctly' test_description='fetch follows remote-tracking branches correctly'
. ./test-lib.sh . ./test-lib.sh