diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2010-11-02 16:31:24 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-03 09:20:47 -0700 |
| commit | 29b9a66f285f602ad67362ccbe2c6bfaac769f54 (patch) | |
| tree | 0947721dba3bcf5c73a69d6092bcb167a7041d33 /Documentation/user-manual.txt | |
| parent | 8b3f3f84b27e6bbac1b1558166b44431a8e78bb1 (diff) | |
| download | git-29b9a66f285f602ad67362ccbe2c6bfaac769f54.tar.gz git-29b9a66f285f602ad67362ccbe2c6bfaac769f54.tar.xz | |
Change incorrect uses of "remote branch" meaning "remote-tracking"
"remote branch" is a branch hosted in a remote repository, while
"remote-tracking branch" is a copy of such branch, hosted locally.
The distinction is subtle when the copy is up-to-date, but rather
fundamental to understand what "git fetch" and "git push" do.
This patch should fix all incorrect usages in Documentation/ directory.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/user-manual.txt')
| -rw-r--r-- | Documentation/user-manual.txt | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index d7835ca39..d70f3e04f 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -1724,7 +1724,8 @@ accomplish the above with just a simple $ git pull ------------------------------------------------- -More generally, a branch that is created from a remote branch will pull +More generally, a branch that is created from a remote-tracking branch +will pull by default from that branch. See the descriptions of the branch.<name>.remote and branch.<name>.merge options in linkgit:git-config[1], and the discussion of the `--track` option in @@ -2106,7 +2107,7 @@ $ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git $ cd work ------------------------------------------------- -Linus's tree will be stored in the remote branch named origin/master, +Linus's tree will be stored in the remote-tracking branch named origin/master, and can be updated using linkgit:git-fetch[1]; you can track other public trees using linkgit:git-remote[1] to set up a "remote" and linkgit:git-fetch[1] to keep them up-to-date; see @@ -2800,8 +2801,8 @@ Be aware that commits that the old version of example/master pointed at may be lost, as we saw in the previous section. [[remote-branch-configuration]] -Configuring remote branches ---------------------------- +Configuring remote-tracking branches +------------------------------------ We saw above that "origin" is just a shortcut to refer to the repository that you originally cloned from. This information is |