Merge branch 'ms/remote-tracking-branches-in-doc'
* ms/remote-tracking-branches-in-doc: Change "remote tracking" to "remote-tracking"
This commit is contained in:
commit
778e4b8903
@ -176,13 +176,16 @@ Sync options
|
||||
These options can be used in the initial 'clone' as well as in
|
||||
subsequent 'sync' operations.
|
||||
|
||||
--branch <branch>::
|
||||
Import changes into given branch. If the branch starts with
|
||||
'refs/', it will be used as is. Otherwise if it does not start
|
||||
with 'p4/', that prefix is added. The branch is assumed to
|
||||
name a remote tracking, but this can be modified using
|
||||
'--import-local', or by giving a full ref name. The default
|
||||
branch is 'master'.
|
||||
--branch <ref>::
|
||||
Import changes into <ref> instead of refs/remotes/p4/master.
|
||||
If <ref> starts with refs/, it is used as is. Otherwise, if
|
||||
it does not start with p4/, that prefix is added.
|
||||
+
|
||||
By default a <ref> not starting with refs/ is treated as the
|
||||
name of a remote-tracking branch (under refs/remotes/). This
|
||||
behavior can be modified using the --import-local option.
|
||||
+
|
||||
The default <ref> is "master".
|
||||
+
|
||||
This example imports a new remote "p4/proj2" into an existing
|
||||
Git repository:
|
||||
|
@ -262,7 +262,7 @@ OPTIONS
|
||||
--remote::
|
||||
This option is only valid for the update command. Instead of using
|
||||
the superproject's recorded SHA-1 to update the submodule, use the
|
||||
status of the submodule's remote tracking branch. The remote used
|
||||
status of the submodule's remote-tracking branch. The remote used
|
||||
is branch's remote (`branch.<name>.remote`), defaulting to `origin`.
|
||||
The remote branch used defaults to `master`, but the branch name may
|
||||
be overridden by setting the `submodule.<name>.branch` option in
|
||||
|
@ -113,7 +113,7 @@ Note that commands that operate on the history of the current branch
|
||||
while the HEAD is detached. They update the HEAD to point at the tip
|
||||
of the updated history without affecting any branch. Commands that
|
||||
update or inquire information _about_ the current branch (e.g. `git
|
||||
branch --set-upstream-to` that sets what remote tracking branch the
|
||||
branch --set-upstream-to` that sets what remote-tracking branch the
|
||||
current branch integrates with) obviously do not work, as there is no
|
||||
(real) current branch to ask about in this state.
|
||||
|
||||
@ -267,7 +267,7 @@ This commit is referred to as a "merge commit", or sometimes just a
|
||||
The default upstream <<def_repository,repository>>. Most projects have
|
||||
at least one upstream project which they track. By default
|
||||
'origin' is used for that purpose. New upstream updates
|
||||
will be fetched into remote <<def_remote_tracking_branch,remote-tracking branches>> named
|
||||
will be fetched into <<def_remote_tracking_branch,remote-tracking branches>> named
|
||||
origin/name-of-upstream-branch, which you can see using
|
||||
`git branch -r`.
|
||||
|
||||
|
@ -701,7 +701,7 @@ static void write_refspec_config(const char* src_ref_prefix,
|
||||
/*
|
||||
* otherwise, the next "git fetch" will
|
||||
* simply fetch from HEAD without updating
|
||||
* any remote tracking branch, which is what
|
||||
* any remote-tracking branch, which is what
|
||||
* we want.
|
||||
*/
|
||||
} else {
|
||||
|
@ -948,7 +948,7 @@ static int evaluate_result(void)
|
||||
}
|
||||
|
||||
/*
|
||||
* Pretend as if the user told us to merge with the tracking
|
||||
* Pretend as if the user told us to merge with the remote-tracking
|
||||
* branch we have for the upstream of the current branch
|
||||
*/
|
||||
static int setup_with_upstream(const char ***argv)
|
||||
@ -967,7 +967,7 @@ static int setup_with_upstream(const char ***argv)
|
||||
args = xcalloc(branch->merge_nr + 1, sizeof(char *));
|
||||
for (i = 0; i < branch->merge_nr; i++) {
|
||||
if (!branch->merge[i]->dst)
|
||||
die(_("No remote tracking branch for %s from %s"),
|
||||
die(_("No remote-tracking branch for %s from %s"),
|
||||
branch->merge[i]->src, branch->remote_name);
|
||||
args[i] = branch->merge[i]->dst;
|
||||
}
|
||||
|
@ -74,7 +74,7 @@ test_expect_success 'add another remote' '
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'check remote tracking' '
|
||||
test_expect_success C_LOCALE_OUTPUT 'check remote-tracking' '
|
||||
(
|
||||
cd test &&
|
||||
check_remote_track origin master side &&
|
||||
|
Loading…
Reference in New Issue
Block a user