diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-07-12 12:04:07 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-07-12 12:04:07 -0700 |
commit | 778e4b890390e90e19b7f835f3b0ffe92e8d5345 (patch) | |
tree | e93c198c3c051a4ce8320f83abd0d11310b10b30 /Documentation | |
parent | Merge branch 'jk/pull-to-integrate' (diff) | |
parent | Change "remote tracking" to "remote-tracking" (diff) | |
download | tgif-778e4b890390e90e19b7f835f3b0ffe92e8d5345.tar.xz |
Merge branch 'ms/remote-tracking-branches-in-doc'
* ms/remote-tracking-branches-in-doc:
Change "remote tracking" to "remote-tracking"
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/git-p4.txt | 17 | ||||
-rw-r--r-- | Documentation/git-submodule.txt | 2 | ||||
-rw-r--r-- | Documentation/glossary-content.txt | 4 |
3 files changed, 13 insertions, 10 deletions
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt index c579fbc2b8..8cba16d67f 100644 --- a/Documentation/git-p4.txt +++ b/Documentation/git-p4.txt @@ -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: diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt index e5767134b1..bfff09062d 100644 --- a/Documentation/git-submodule.txt +++ b/Documentation/git-submodule.txt @@ -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 diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index db2a74df93..dba5062b37 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -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`. |