summaryrefslogtreecommitdiff
path: root/Documentation/git-fetch.txt
diff options
context:
space:
mode:
authorMatthieu Moy <Matthieu.Moy@imag.fr>2010-11-02 16:31:23 +0100
committerJunio C Hamano <gitster@pobox.com>2010-11-03 09:20:41 -0700
commit8b3f3f84b27e6bbac1b1558166b44431a8e78bb1 (patch)
treece61002777df7c0aa90570aa8fc1d7db5e7ffcc2 /Documentation/git-fetch.txt
parentbc6dafc1445a9e04141ed6bf28326114bc2e9191 (diff)
downloadgit-8b3f3f84b27e6bbac1b1558166b44431a8e78bb1.tar.gz
Change "tracking branch" to "remote-tracking branch"
One more step towards consistancy. We change the documentation and the C code in a single patch, since the only instances in the C code are in comment and usage strings. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-fetch.txt')
-rw-r--r--Documentation/git-fetch.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt
index d159e88292..c76e313923 100644
--- a/Documentation/git-fetch.txt
+++ b/Documentation/git-fetch.txt
@@ -26,7 +26,7 @@ The ref names and their object names of fetched refs are stored
in `.git/FETCH_HEAD`. This information is left for a later merge
operation done by 'git merge'.
-When <refspec> stores the fetched result in tracking branches,
+When <refspec> stores the fetched result in remote-tracking branches,
the tags that point at these branches are automatically
followed. This is done by first fetching from the remote using
the given <refspec>s, and if the repository has objects that are