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:
Junio C Hamano 2013-07-12 12:04:07 -07:00
commit 778e4b8903
6 changed files with 17 additions and 14 deletions

View File

@ -176,13 +176,16 @@ Sync options
These options can be used in the initial 'clone' as well as in These options can be used in the initial 'clone' as well as in
subsequent 'sync' operations. subsequent 'sync' operations.
--branch <branch>:: --branch <ref>::
Import changes into given branch. If the branch starts with Import changes into <ref> instead of refs/remotes/p4/master.
'refs/', it will be used as is. Otherwise if it does not start If <ref> starts with refs/, it is used as is. Otherwise, if
with 'p4/', that prefix is added. The branch is assumed to it does not start with p4/, that prefix is added.
name a remote tracking, but this can be modified using +
'--import-local', or by giving a full ref name. The default By default a <ref> not starting with refs/ is treated as the
branch is 'master'. 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 This example imports a new remote "p4/proj2" into an existing
Git repository: Git repository:

View File

@ -262,7 +262,7 @@ OPTIONS
--remote:: --remote::
This option is only valid for the update command. Instead of using This option is only valid for the update command. Instead of using
the superproject's recorded SHA-1 to update the submodule, use the 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`. is branch's remote (`branch.<name>.remote`), defaulting to `origin`.
The remote branch used defaults to `master`, but the branch name may The remote branch used defaults to `master`, but the branch name may
be overridden by setting the `submodule.<name>.branch` option in be overridden by setting the `submodule.<name>.branch` option in

View File

@ -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 while the HEAD is detached. They update the HEAD to point at the tip
of the updated history without affecting any branch. Commands that of the updated history without affecting any branch. Commands that
update or inquire information _about_ the current branch (e.g. `git 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 current branch integrates with) obviously do not work, as there is no
(real) current branch to ask about in this state. (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 The default upstream <<def_repository,repository>>. Most projects have
at least one upstream project which they track. By default at least one upstream project which they track. By default
'origin' is used for that purpose. New upstream updates '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 origin/name-of-upstream-branch, which you can see using
`git branch -r`. `git branch -r`.

View File

@ -701,7 +701,7 @@ static void write_refspec_config(const char* src_ref_prefix,
/* /*
* otherwise, the next "git fetch" will * otherwise, the next "git fetch" will
* simply fetch from HEAD without updating * simply fetch from HEAD without updating
* any remote tracking branch, which is what * any remote-tracking branch, which is what
* we want. * we want.
*/ */
} else { } else {

View File

@ -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 * branch we have for the upstream of the current branch
*/ */
static int setup_with_upstream(const char ***argv) 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 *)); args = xcalloc(branch->merge_nr + 1, sizeof(char *));
for (i = 0; i < branch->merge_nr; i++) { for (i = 0; i < branch->merge_nr; i++) {
if (!branch->merge[i]->dst) 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); branch->merge[i]->src, branch->remote_name);
args[i] = branch->merge[i]->dst; args[i] = branch->merge[i]->dst;
} }

View File

@ -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 && cd test &&
check_remote_track origin master side && check_remote_track origin master side &&