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>
Matthieu Moy committed
Nov 2, 2010 at 16:31 UTC
0e615b252f35006ea824fae1a95dc6af55326b9a
10 files changed
+11
-11
Documentation/config.txt
+1
-1
@@ -708,7 +708,7 @@ color.diff.<slot>::
708
color.decorate.<slot>::
709
Use customized color for 'git log --decorate' output. `<slot>` is one
710
of `branch`, `remoteBranch`, `tag`, `stash` or `HEAD` for local
711
- branches, remote tracking branches, tags, stash and HEAD, respectively.
711
+ branches, remote-tracking branches, tags, stash and HEAD, respectively.
712
713
color.grep::
714
When set to `always`, always highlight matches. When `false` (or
Documentation/fetch-options.txt
+1
-1
@@ -36,7 +36,7 @@ ifndef::git-pull[]
36
37
-p::
38
--prune::
39
- After fetching, remove any remote tracking branches which
39
+ After fetching, remove any remote-tracking branches which
40
no longer exist on the remote.
41
endif::git-pull[]
42
Documentation/git-log.txt
+1
-1
@@ -116,7 +116,7 @@ git log --follow builtin-rev-list.c::
116
git log --branches --not --remotes=origin::
117
118
Shows all commits that are in any of local branches but not in
119
- any of remote tracking branches for 'origin' (what you have that
119
+ any of remote-tracking branches for 'origin' (what you have that
120
origin doesn't).
121
122
git log master --not --remotes=*/master::
Documentation/git-pull.txt
+1
-1
@@ -26,7 +26,7 @@ With `--rebase`, it runs 'git rebase' instead of 'git merge'.
26
<repository> should be the name of a remote repository as
27
passed to linkgit:git-fetch[1]. <refspec> can name an
28
arbitrary remote ref (for example, the name of a tag) or even
29
-a collection of refs with corresponding remote tracking branches
29
+a collection of refs with corresponding remote-tracking branches
30
(e.g., refs/heads/*:refs/remotes/origin/*), but usually it is
31
the name of a branch in the remote repository.
32
Documentation/git-remote.txt
+2
-2
@@ -75,7 +75,7 @@ was passed.
75
76
'rename'::
77
78
-Rename the remote named <old> to <new>. All remote tracking branches and
78
+Rename the remote named <old> to <new>. All remote-tracking branches and
79
configuration settings for the remote are updated.
80
+
81
In case <old> and <new> are the same, and <old> is a file under
@@ -84,7 +84,7 @@ the configuration file format.
84
85
'rm'::
86
87
-Remove the remote named <name>. All remote tracking branches and
87
+Remove the remote named <name>. All remote-tracking branches and
88
configuration settings for the remote are removed.
89
90
'set-head'::
Documentation/gittutorial.txt
+1
-1
@@ -385,7 +385,7 @@ alice$ git fetch bob
385
386
Unlike the longhand form, when Alice fetches from Bob using a
387
remote repository shorthand set up with 'git remote', what was
388
-fetched is stored in a remote tracking branch, in this case
388
+fetched is stored in a remote-tracking branch, in this case
389
`bob/master`. So after this:
390
391
-------------------------------------
Documentation/rev-list-options.txt
+1
-1
@@ -264,7 +264,7 @@ endif::git-rev-list[]
264
265
Pretend as if all the refs in `refs/remotes` are listed
266
on the command line as '<commit>'. If '<pattern>' is given, limit
267
- remote tracking branches to ones matching given shell glob.
267
+ remote-tracking branches to ones matching given shell glob.
268
If pattern lacks '?', '*', or '[', '/*' at the end is implied.
269
270
--glob=<glob-pattern>::
Documentation/user-manual.txt
+1
-1
@@ -1700,7 +1700,7 @@ may wish to check the original repository for updates and merge them
1700
into your own work.
1701
1702
We have already seen <<Updating-a-repository-With-git-fetch,how to
1703
-keep remote tracking branches up to date>> with linkgit:git-fetch[1],
1703
+keep remote-tracking branches up to date>> with linkgit:git-fetch[1],
1704
and how to merge two branches. So you can merge in changes from the
1705
original repository's master branch with:
1706
builtin/checkout.c
+1
-1
@@ -786,7 +786,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
786
* With no paths, if <something> is _not_ a commit, no -t nor -b
787
* was given, and there is a tracking branch whose name is
788
* <something> in one and only one remote, then this is a short-hand
789
- * to fork local <something> from that remote tracking branch.
789
+ * to fork local <something> from that remote-tracking branch.
790
*
791
* Otherwise <something> shall not be ambiguous.
792
* - If it's *only* a reference, treat it like case (1).
t/t5513-fetch-track.sh
+1
-1
@@ -1,6 +1,6 @@
1
#!/bin/sh
2
3
-test_description='fetch follows remote tracking branches correctly'
3
+test_description='fetch follows remote-tracking branches correctly'
4
5
. ./test-lib.sh
6