summaryrefslogtreecommitdiffstats
path: root/git-tag.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2010-11-25 03:16:07 +0000
committerJunio C Hamano <junio@kernel.org>2010-11-25 03:16:07 +0000
commit97bcb48c6f2fa3ff8c49372fb6057ebd66b78537 (patch)
tree24f01a439c32da8e521ee57f3a738e99f3f86e0d /git-tag.txt
parent982eb11dc5ca975628029adef95a96309ae25294 (diff)
downloadgit-htmldocs-97bcb48c6f2fa3ff8c49372fb6057ebd66b78537.tar.gz
Autogenerated HTML docs for v1.7.3.2-343-g7d43d
Diffstat (limited to 'git-tag.txt')
-rw-r--r--git-tag.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-tag.txt b/git-tag.txt
index 31c78a81e..8b169e364 100644
--- a/git-tag.txt
+++ b/git-tag.txt
@@ -177,7 +177,7 @@ On Automatic following
~~~~~~~~~~~~~~~~~~~~~~
If you are following somebody else's tree, you are most likely
-using tracking branches (`refs/heads/origin` in traditional
+using remote-tracking branches (`refs/heads/origin` in traditional
layout, or `refs/remotes/origin/master` in the separate-remote
layout). You usually want the tags from the other end.
@@ -232,7 +232,7 @@ this case.
It may well be that among networking people, they may want to
exchange the tags internal to their group, but in that workflow
they are most likely tracking with each other's progress by
-having tracking branches. Again, the heuristic to automatically
+having remote-tracking branches. Again, the heuristic to automatically
follow such tags is a good thing.