aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-10-28 09:01:10 -0700
committerJunio C Hamano <gitster@pobox.com>2016-10-28 09:01:10 -0700
commit03969dff8f6ab2e399df7e156c72d5b965388d2f (patch)
tree56e9ed5fd6ccd33c6679568c2735b57d54dec26d /Documentation
parent23415c26fef155f2fa9aebf8a48a6ae457b68c7b (diff)
parent749a2279a4e29b91a6e91a25340ad30373189313 (diff)
downloadgit-03969dff8f6ab2e399df7e156c72d5b965388d2f.tar.gz
git-03969dff8f6ab2e399df7e156c72d5b965388d2f.tar.xz
Merge branch 'yk/git-tag-remove-mention-of-old-layout-in-doc' into maint
Shorten description of auto-following in "git tag" by removing a mention of historical remotes layout which is not relevant to the main topic. * yk/git-tag-remove-mention-of-old-layout-in-doc: doc: remove reference to the traditional layout in git-tag.txt
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-tag.txt5
1 files changed, 2 insertions, 3 deletions
diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index 7ecca8e24..80019c584 100644
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -253,9 +253,8 @@ On Automatic following
~~~~~~~~~~~~~~~~~~~~~~
If you are following somebody else's tree, you are most likely
-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.
+using remote-tracking branches (eg. `refs/remotes/origin/master`).
+You usually want the tags from the other end.
On the other hand, if you are fetching because you would want a
one-shot merge from somebody else, you typically do not want to