Change "remote tracking" to "remote-tracking"
Fix a typo ("remote remote-tracking") going back to the big cleanup in 2010 (8b3f3f84 etc). Also, remove some more occurrences of "tracking" and "remote tracking" in favor of "remote-tracking". Signed-off-by: Michael Schubert <mschub@elegosoft.com> Reviewed-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael Schubert committed
Jul 3, 2013 at 11:12 UTC
d6ac1d2120573a9dab5a9502fd1cb1a8e4ad58b5
6 files changed
+17
-14
Documentation/git-p4.txt
+10
-7
@@ -176,13 +176,16 @@ Sync options
176
These options can be used in the initial 'clone' as well as in
177
subsequent 'sync' operations.
178
179
---branch <branch>::
180
- Import changes into given branch. If the branch starts with
181
- 'refs/', it will be used as is. Otherwise if it does not start
182
- with 'p4/', that prefix is added. The branch is assumed to
183
- name a remote tracking, but this can be modified using
184
- '--import-local', or by giving a full ref name. The default
185
- branch is 'master'.
179
+--branch <ref>::
180
+ Import changes into <ref> instead of refs/remotes/p4/master.
181
+ If <ref> starts with refs/, it is used as is. Otherwise, if
182
+ it does not start with p4/, that prefix is added.
183
++
184
+By default a <ref> not starting with refs/ is treated as the
185
+name of a remote-tracking branch (under refs/remotes/). This
186
+behavior can be modified using the --import-local option.
187
++
188
+The default <ref> is "master".
189
+
190
This example imports a new remote "p4/proj2" into an existing
191
Git repository:
Documentation/git-submodule.txt
+1
-1
@@ -262,7 +262,7 @@ OPTIONS
262
--remote::
263
This option is only valid for the update command. Instead of using
264
the superproject's recorded SHA-1 to update the submodule, use the
265
- status of the submodule's remote tracking branch. The remote used
265
+ status of the submodule's remote-tracking branch. The remote used
266
is branch's remote (`branch.<name>.remote`), defaulting to `origin`.
267
The remote branch used defaults to `master`, but the branch name may
268
be overridden by setting the `submodule.<name>.branch` option in
Documentation/glossary-content.txt
+2
-2
@@ -113,7 +113,7 @@ Note that commands that operate on the history of the current branch
113
while the HEAD is detached. They update the HEAD to point at the tip
114
of the updated history without affecting any branch. Commands that
115
update or inquire information _about_ the current branch (e.g. `git
116
-branch --set-upstream-to` that sets what remote tracking branch the
116
+branch --set-upstream-to` that sets what remote-tracking branch the
117
current branch integrates with) obviously do not work, as there is no
118
(real) current branch to ask about in this state.
119
@@ -267,7 +267,7 @@ This commit is referred to as a "merge commit", or sometimes just a
267
The default upstream <<def_repository,repository>>. Most projects have
268
at least one upstream project which they track. By default
269
'origin' is used for that purpose. New upstream updates
270
- will be fetched into remote <<def_remote_tracking_branch,remote-tracking branches>> named
270
+ will be fetched into <<def_remote_tracking_branch,remote-tracking branches>> named
271
origin/name-of-upstream-branch, which you can see using
272
`git branch -r`.
273
builtin/clone.c
+1
-1
@@ -697,7 +697,7 @@ static void write_refspec_config(const char* src_ref_prefix,
697
/*
698
* otherwise, the next "git fetch" will
699
* simply fetch from HEAD without updating
700
- * any remote tracking branch, which is what
700
+ * any remote-tracking branch, which is what
701
* we want.
702
*/
703
} else {
builtin/merge.c
+2
-2
@@ -948,7 +948,7 @@ static int evaluate_result(void)
948
}
949
950
/*
951
- * Pretend as if the user told us to merge with the tracking
951
+ * Pretend as if the user told us to merge with the remote-tracking
952
* branch we have for the upstream of the current branch
953
*/
954
static int setup_with_upstream(const char ***argv)
@@ -967,7 +967,7 @@ static int setup_with_upstream(const char ***argv)
967
args = xcalloc(branch->merge_nr + 1, sizeof(char *));
968
for (i = 0; i < branch->merge_nr; i++) {
969
if (!branch->merge[i]->dst)
970
- die(_("No remote tracking branch for %s from %s"),
970
+ die(_("No remote-tracking branch for %s from %s"),
971
branch->merge[i]->src, branch->remote_name);
972
args[i] = branch->merge[i]->dst;
973
}
t/t5505-remote.sh
+1
-1
@@ -75,7 +75,7 @@ test_expect_success 'add another remote' '
75
)
76
'
77
78
-test_expect_success C_LOCALE_OUTPUT 'check remote tracking' '
78
+test_expect_success C_LOCALE_OUTPUT 'check remote-tracking' '
79
(
80
cd test &&
81
check_remote_track origin master side &&