aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorYounes Khoudli <younes.khoudli@gmail.com>2016-10-20 15:21:44 +0200
committerJunio C Hamano <gitster@pobox.com>2016-10-20 09:31:42 -0700
commit749a2279a4e29b91a6e91a25340ad30373189313 (patch)
treeeb08a6ef95b1e3f3d4cc44812c4b3418c71946c2 /Documentation
parent0b65a8dbdb38962e700ee16776a3042beb489060 (diff)
downloadgit-749a2279a4e29b91a6e91a25340ad30373189313.tar.gz
git-749a2279a4e29b91a6e91a25340ad30373189313.tar.xz
doc: remove reference to the traditional layout in git-tag.txt
This is the only place in the documentation that the traditional layout is mentioned, and it is confusing. Remove it. * Documentation/git-tag.txt: Here. Signed-off-by: Younes Khoudli <younes.khoudli@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 abab4814e..ccd98d9df 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